Clean up code

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

Hide file tree

Showing 65 changed files with 276 additions and 232 deletions.
diff --git a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg
@@ -14,18 +14,17 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:50:00"
 # ts is in 5 year increments
 years = "1985:1995:5"
@@ -35,7 +34,6 @@ years = "1985:1995:5"
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
   vars = "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U,ICEFRAC,LANDFRAC,OCNFRAC,PS,CLDICE,CLDLIQ,T,AODDUST"
 
   [[ land_monthly ]]
@@ -45,7 +43,6 @@ years = "1985:1995:5"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
-  ts_fmt = "cmip"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
   [[ rof_monthly ]]
@@ -79,9 +76,30 @@ years = "1985:1995:5"
   mapping_file = "glb"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
+[e3sm_to_cmip]
+active = True
+walltime = "00:50:00"
+# ts is in 5 year increments
+years = "1985:1995:5"
+
+  [[ atm_monthly_180x360_aave ]]
+  # for e3sm_diags (depend_on_ts), ilamb
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+  vars = "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U,ICEFRAC,LANDFRAC,OCNFRAC,PS,CLDICE,CLDLIQ,T,AODDUST"
+
+  [[ land_monthly ]]
+  # for ilamb
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
+  vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
+
 [e3sm_diags]
 active = True
-environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg
@@ -29,10 +29,10 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/unique_id"
 years = "1985:1989:2",
 
 [climo]
@@ -60,14 +60,12 @@ walltime = "00:30:00"
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
 
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
@@ -99,7 +97,22 @@ walltime = "00:30:00"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
-  ts_fmt = "cmip"
+  vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
+
+[e3sm_to_cmip]
+active = True
+walltime = "00:30:00"
+
+  [[ atm_monthly_180x360_aave ]]
+  frequency = "monthly"
+  input_files = "eam.h0"
+  input_subdir = "archive/atm/hist"
+
+  [[ land_monthly ]]
+  frequency = "monthly"
+  input_files = "elm.h0"
+  input_subdir = "archive/lnd/hist"
+  mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
@@ -110,7 +123,7 @@ walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -143,7 +156,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_zppy_pr650_20241211v3/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"

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
@@ -6,10 +6,10 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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 /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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]

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
@@ -6,10 +6,10 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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 /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+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_zppy_pr650_20241211v3/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"

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg
@@ -6,26 +6,24 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  #ts_fmt = "cmip"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg
@@ -6,19 +6,17 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  #ts_fmt = "cmip"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg
@@ -6,26 +6,24 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  #ts_fmt = "cmip"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -44,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_zppy_pr650_20241211v3/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"

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg
@@ -6,10 +6,10 @@ 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_zppy_pr650_20241211v3/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_zppy_pr650_20241211v3"
+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 /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ 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_mvm_1_output/test_zppy_pr650_20241211v3/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_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_diurnal_cycle_mvm_1_www/test_zppy_pr650_20241211v3"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/unique_id"
 years = "1985:1989:4",
 
 [climo]

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg
@@ -6,10 +6,10 @@ 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_mvm_2_output/test_zppy_pr650_20241211v3/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_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_diurnal_cycle_mvm_2_www/test_zppy_pr650_20241211v3"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_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 /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_2.12.1"
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
@@ -40,7 +40,7 @@ walltime = "5:00:00"
   ref_name = "v3.LR.historical_0051"
   ref_years = "1985-1988",
   # Use _1 as reference
-  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_zppy_pr650_20241211v3/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
+  reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
   run_type = "model_vs_model"
   sets = "diurnal_cycle",
   short_ref_name = "v3.LR.historical_0051"

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg
@@ -6,10 +6,10 @@ 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_lat_lon_land_mvm_1_output/test_zppy_pr650_20241211v3/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_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_lat_lon_land_mvm_1_www/test_zppy_pr650_20241211v3"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/unique_id"
 years = "1985:1989:4",
 
 [climo]