Prune Loki config files

ecmwf-ifs · Feb 12, 2024 · 4c5a511 · 4c5a511
1 parent 8bc628f
commit 4c5a511
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 72 deletions.
diff --git a/src/ecwam/ecwam_loki.config b/src/ecwam/ecwam_loki.config
@@ -3,31 +3,22 @@ mode = "idem"
 role = "kernel"
 expand =  true
 strict =  true
+
 # Ensure that we are never adding these to the tree, and thus
 # do not attempt to look up the source files for these.
-#disable = [
-#  "DR_HOOK", "lhook", "jphook", "omp_get_wtime", "flush", "jwim",
-#  "jwrb", "jwru", "jwro", "environment", "frequency",
-#  "forcing_fields", "intgt_param_fields", "wave2ocean", "abort1",
-#  "iu06"
-#]
-# , 'dr_hook', 'lhook', 'jphook', '
-
-disable = ['yomhook', 'abort', 'wave2ocean', 'intgt_param_fields',
-  'forcing_fields', 'environment', 'yomgstats', 'gstats', 'gstats_barrier', 'frequency_field',
-  'environment_field', 'source_contribs_field', 'intgt_param_fields',
-  'source_contribs_field', 'system_clock', 'ec_parkind', 'parkind_wave', 'parkind1',
-  'wam_multio_mod', 'flush', 'yowabort', 'mpl_module', 'yowtest', 'oml_mod',
-  'ieee_arithmetic', 'outwspec_io_serv_handler', 'outint_io_serv_handler',
-  'ifstowam_handler', 'mfeb_length', 'mon', 'isamesign', 'cdm', 'abor1', 'abort1', 'abort1_mod',
-  'yowfield_mod', 'ctuw_mod', 'wam_user_clock',
-  'propag_wam', 'newwind', 'incdate']
+disable = [
+  'yomhook', 'abor1', 'abort1', 'gstats', 'yowgstats', 'wam_user_clock',
+  'parkind1', 'propag_wam', 'newwind', 'oml_mod', 'field_module', 'incdate',
+  'ieee_arithmetic',  # intrinsic modules (should have INTRINSIC in their USE statement)
+  'mfeb_length', 'cdm', # internal functions
+  'outwspec_io_serv_handler', 'outint_io_serv_handler', 'ifstowam_handler', # procedure pointers
+  '*%init', '*%update_view', '*%final', '*%ensure_host', '%*update_device'
+]
 
 # Prune the tree for these to ensure they are not processed by transformations
-block = ['ec_parkind', 'parkind_wave', 'parkind1', 'mfeb_length', 'mon', 'isamesign'] # , 'yoecldp', 'fc*_mod']
+block = ['ec_parkind', 'parkind_wave']
 
 utility_routines = ['dr_hook', 'abort1', 'write(iu06']
-enable_imports = false
 
 # Define entry point for call-tree transformation
 [routines]
@@ -38,21 +29,7 @@ enable_imports = false
 [routines.wamintgr]
   role = "driver"
   expand = true
-  # disable = [
-  #    "PROPAG_WAM", "NEWWIND", "GSTATS", "FREQUENCY_FIELD%INIT",
-  #    "ENVIRONMENT_FIELD%INIT", "FORCING_FIELDS_FIELD%INIT",
-  #    "WAVE2OCEAN_FIELD%INIT", "INTGT_PARAM_FIELDS_FIELD%INIT",
-  #    "FREQUENCY_FIELD%UPDATE_VIEW", "ENVIRONMENT_FIELD%UPDATE_VIEW",
-  #    "FORCING_FIELDS_FIELD%UPDATE_VIEW", "WAVE2OCEAN_FIELD%UPDATE_VIEW",
-  #    "INTGT_PARAM_FIELDS_FIELD%UPDATE_VIEW",
-  #    "SOURCE_CONTRIBS_FIELD%INIT", "SOURCE_CONTRIBS_FIELD%UPDATE_VIEW",
-  #    "INCDATE", "DR_HOOK", "omp_get_wtime", "abort1", "wam_user_clock",
-  #    "FREQUENCY_FIELD%FINAL", "ENVIRONMENT_FIELD%FINAL",
-  #    "FORCING_FIELDS_FIELD%FINAL", "WAVE2OCEAN_FIELD%FINAL",
-  #    "INTGT_PARAM_FIELDS_FIELD%FINAL", "SOURCE_CONTRIBS_FIELD%INIT",
-  #    "SOURCE_CONTRIBS_FIELD%FINAL"
-  # ]
- real_kind = 'JWRB'
+  real_kind = 'JWRB'
 
 # Define indices and bounds for array dimensions
 [dimensions]

diff --git a/src/ecwam/ecwam_loki_gpu.config b/src/ecwam/ecwam_loki_gpu.config
@@ -3,29 +3,22 @@ mode = "idem"
 role = "kernel"
 expand =  true
 strict =  true
