Improve input validation and testing (#628)

tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg

@@ -81,7 +81,7 @@ years = "1985:1995:5"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg

@@ -25,7 +25,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg

@@ -25,7 +25,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg

@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg

@@ -27,7 +27,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg

@@ -27,7 +27,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg

@@ -19,7 +19,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg

@@ -19,7 +19,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg

@@ -25,7 +25,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_weekly_bundles_chrysalis.cfg

@@ -95,15 +95,16 @@ years = "1985:1989:2",
   mapping_file = ""
   vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
 
-[tc_analysis]
-active = True
-bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_bundles_scratch/unique_id/v3.LR.historical_0051"
-years = "1985:1989:2",
+# TODO: Add "tc_analysis" back in after empty dat is resolved.
+# [tc_analysis]
+# active = True
+# bundle = "bundle3" # Let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
+# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_bundles_scratch/unique_id/v3.LR.historical_0051"
+# years = "1985:1989:2",
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 ref_final_yr = 1989
 ref_start_yr = 1985
@@ -128,7 +129,8 @@ years = "1985:1989:2",
   ref_years = "1985-1986",
   reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
-  sets = "polar","enso_diags","streamflow","tc_analysis",
+  # TODO: Add "tc_analysis" back in after empty dat is resolved.
+  sets = "polar","enso_diags","streamflow",
   short_ref_name = "v3.LR.historical_0051"
   swap_test_ref = False
   tag = "model_vs_model"

tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg

@@ -3,14 +3,15 @@ case = "v2.LR.historical_0201"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
+fail_on_dependency_skip = True
 input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
 output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
 www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/unique_id"
-years = "1850:1854:2",
+years = "1980:1984:2",
 
 [climo]
 active = True
@@ -45,6 +46,12 @@ walltime = "00:30:00"
   input_subdir = "archive/atm/hist"
   ts_fmt = "cmip"
 
+  [[ atm_daily_180x360_aave ]]
+  frequency = "daily"
+  input_files = "eam.h1"
+  input_subdir = "archive/atm/hist"
+  vars = "PRECT"
+
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
   frequency = "monthly"
@@ -59,15 +66,15 @@ walltime = "00:30:00"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
-  years = "1850:1860:5",
+  years = "1980:1990:5",
 
   [[ lnd_monthly_glb ]]
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "glb"
   vars = "LAISHA,LAISUN"
-  years = "1850:1860:5",
+  years = "1980:1990:5",
 
   [[ land_monthly ]]
   extra_vars = "landfrac"
@@ -84,26 +91,34 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
+climo_diurnal_frequency = "diurnal_8xdaily"
+climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-ref_final_yr = 1851
-ref_start_yr = 1850
-ref_years = "1850-1851",
+ref_end_yr = 1981
+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_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",
 short_name = "v2.LR.historical_0201"
 ts_num_years = 2
 walltime = "5:00:00"
-years = "1852:1854:2",
+years = "1982:1984:2",
 
   [[ atm_monthly_180x360_aave ]]
-  climo_diurnal_frequency = "diurnal_8xdaily"
-  climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
   climo_subsection = "atm_monthly_180x360_aave"
   dc_obs_climo = '/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/obs/climatology'
-  sets = "lat_lon","enso_diags","diurnal_cycle","streamflow","tc_analysis","tc_analysis",
 
   [[ atm_monthly_180x360_aave_mvm ]]
   # Test model-vs-model using the same files as the reference
@@ -114,12 +129,13 @@ years = "1852:1854:2",
   ref_name = "v2.LR.historical_0201"
   reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
-  sets = "lat_lon",
   short_ref_name = "same simulation"
   swap_test_ref = False
   tag = "model_vs_model"
+  ts_daily_subsection = "atm_monthly_180x360_aave"
   ts_num_years_ref = 2
   ts_subsection = "atm_monthly_180x360_aave"
+  years = "1980:1982:2",
 
   [[ lnd_monthly_mvm_lnd ]]
   # Test model-vs-model using the same files as the reference
@@ -138,28 +154,28 @@ years = "1852:1854:2",
 
 [mpas_analysis]
 active = True
-anomalyRefYear = 1850
-climo_years ="1850-1854", "1855-1860",
-enso_years = "1850-1854", "1855-1860",
+anomalyRefYear = 1980
+climo_years ="1980-1984", "1985-1990",
+enso_years = "1980-1984", "1985-1990",
 mesh = "EC30to60E2r2"
 parallelTaskCount = 6
 partition = "compute"
 qos = "regular"
 shortTermArchive = True
-ts_years = "1850-1854", "1850-1860",
+ts_years = "1980-1984", "1980-1990",
 walltime = "00:30:00"
 
 [global_time_series]
 active = True
-climo_years ="1850-1854", "1855-1860",
+climo_years ="1980-1984", "1985-1990",
 experiment_name = "v2.LR.historical_0201"
 figstr = "v2.LR.historical_0201"
-moc_file=mocTimeSeries_1850-1860.nc
+moc_file=mocTimeSeries_1980-1990.nc
 plots_lnd = "LAISHA,LAISUN"
 ts_num_years = 5
-ts_years = "1850-1854", "1850-1860",
+ts_years = "1980-1984", "1980-1990",
 walltime = "00:30:00"
-years = "1850-1860",
+years = "1980-1990",
 
 [ilamb]
 active = True
@@ -168,4 +184,4 @@ partition = "compute"
 short_name = "v2.LR.historical_0201"
 ts_num_years = 2
 walltime = "2:00:00"
-years = "1850:1854:2",
+years = "1980:1984:2",