Address comments

E3SM-Project · Dec 12, 2024 · bfb0fc6 · bfb0fc6
1 parent e93a577
commit bfb0fc6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/zppy/defaults/default.ini b/zppy/defaults/default.ini
@@ -119,6 +119,8 @@ input_component = string(default="")
 [e3sm_to_cmip]
 cmip_metadata = string(default="inclusions/e3sm_to_cmip/default_metadata.json")
 # Model component having generated input files (eam, eamxx, elm, mosart, ...)
+cmip_var_atm = string(default="pr, tas, rsds, rlds, rsus")
+cmip_var_land = string(default="mrsos, mrso, mrfso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, tsl, lai, cLitter, cProduct, cSoilFast, cSoilMedium, cSoilSlow, fFire, fHarvest, cVeg, nbp, gpp, ra, rh")
 input_component = string(default="")
 
   [[__many__]]

diff --git a/zppy/e3sm_diags.py b/zppy/e3sm_diags.py
@@ -295,16 +295,6 @@ def add_ts_dependencies(
             end_yr,
             c["ts_num_years"],
         )
-        # e3sm_to_cmip task
-        add_dependencies(
-            dependencies,
-            script_dir,
-            "e3sm_to_cmip",
-            ts_sub,  # Relies on having the same subsection name as the corresponding ts subsection!
-            start_yr,
-            end_yr,
-            c["ts_num_years"],
-        )
     if "streamflow" in c["sets"]:
         add_dependencies(
             dependencies,

diff --git a/zppy/templates/e3sm_to_cmip.bash b/zppy/templates/e3sm_to_cmip.bash
@@ -33,13 +33,13 @@ EOF
   ${dest_cmip}/${tmp_dir} \
   {% if input_files.split(".")[0] == 'clm2' or input_files.split(".")[0] == 'elm' -%}
   --var-list \
-  'mrsos, mrso, mrfso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, tsl, lai, cLitter, cProduct, cSoilFast, cSoilMedium, cSoilSlow, fFire, fHarvest, cVeg, nbp, gpp, ra, rh' \
+  '{{ cmip_var_lnd }}' \
   --realm \
   lnd \
   {% endif -%}
   {% if input_files.split(".")[0] == 'cam' or input_files.split(".")[0] == 'eam' -%}
   --var-list \
-  'pr, tas, rsds, rlds, rsus' \
+  '{{ cmip_var_atm }}' \
   --realm \
   atm \
   {% endif -%}