Update

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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg

@@ -1,35 +1,34 @@
 [default]
-case = "v3.LR.historical_0051"
+case = "v2.LR.historical_0201"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+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/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/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"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v3.LR.historical_0051"
+short_name = "v2.LR.historical_0201"
 ts_num_years = 2
 walltime = "5:00:00"
 
   [[ atm_monthly_180x360_aave_tc_analysis ]]
-  # Note: tc_analysis requires e3sm_diags jobs to run sequentially
   sets = "tc_analysis",
   # tc_obs is determined automatically

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg

@@ -1,18 +1,18 @@
 [default]
-case = "v3.LR.historical_0051"
+case = "v2.LR.historical_0201"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+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/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/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"
 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/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg

@@ -1,47 +1,48 @@
+# Run this after _1 completes. (We need tc_analysis for the reference years).
 [default]
-case = "v3.LR.historical_0051"
+case = "v2.LR.historical_0201"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+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_2_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/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"
 years = "1995:1997:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/unique_id/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v3.LR.historical_0051"
+short_name = "v2.LR.historical_0201"
 walltime = "5:00:00"
 
     [[ atm_monthly_180x360_aave_mvm ]]
   # Test model-vs-model using the same files as the reference
   climo_subsection = "atm_monthly_180x360_aave"
   diff_title = "Difference"
   ref_final_yr = 1986
-  ref_name = "v3.LR.historical_0051"
+  ref_name = "v2.LR.historical_0201"
   ref_start_yr = 1985
   ref_years = "1985-1986",
   # Use _1 as reference
-  reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_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_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim"
   # reference_data_path_tc determined automatically
   run_type = "model_vs_model"
   sets = "tc_analysis",
-  short_ref_name = "v3.LR.historical_0051"
+  short_ref_name = "v2.LR.historical_0201"
   swap_test_ref = False
   tag = "model_vs_model"
   years = "1995-1996",

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg

@@ -0,0 +1,36 @@
+[default]
+case = "v2.LR.historical_0201"
+constraint = ""
+dry_run = "False"
+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_parallel_output/unique_id/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_parallel_www/unique_id"
+years = "1985:1989:2",
+
+[tc_analysis]
+active = True
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_scratch/unique_id/v2.LR.historical_0201"
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "compute"
+qos = "regular"
+short_name = "v2.LR.historical_0201"
+ts_num_years = 2
+walltime = "5:00:00"
+
+  [[ atm_monthly_180x360_aave_tc_analysis ]]
+  # Expecting two viewers: 1985-1986, 1987-1988
+  # The generation of these two viewers should occur in parallel.
+  sets = "tc_analysis",
+  # tc_obs is determined automatically

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_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg

@@ -1,18 +1,18 @@
 [default]
-case = "v3.LR.historical_0051"
+case = "v2.LR.historical_0201"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+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_tc_analysis_simultaneous_1_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
 www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/unique_id/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"

tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg

@@ -1,20 +1,20 @@
 # Run this immediately after running _1
 
 [default]
-case = "v3.LR.historical_0051"
+case = "v2.LR.historical_0201"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
+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_tc_analysis_simultaneous_2_output/unique_id/v3.LR.historical_0051"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v2.LR.historical_0201"
 partition = "debug"
 qos = "regular"
 www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/unique_id/v3.LR.historical_0051"
+scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"

tests/integration/generated/test_weekly_bundles_chrysalis.cfg

@@ -104,7 +104,7 @@ years = "1985:1989:2",
 
 [e3sm_diags]
 active = True
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 ref_final_yr = 1989
 ref_start_yr = 1985

tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg

@@ -93,7 +93,7 @@ walltime = "00:30:00"
 active = True
 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"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg

@@ -99,7 +99,7 @@ active = True
 climo_diurnal_frequency = "diurnal_8xdaily"
 climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
 climo_subsection = "atm_monthly_180x360_aave"
-environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_1003"
+environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20241015"
 grid = '180x360_aave'
 multiprocessing = True
 num_workers = 8

tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg

@@ -1,20 +1,20 @@
 [default]
-case = "#expand case_name#"
+case = "#expand case_name_v2#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
 input = #expand user_input#/E3SMv2/#expand case_name_v2#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_output/#expand unique_id#/#expand case_name#"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_output/#expand unique_id#/#expand case_name_v2#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_www/#expand unique_id#"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_scratch/#expand unique_id#/#expand case_name#"
+scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -25,7 +25,7 @@ multiprocessing = True
 num_workers = 8
 partition = "#expand partition_long#"
 qos = "#expand qos_long#"
-short_name = "#expand case_name#"
+short_name = "#expand case_name_v2#"
 ts_num_years = 2
 walltime = "#expand diags_walltime#"
 

tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg

@@ -1,18 +1,18 @@
 [default]
-case = "#expand case_name#"
+case = "#expand case_name_v2#"
 constraint = "#expand constraint#"
 dry_run = "#expand dry_run#"
 environment_commands = "#expand environment_commands#"
 input = #expand user_input#/E3SMv2/#expand case_name_v2#
 input_subdir = archive/atm/hist
 mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name#"
+output = "#expand user_output#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/#expand unique_id#/#expand case_name_v2#"
 partition = "#expand partition_short#"
 qos = "#expand qos_short#"
 www = "#expand user_www#zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/#expand unique_id#"
 years = "1985:1987:2",
 
 [tc_analysis]
 active = True
-scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/#expand unique_id#/#expand case_name#"
+scratch = "#expand scratch#zppy_min_case_e3sm_diags_tc_analysis_mvm_1_scratch/#expand unique_id#/#expand case_name_v2#"
 walltime = "00:30:00"