Clean up code

Author: forsyth2

tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg

@@ -10,16 +10,16 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
 # ts is in 5 year increments
 ts_num_years = 5
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/unique_id"
 # We want to produce diagnostics for 10 years.
 years = "1985:1995:10",
 
@@ -93,7 +93,7 @@ years = "1985:1995:5"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg

@@ -25,14 +25,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/unique_id"
 years = "1985:1989:2",
 
 [climo]
@@ -119,7 +119,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -152,7 +152,7 @@ years = "1987:1989:2"
   partition = "compute"
   qos = "regular"
   ref_name = "v3.LR.historical_0051"
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon",
   short_ref_name = "same simulation"

tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg

@@ -2,17 +2,17 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = True # Exlcusively testing with dry_run
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 fail_on_dependency_skip = True
 infer_path_parameters = False
 infer_section_parameters = False
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id"
 years = "1985:1989:2",
 
 [ts]
@@ -36,7 +36,7 @@ walltime = "00:30:00"
 active = True
 atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
 climo_years = "1985-1989", "1990-1995",
-environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 experiment_name = "v3.LR.historical_0051"
 figstr = "v3.LR.historical_0051"
 moc_file=mocTimeSeries_1985-1995.nc

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/unique_id"
 years = "1985:1989:4",
 
 [climo]
@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/unique_id"
 years = "1985:1989:4",
 
 [climo]

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/unique_id"
 years = "1995:1999:4",
 
 [climo]
@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -42,7 +42,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  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","aerosol_aeronet","aerosol_budget",
   short_ref_name = "v3.LR.historical_0051"

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/unique_id"
 years = "1985:1989:4",
 
 [ts]
@@ -23,7 +23,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/unique_id"
 years = "1985:1989:4",
 
 [ts]

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/unique_id"
 years = "1995:1999:4",
 
 [ts]
@@ -23,7 +23,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -42,7 +42,7 @@ walltime = "5:00:00"
   ref_start_yr = 1985
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "enso_diags","qbo",
   short_ref_name = "v3.LR.historical_0051"

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg

@@ -2,14 +2,14 @@
 case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = ""
 input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test_pr697_20250328_try2/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/unique_id/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test_pr697_20250328_try2"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/unique_id"
 years = "1985:1989:4",
 
 [climo]
@@ -24,7 +24,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8