-#disable = [
-#  "DR_HOOK", "lhook", "jphook", "omp_get_wtime", "flush", "jwim",
-#  "jwrb", "jwru", "jwro", "environment", "frequency",
-#  "forcing_fields", "intgt_param_fields", "wave2ocean", "abort1",
-#  "iu06"
-#]
 
-# , 'dr_hook', 'lhook', 'jphook', '
-disable = ['yomhook', 'abort', 'wave2ocean', 'intgt_param_fields',
-  'forcing_fields', 'environment', 'yomgstats', 'gstats', 'gstats_barrier', 'frequency_field',
-  'environment_field', 'source_contribs_field', 'intgt_param_fields',
-  'source_contribs_field', 'system_clock', 'ec_parkind', 'parkind_wave', 'parkind1',
-  'wam_multio_mod', 'flush', 'yowabort', 'mpl_module', 'yowtest', 'oml_mod',
-  'ieee_arithmetic', 'outwspec_io_serv_handler', 'outint_io_serv_handler',
-  'ifstowam_handler', 'mfeb_length', 'mon', 'isamesign', 'cdm', 'abor1', 'abort1', 'abort1_mod',
-  'yowfield_mod', 'ctuw_mod', 'wam_user_clock',
-  'propag_wam', 'newwind', 'incdate']
+# Ensure that we are never adding these to the tree, and thus
+# do not attempt to look up the source files for these.
+disable = [
+  'yomhook', 'abor1', 'abort1', 'gstats', 'yowgstats', 'wam_user_clock',
+  'parkind1', 'propag_wam', 'newwind', 'oml_mod', 'field_module', 'incdate',
+  'ieee_arithmetic',  # intrinsic modules (should have INTRINSIC in their USE statement)
+  'mfeb_length', 'cdm', # internal functions
+  'outwspec_io_serv_handler', 'outint_io_serv_handler', 'ifstowam_handler', # procedure pointers
+  '*%init', '*%update_view', '*%final', '*%ensure_host', '%*update_device'
+]
 
 # Prune the tree for these to ensure they are not processed by transformations
-block = ['ec_parkind', 'parkind_wave', 'parkind1', 'mfeb_length'] # , 'yoecldp', 'fc*_mod']
+block = ['ec_parkind', 'parkind_wave']
 
 utility_routines = ['dr_hook', 'abort1', 'write(iu06']
-enable_imports = true
 
 # Define entry point for call-tree transformation
 [routines]
@@ -36,26 +29,6 @@ enable_imports = true
 [routines.wamintgr_loki_gpu]
   role = "driver"
   expand = true
-  # disable = [
-  #    "PROPAG_WAM", "NEWWIND", "GSTATS", "FREQUENCY_FIELD%INIT",
-  #    "ENVIRONMENT_FIELD%INIT", "FORCING_FIELDS_FIELD%INIT",
-  #    "WAVE2OCEAN_FIELD%INIT", "INTGT_PARAM_FIELDS_FIELD%INIT",
-  #    "FREQUENCY_FIELD%UPDATE_DEVICE", "ENVIRONMENT_FIELD%UPDATE_DEVICE",
-  #    "FORCING_FIELDS_FIELD%UPDATE_DEVICE",
-  #    "WAVE2OCEAN_FIELD%UPDATE_DEVICE",
-  #    "INTGT_PARAM_FIELDS_FIELD%UPDATE_DEVICE",
-  #    "SOURCE_CONTRIBS_FIELD%INIT", "SOURCE_CONTRIBS_FIELD%UPDATE_DEVICE",
-  #    "INCDATE", "DR_HOOK", "omp_get_wtime", "abort1", "wam_user_clock",
-  #    "FREQUENCY_FIELD%ENSURE_HOST", "ENVIRONMENT_FIELD%ENSURE_HOST",
-  #    "FORCING_FIELDS_FIELD%ENSURE_HOST", "WAVE2OCEAN_FIELD%ENSURE_HOST",
-  #    "INTGT_PARAM_FIELDS_FIELD%ENSURE_HOST",
-  #    "SOURCE_CONTRIBS_FIELD%INIT", "SOURCE_CONTRIBS_FIELD%ENSURE_HOST",
-  #    "FREQUENCY_FIELD%FINAL", "ENVIRONMENT_FIELD%FINAL",
-  #    "FORCING_FIELDS_FIELD%FINAL", "WAVE2OCEAN_FIELD%FINAL",
-  #    "INTGT_PARAM_FIELDS_FIELD%FINAL", "SOURCE_CONTRIBS_FIELD%INIT",
-  #    "SOURCE_CONTRIBS_FIELD%FINAL"
-  # ]
-  # enable_imports = false
   real_kind = 'JWRB'
 
 # Define indices and bounds for array dimensions