Use updated nco for zi input

E3SM-Project · Dec 20, 2024 · ee60560 · ee60560
1 parent 7c5e2b8
commit ee60560
Show file tree

Hide file tree

Showing 39 changed files with 106 additions and 122 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,12 +14,12 @@ 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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/zppy_601_viewers_updated_nco_no_extra_vars"
 # We want to produce diagnostics for 10 years.
 years = "1985:1995:10",
 

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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:2",
 
 [climo]
@@ -106,7 +106,7 @@ walltime = "00:30:00"
 # [tc_analysis]
 # # The second run should run in parallel with the first run.
 # active = True
-# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_carryover_dependencies_scratch/unique_id/v3.LR.historical_0051"
+# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_carryover_dependencies_scratch/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051"
 # walltime = "00:30:00"
 
 [e3sm_diags]
@@ -144,7 +144,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/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [climo]

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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/zppy_601_viewers_updated_nco_no_extra_vars"
 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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1995:1999:4",
 
 [climo]
@@ -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/unique_id/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/zppy_601_viewers_updated_nco_no_extra_vars/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,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_ts_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [ts]

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,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_ts_mvm_1_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [ts]

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,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_ts_mvm_2_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1995:1999:4",
 
 [ts]
@@ -44,7 +44,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/unique_id/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/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [climo]

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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/zppy_601_viewers_updated_nco_no_extra_vars"
 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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1995:1999:4",
 
 [climo]
@@ -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/unique_id/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/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/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/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [climo]

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
@@ -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_2_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/zppy_601_viewers_updated_nco_no_extra_vars/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_2_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1995:1999:4",
 
 [climo]
@@ -41,7 +41,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_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
   run_type = "model_vs_model"
   sets = "lat_lon_land",
   short_ref_name = "v3.LR.historical_0051"

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_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_streamflow_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [ts]

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_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_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1989:4",
 
 [ts]

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_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_streamflow_mvm_2_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1995:1999:4",
 
 [ts]
@@ -45,7 +45,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_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
+  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # reference_data_path_ts_rof determined automatically
   run_type = "model_vs_model"
   sets="streamflow"

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg
@@ -6,15 +6,15 @@ environment_commands = ""
 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_min_case_e3sm_diags_tc_analysis_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/zppy_601_viewers_updated_nco_no_extra_vars/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v2.LR.historical_0201"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/zppy_601_viewers_updated_nco_no_extra_vars/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]

diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg
@@ -6,13 +6,13 @@ environment_commands = ""
 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_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/zppy_601_viewers_updated_nco_no_extra_vars/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
-www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id"
+www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/zppy_601_viewers_updated_nco_no_extra_vars"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/unique_id/v2.LR.historical_0201"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/zppy_601_viewers_updated_nco_no_extra_vars/v2.LR.historical_0201"
 walltime = "00:30:00"