Update TC Analysis template (#632)

* Update TC Analysis template

* Test tc_analysis on v3

* Update environment_commands paths

* Remove scratch parameter

tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg

@@ -106,7 +106,6 @@ 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"
 # walltime = "00:30:00"
 
 [e3sm_diags]

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg

@@ -1,20 +1,19 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_tc_analysis_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_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_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/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -25,7 +24,7 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v2.LR.historical_0201"
+short_name = "v3.LR.historical_0051"
 ts_num_years = 2
 walltime = "5:00:00"
 

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg

@@ -1,18 +1,17 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_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/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_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/v2.LR.historical_0201"
 walltime = "00:30:00"

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg

@@ -1,21 +1,20 @@
 # Run this after _1 completes. (We need tc_analysis for the reference years).
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_tc_analysis_mvm_2_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_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_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/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]
@@ -26,23 +25,23 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v2.LR.historical_0201"
+short_name = "v3.LR.historical_0051"
 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 = "v2.LR.historical_0201"
+  ref_name = "v3.LR.historical_0051"
   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/v2.LR.historical_0201/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/v3.LR.historical_0051/post/atm/180x360_aave/clim"
   # reference_data_path_tc determined automatically
   run_type = "model_vs_model"
   sets = "tc_analysis",
-  short_ref_name = "v2.LR.historical_0201"
+  short_ref_name = "v3.LR.historical_0051"
   swap_test_ref = False
   tag = "model_vs_model"
   years = "1995-1996",

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg

@@ -1,20 +1,19 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_tc_analysis_parallel_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_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_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]
@@ -25,7 +24,7 @@ multiprocessing = True
 num_workers = 8
 partition = "compute"
 qos = "regular"
-short_name = "v2.LR.historical_0201"
+short_name = "v3.LR.historical_0051"
 ts_num_years = 2
 walltime = "5:00:00"
 

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg

@@ -0,0 +1,33 @@
+[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_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
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+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 ]]
+  sets = "tc_analysis",
+  # tc_obs is determined automatically

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg

@@ -0,0 +1,17 @@
+[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_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
+walltime = "00:30:00"

tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg

@@ -0,0 +1,47 @@
+# Run this after _1 completes. (We need tc_analysis for the reference years).
+[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_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
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+grid = '180x360_aave'
+multiprocessing = True
+num_workers = 8
+partition = "compute"
+qos = "regular"
+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 = "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/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 = "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_v2_parallel_chrysalis.cfg

@@ -0,0 +1,35 @@
+[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
+walltime = "00:30:00"
+
+[e3sm_diags]
+active = True
+environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
+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_tc_analysis_simultaneous_1_chrysalis.cfg

@@ -1,18 +1,17 @@
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_tc_analysis_simultaneous_1_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_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_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/v2.LR.historical_0201"
 walltime = "00:30:00"

tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg

@@ -1,20 +1,19 @@
 # Run this immediately after running _1
 
 [default]
-case = "v2.LR.historical_0201"
+case = "v3.LR.historical_0051"
 constraint = ""
 dry_run = "False"
 environment_commands = ""
-input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201
+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_tc_analysis_simultaneous_2_output/unique_id/v2.LR.historical_0201"
+output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_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_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/v2.LR.historical_0201"
 walltime = "00:30:00"

tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg

@@ -0,0 +1,17 @@
+[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_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
+walltime = "00:30:00"

tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg

@@ -0,0 +1,19 @@
+# Run this immediately after running _1
+
+[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_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
+walltime = "00:30:00"

tests/integration/generated/test_weekly_bundles_chrysalis.cfg

@@ -99,7 +99,6 @@ years = "1985:1989:2",
 # [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]

tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg

@@ -86,7 +86,6 @@ walltime = "00:30:00"
 
 [tc_analysis]
 active = True
-scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v2_scratch/unique_id/v2.LR.historical_0201"
 walltime = "00:30:00"
 
 [e3sm_diags]

tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg

@@ -91,7 +91,6 @@ walltime = "00:30:00"
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
 # [tc_analysis]
 # active = True
-# scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v3_scratch/unique_id/v3.LR.historical_0051"
 # walltime = "00:30:00"
 
 [e3sm_diags]