Merge pull request #74 from ecmwf-ifs/nabr-fixes-for-the-new-scheduler

Compatibility with Loki v0.2

src/cloudsc_loki/cloudsc_cuf_loki.config

@@ -6,11 +6,13 @@ strict = true  # Throw exceptions during dicovery
 
 # Ensure that we are never adding these to the tree, and thus
 # do not attempt to look up the source files for these.
-disable = ['timer%start', 'timer%end', 'timer%thread_start', 'timer%thread_end',
-           'timer%thread_log', 'timer%thread_log', 'timer%print_performance',
-           'performance_timer%start', 'performance_timer%end', 'performance_timer%thread_start',
-           'performance_timer%thread_end', 'performance_timer%thread_log',
-           'performance_timer%thread_log', 'performance_timer%print_performance']
+disable = [
+    'timer_mod', 'abort', 'file_io_mod', 'foe*', 'fokoop',
+    'ceiling', 'dim3', 'cuda*'
+]
+
+# Prune the tree for these to ensure they are not processed by transformations
+block = ['parkind1', 'yomphyder', 'yoecldp', 'fc*_mod']
 
 # Define entry point for call-tree transformation
 [routines]

src/cloudsc_loki/cloudsc_loki.config

@@ -6,10 +6,10 @@ strict = true  # Throw exceptions during dicovery
 
 # Ensure that we are never adding these to the tree, and thus
 # do not attempt to look up the source files for these.
-# TODO: Add type-bound procedure support and adjust scheduler to it
-disable = ['performance_timer%start', 'performance_timer%end', 'performance_timer%thread_start',
-           'performance_timer%thread_end', 'performance_timer%thread_log',
-           'performance_timer%thread_log', 'performance_timer%print_performance']
+disable = ['timer_mod', 'abort', 'file_io_mod', 'foe*', 'fokoop']
+
+# Prune the tree for these to ensure they are not processed by transformations
+block = ['parkind1', 'yomphyder', 'yoecldp', 'fc*_mod']
 
 # Define entry point for call-tree transformation
 [routines]
@@ -35,3 +35,16 @@ disable = ['performance_timer%start', 'performance_timer%end', 'performance_time
 [dimensions.block_dim]
   size = 'NGPBLKS'
   index = 'IBL'
+
+
+# Overwrite frontend for header modules that cannot be parsed via OMNI
+[frontend_args]
+
+[frontend_args."yomphyder.F90"]
+frontend = 'FP'
+
+[frontend_args."yomcst.F90"]
+frontend = 'FP'
+
+[frontend_args."yoethf.F90"]
+frontend = 'FP'