ILAMB for Compy (#247)

Author: forsyth2

zppy/ilamb_run.py

@@ -2,6 +2,7 @@
 import pprint
 
 import jinja2
+from mache import MachineInfo
 
 from zppy.bundle import handle_bundles
 from zppy.utils import (
@@ -48,6 +49,11 @@ def ilamb_run(config, scriptDir, existing_bundles):
             else:
                 c["sub"] = c["grid"]
 
+            if c["ilamb_obs"] == "":
+                ilamb_obs_prefix = MachineInfo().config.get("diagnostics", "base_path")
+                ilamb_obs_suffix = "ilamb_data"
+                c["ilamb_obs"] = os.path.join(ilamb_obs_prefix, ilamb_obs_suffix)
+
             # List of dependencies
             dependencies.append(
                 os.path.join(

zppy/templates/default.ini

@@ -274,6 +274,7 @@ ts_years = string_list(default=list(""))
 
 [ilamb_run]
 cfg = string(default="ilamb_run/cmip.cfg")
+ilamb_obs = string(default="")
 land_only = boolean(default=False)
 ts_atm_subsection = string(default="atm_monthly_180x360_aave")
 ts_land_subsection = string(default="land_monthly")

zppy/templates/ilamb_run.bash

@@ -9,9 +9,8 @@ if [[ "${debug,,}" == "true" ]]; then
   set -x
 fi
 
-# Point to obsersvation data
-# TODO: need to update these data to other supported machines
-export ILAMB_ROOT=/lcrc/group/acme/public_html/diagnostics/ilamb_data
+# Point to observation data
+export ILAMB_ROOT={{ ilamb_obs }}
 
 # Script dir
 cd {{ scriptDir }}
@@ -58,6 +57,7 @@ echo ===== RUN ILAMB =====
 echo
 
 # Run diagnostics
+# Not required TODO?
 # TODO: find the mpi run format for different platforms
 
 # include cfg file

zppy/templates/ts.bash

@@ -121,7 +121,7 @@ cat > default_metadata.json << EOF
 {% include cmip_metadata %}
 EOF
 {
-  export cmortables_dir=/lcrc/group/acme/public_html/diagnostics/cmip6-cmor-tables/Tables
+  export cmortables_dir={{ cmor_tables_prefix }}/cmip6-cmor-tables/Tables
   input_dir={{ output }}/post/{{ component }}/{{ grid }}/ts/{{ frequency }}/{{ '%dyr' % (ypf) }}
   dest_cmip={{ output }}/post/{{ component }}/{{ grid }}/cmip_ts/{{ frequency }}
   mkdir -p ${dest_cmip}

zppy/ts.py

@@ -3,6 +3,7 @@
 import re
 
 import jinja2
+from mache import MachineInfo
 
 from zppy.bundle import handle_bundles
 from zppy.utils import (
@@ -57,6 +58,10 @@ def ts(config, scriptDir, existing_bundles):
         # Component
         c["component"] = getComponent(c["input_files"])
 
+        machine_info = MachineInfo()
+        cmor_tables_prefix = machine_info.config.get("diagnostics", "base_path")
+        c["cmor_tables_prefix"] = cmor_tables_prefix
+
         # Loop over year sets
         year_sets = getYears(c["years"])
         for s in year_sets: