From 527aed41c589159322f8a86d6843ff9f32de9637 Mon Sep 17 00:00:00 2001
From: Ryan Forsyth <forsyth2@llnl.gov>
Date: Wed, 16 Oct 2024 14:09:09 -0500
Subject: [PATCH] Updates to diags handling

---
 ...e_e3sm_diags_depend_on_climo_chrysalis.cfg |  2 +-
 ..._diags_depend_on_climo_mvm_2_chrysalis.cfg |  2 +-
 ...3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg |  2 +-
 ...test_weekly_comprehensive_v2_chrysalis.cfg |  4 +--
 ...test_weekly_comprehensive_v3_chrysalis.cfg |  4 +--
 ...te_min_case_e3sm_diags_depend_on_climo.cfg |  2 +-
 ..._case_e3sm_diags_depend_on_climo_mvm_2.cfg |  2 +-
 ...min_case_e3sm_diags_lat_lon_land_mvm_2.cfg |  2 +-
 .../template_weekly_comprehensive_v2.cfg      |  4 +--
 .../template_weekly_comprehensive_v3.cfg      |  4 +--
 tests/test_zppy_e3sm_diags.py                 | 26 +++++++++++++++++++
 tests/test_zppy_utils.py                      |  7 +++++
 zppy/e3sm_diags.py                            | 21 ++++++++++-----
 zppy/templates/tc_analysis.bash               |  7 -----
 zppy/utils.py                                 |  5 ++++
 15 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
index c95c1d0c..e8b4b4e0 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
@@ -35,4 +35,4 @@ walltime = "5:00:00"
 
   [[ atm_monthly_180x360_aave ]]
   climo_subsection = "atm_monthly_180x360_aave"
-  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
index 8b21a431..06e067dc 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
@@ -44,7 +44,7 @@ walltime = "5:00:00"
   # Use _1 as reference
   reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
-  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
   short_ref_name = "v3.LR.historical_0051"
   swap_test_ref = False
   tag = "model_vs_model"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
index 13d3015f..723e6c43 100644
--- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
+++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
@@ -34,7 +34,7 @@ short_name = "v3.LR.historical_0051"
 walltime = "5:00:00"
 
   [[ lnd_monthly_mvm_lnd ]]
-  climo_subsection = "land_monthly_climo"
+  climo_land_subsection = "land_monthly_climo"
   diff_title = "Difference"
   ref_final_yr = 1988
   ref_name = "v3.LR.historical_0051"
diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
index 7d91a130..34f78465 100644
--- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
@@ -104,13 +104,13 @@ ref_final_yr = 1981
 ref_start_yr = 1980
 ref_years = "1980-1981",
 # Include all sets
-# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
 # min_case_e3sm_diags_depend_on_ts: "enso_diags","qbo",
 # min_case_e3sm_diags_diurnal_cycle: "diurnal_cycle",
 # min_case_e3sm_diags_streamflow: "streamflow",
 # min_case_e3sm_diags_tc_analysis: "tc_analysis",
 # min_case_e3sm_diags_tropical_subseasonal: "tropical_subseasonal",
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tc_analysis","tropical_subseasonal",
+sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tc_analysis","tropical_subseasonal","aerosol_aeronet","aerosol_budget"
 short_name = "v2.LR.historical_0201"
 ts_num_years = 2
 walltime = "5:00:00"
diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
index 405af0ad..4b67bf62 100644
--- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
+++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
@@ -110,14 +110,14 @@ ref_final_yr = 1986
 ref_start_yr = 1985
 ref_years = "1985-1986",
 # Include all sets
-# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
 # min_case_e3sm_diags_depend_on_ts: "enso_diags","qbo",
 # min_case_e3sm_diags_diurnal_cycle: "diurnal_cycle",
 # min_case_e3sm_diags_streamflow: "streamflow",
 # min_case_e3sm_diags_tc_analysis: "tc_analysis",
 # min_case_e3sm_diags_tropical_subseasonal: "tropical_subseasonal",
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tropical_subseasonal",
+sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tropical_subseasonal","aerosol_aeronet","aerosol_budget"
 short_name = "v3.LR.historical_0051"
 ts_daily_subsection = "atm_daily_180x360_aave"
 ts_num_years = 2
diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg
index cf48d9b9..a8eded71 100644
--- a/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg
@@ -35,4 +35,4 @@ walltime = "#expand diags_walltime#"
 
   [[ atm_monthly_180x360_aave ]]
   climo_subsection = "atm_monthly_180x360_aave"
-  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg
index fc01cd50..38b255db 100644
--- a/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg
@@ -44,7 +44,7 @@ walltime = "#expand diags_walltime#"
   # Use _1 as reference
   reference_data_path = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
-  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+  sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
   short_ref_name = "#expand case_name#"
   swap_test_ref = False
   tag = "model_vs_model"
diff --git a/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg
index 691dd895..5b83882b 100644
--- a/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg
+++ b/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg
@@ -34,7 +34,7 @@ short_name = "#expand case_name#"
 walltime = "#expand diags_walltime#"
 
   [[ lnd_monthly_mvm_lnd ]]
-  climo_subsection = "land_monthly_climo"
+  climo_land_subsection = "land_monthly_climo"
   diff_title = "Difference"
   ref_final_yr = 1988
   ref_name = "#expand case_name#"
diff --git a/tests/integration/template_weekly_comprehensive_v2.cfg b/tests/integration/template_weekly_comprehensive_v2.cfg
index 3d4bd746..101adcfe 100644
--- a/tests/integration/template_weekly_comprehensive_v2.cfg
+++ b/tests/integration/template_weekly_comprehensive_v2.cfg
@@ -104,13 +104,13 @@ ref_final_yr = 1981
 ref_start_yr = 1980
 ref_years = "1980-1981",
 # Include all sets
-# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
 # min_case_e3sm_diags_depend_on_ts: "enso_diags","qbo",
 # min_case_e3sm_diags_diurnal_cycle: "diurnal_cycle",
 # min_case_e3sm_diags_streamflow: "streamflow",
 # min_case_e3sm_diags_tc_analysis: "tc_analysis",
 # min_case_e3sm_diags_tropical_subseasonal: "tropical_subseasonal",
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tc_analysis","tropical_subseasonal",
+sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tc_analysis","tropical_subseasonal","aerosol_aeronet","aerosol_budget"
 short_name = "#expand case_name_v2#"
 ts_num_years = 2
 walltime = "#expand diags_walltime#"
diff --git a/tests/integration/template_weekly_comprehensive_v3.cfg b/tests/integration/template_weekly_comprehensive_v3.cfg
index 4eb511f4..7b0d7328 100644
--- a/tests/integration/template_weekly_comprehensive_v3.cfg
+++ b/tests/integration/template_weekly_comprehensive_v3.cfg
@@ -110,14 +110,14 @@ ref_final_yr = 1986
 ref_start_yr = 1985
 ref_years = "1985-1986",
 # Include all sets
-# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
+# min_case_e3sm_diags_depend_on_climo: "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
 # min_case_e3sm_diags_depend_on_ts: "enso_diags","qbo",
 # min_case_e3sm_diags_diurnal_cycle: "diurnal_cycle",
 # min_case_e3sm_diags_streamflow: "streamflow",
 # min_case_e3sm_diags_tc_analysis: "tc_analysis",
 # min_case_e3sm_diags_tropical_subseasonal: "tropical_subseasonal",
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tropical_subseasonal",
+sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","enso_diags","qbo","diurnal_cycle","streamflow","tropical_subseasonal","aerosol_aeronet","aerosol_budget"
 short_name = "#expand case_name#"
 ts_daily_subsection = "atm_daily_180x360_aave"
 ts_num_years = 2
diff --git a/tests/test_zppy_e3sm_diags.py b/tests/test_zppy_e3sm_diags.py
index 53020769..cb81b6ff 100644
--- a/tests/test_zppy_e3sm_diags.py
+++ b/tests/test_zppy_e3sm_diags.py
@@ -533,6 +533,32 @@ def test_add_climo_dependencies(self):
         dependencies = []
         add_climo_dependencies(c, dependencies, "script_dir")
         self.assertEqual(dependencies, ["script_dir/climo_cdsub_1980-1990.status"])
+        c = {"sets": ["diurnal_cycle"]}
+        c.update(base)
+        dependencies = []
+        self.assertRaises(
+            ParameterNotProvidedError,
+            add_climo_dependencies,
+            c,
+            dependencies,
+            "script_dir",
+        )
+
+        c = {"sets": ["lat_lon_land"], "climo_land_subsection": "lndsub"}
+        c.update(base)
+        dependencies = []
+        add_climo_dependencies(c, dependencies, "script_dir")
+        self.assertEqual(dependencies, ["script_dir/climo_lndsub_1980-1990.status"])
+        c = {"sets": ["lat_lon_land"]}
+        c.update(base)
+        dependencies = []
+        self.assertRaises(
+            ParameterNotProvidedError,
+            add_climo_dependencies,
+            c,
+            dependencies,
+            "script_dir",
+        )
 
         c = {"sets": ["tc_analysis"]}
         c.update(base)
diff --git a/tests/test_zppy_utils.py b/tests/test_zppy_utils.py
index 4340d351..7a87420c 100644
--- a/tests/test_zppy_utils.py
+++ b/tests/test_zppy_utils.py
@@ -5,6 +5,7 @@
     ParameterGuessType,
     ParameterNotProvidedError,
     add_dependencies,
+    check_parameter_defined,
     check_required_parameters,
     define_or_guess,
     define_or_guess2,
@@ -460,6 +461,12 @@ def test_define_or_guess2(self):
         )
         self.assertEqual(c["required_parameter"], "backup_option")
 
+    def test_check_parameter_defined(self):
+        c = {"a": 1, "b": 2, "c": ""}
+        check_parameter_defined(c, "a")
+        self.assertRaises(ParameterNotProvidedError, check_parameter_defined, c, "c")
+        self.assertRaises(ParameterNotProvidedError, check_parameter_defined, c, "d")
+
     def test_get_file_names(self):
         bash, settings, status = get_file_names("script_dir", "prefix")
         self.assertEqual(bash, "script_dir/prefix.bash")
diff --git a/zppy/e3sm_diags.py b/zppy/e3sm_diags.py
index 091e8e62..bbe93b57 100644
--- a/zppy/e3sm_diags.py
+++ b/zppy/e3sm_diags.py
@@ -6,8 +6,8 @@
 from zppy.bundle import handle_bundles
 from zppy.utils import (
     ParameterGuessType,
-    ParameterNotProvidedError,
     add_dependencies,
+    check_parameter_defined,
     check_required_parameters,
     check_status,
     define_or_guess,
@@ -111,12 +111,9 @@ def check_parameters_for_bash(c: Dict[str, Any]) -> None:
 
 def check_mvm_only_parameters_for_bash(c: Dict[str, Any]) -> None:
     # Check mvm-specific parameters that aren't used until e3sm_diags.bash is run.
-    if c["diff_title"] == "":
-        raise ParameterNotProvidedError("diff_title")
-    if c["ref_name"] == "":
-        raise ParameterNotProvidedError("ref_name")
-    if c["short_ref_name"] == "":
-        raise ParameterNotProvidedError("short_ref_name")
+    check_parameter_defined(c, "diff_title")
+    check_parameter_defined(c, "ref_name")
+    check_parameter_defined(c, "short_ref_name")
 
     check_required_parameters(
         c,
@@ -244,6 +241,8 @@ def add_climo_dependencies(
             "meridional_mean_2d",
             "annual_cycle_zonal_mean",
             "zonal_mean_2d_stratosphere",
+            "aerosol_aeronet",
+            "aerosol_budget",
         ]
     )
     # Check if any requested sets depend on climo:
@@ -256,11 +255,19 @@ def add_climo_dependencies(
             os.path.join(script_dir, f"climo_{climo_sub}{status_suffix}"),
         )
     if "diurnal_cycle" in c["sets"]:
+        check_parameter_defined(c, "climo_diurnal_subsection")
         dependencies.append(
             os.path.join(
                 script_dir, f"climo_{c['climo_diurnal_subsection']}{status_suffix}"
             )
         )
+    if "lat_lon_land" in c["sets"]:
+        check_parameter_defined(c, "climo_land_subsection")
+        dependencies.append(
+            os.path.join(
+                script_dir, f"climo_{c['climo_land_subsection']}{status_suffix}"
+            )
+        )
     if "tc_analysis" in c["sets"]:
         dependencies.append(os.path.join(script_dir, f"tc_analysis{status_suffix}"))
 
diff --git a/zppy/templates/tc_analysis.bash b/zppy/templates/tc_analysis.bash
index 9a616dd9..57740ae2 100644
--- a/zppy/templates/tc_analysis.bash
+++ b/zppy/templates/tc_analysis.bash
@@ -90,13 +90,6 @@ cat ${result_dir}out.dat0* > ${result_dir}cyclones_${file_name}.txt
 StitchNodes --in_fmt "lon,lat,slp,wind" --in_connect ${result_dir}connect_CSne${res}_v2.dat --range 6.0 --mintime 6 --maxgap 1 --in ${result_dir}cyclones_${file_name}.txt --out ${result_dir}cyclones_stitch_${file_name}.dat --threshold "wind,>=,17.5,6;lat,<=,40.0,6;lat,>=,-40.0,6"
 rm ${result_dir}cyclones_${file_name}.txt
 
-# If cyclones_stitch file is empty, exit
-if ! [ -s ${result_dir}cyclones_stitch_${file_name}.dat ]; then
-  cd {{ scriptDir }}
-  echo 'ERROR (1)' > {{ prefix }}.status
-  exit 1
-fi
-
 # Generate histogram of detections
 HistogramNodes --in ${result_dir}cyclones_stitch_${file_name}.dat --iloncol 2 --ilatcol 3 --out ${result_dir}cyclones_hist_${file_name}.nc
 
diff --git a/zppy/utils.py b/zppy/utils.py
index 06b27b76..fe62014f 100644
--- a/zppy/utils.py
+++ b/zppy/utils.py
@@ -314,6 +314,11 @@ def define_or_guess2(
             raise ParameterNotProvidedError(parameter)
 
 
+def check_parameter_defined(c: Dict[str, Any], relevant_parameter: str) -> None:
+    if (relevant_parameter not in c.keys()) or (c[relevant_parameter] == ""):
+        raise ParameterNotProvidedError(relevant_parameter)
+
+
 def get_file_names(script_dir: str, prefix: str):
     return tuple(
         [