Status file printing

zppy/ilamb.py

@@ -71,7 +71,7 @@ def ilamb(config, scriptDir, existing_bundles, job_ids_file):
                     scriptDir,
                     "e3sm_to_cmip_%s_%04d-%04d-%04d.status"
                     % (
-                        "land_monthly",
+                        c["ts_land_subsection"],
                         c["year1"],
                         c["year2"],
                         c["ts_num_years"],
@@ -91,6 +91,18 @@ def ilamb(config, scriptDir, existing_bundles, job_ids_file):
                         ),
                     ),
                 )
+                dependencies.append(
+                    os.path.join(
+                        scriptDir,
+                        "e3sm_to_cmip_%s_%04d-%04d-%04d.status"
+                        % (
+                            c["ts_atm_subsection"],
+                            c["year1"],
+                            c["year2"],
+                            c["ts_num_years"],
+                        ),
+                    ),
+                )
 
             prefix = "ilamb_%04d-%04d" % (
                 c["year1"],

zppy/templates/default.ini

@@ -306,5 +306,7 @@ ts_years = string_list(default=list(""))
 cfg = string(default="ilamb/cmip.cfg")
 ilamb_obs = string(default="")
 land_only = boolean(default=False)
+# time-series atm subsection name (this should also match the e3sm_to_cmip atm subsection name)
 ts_atm_subsection = string(default="atm_monthly_180x360_aave")
+# time-series land subsection name (this should also match the e3sm_to_cmip land subsection name)
 ts_land_subsection = string(default="land_monthly")

zppy/templates/e3sm_to_cmip.bash

@@ -2,6 +2,9 @@
 {% include 'slurm_header.sh' %}
 {{ environment_commands }}
 
+# TODO: figrue out dependencies on ts
+# TODO: figure out dependencies for E3SM Diags. It doesn't look like E3SM Diags depends on e3sm_to_cmip.
+
 # Turn on debug output if needed
 debug={{ debug }}
 if [[ "${debug,,}" == "true" ]]; then
@@ -33,10 +36,6 @@ do
   done
 done
 
-
-
-
-
 tmp_dir=tmp_{{ prefix }}
 
 # Generate CMIP ts
@@ -95,6 +94,11 @@ if [ $? != 0 ]; then
   exit 3
 fi
 
+# Delete temporary workdir
+cd ..
+if [[ "${debug,,}" != "true" ]]; then
+  rm -rf ${workdir}
+fi
 
 # Update status file and exit
 {% raw %}