From 2a237334de778cbd8a03fe18188d248010170c2d Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 29 Jan 2025 13:58:21 -0600 Subject: [PATCH] Update testing paths and commands --- .../test_min_case_add_dependencies_chrysalis.cfg | 2 +- ..._min_case_carryover_dependencies_chrysalis.cfg | 2 +- ..._case_e3sm_diags_depend_on_climo_chrysalis.cfg | 2 +- ...e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg | 2 +- ...e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg | 2 +- ...min_case_e3sm_diags_depend_on_ts_chrysalis.cfg | 2 +- ...se_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg | 2 +- ...se_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg | 2 +- ...in_case_e3sm_diags_diurnal_cycle_chrysalis.cfg | 2 +- ...e_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg | 2 +- ...e_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg | 2 +- ...se_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg | 2 +- ...se_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg | 2 +- ...t_min_case_e3sm_diags_streamflow_chrysalis.cfg | 2 +- ...case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg | 2 +- ...case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg | 2 +- ..._min_case_e3sm_diags_tc_analysis_chrysalis.cfg | 2 +- ...ase_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg | 2 +- ...ase_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg | 2 +- ..._e3sm_diags_tc_analysis_parallel_chrysalis.cfg | 2 +- ..._e3sm_diags_tropical_subseasonal_chrysalis.cfg | 2 +- ...diags_tropical_subseasonal_mvm_1_chrysalis.cfg | 2 +- ...diags_tropical_subseasonal_mvm_2_chrysalis.cfg | 2 +- ...ries_comprehensive_v3_setup_only_chrysalis.cfg | 2 +- ...n_case_global_time_series_custom_chrysalis.cfg | 2 +- ...se_global_time_series_original_8_chrysalis.cfg | 2 +- ...al_time_series_original_8_no_ocn_chrysalis.cfg | 2 +- .../generated/test_min_case_ilamb_chrysalis.cfg | 2 +- .../test_min_case_ilamb_diff_years_chrysalis.cfg | 2 +- .../test_min_case_ilamb_land_only_chrysalis.cfg | 2 +- .../test_min_case_mpas_analysis_chrysalis.cfg | 2 +- .../generated/test_min_case_nco_chrysalis.cfg | 2 +- ..._case_tc_analysis_simultaneous_1_chrysalis.cfg | 2 +- ..._case_tc_analysis_simultaneous_2_chrysalis.cfg | 2 +- .../generated/test_weekly_bundles_chrysalis.cfg | 2 +- .../test_weekly_comprehensive_v3_chrysalis.cfg | 2 +- .../template_min_case_add_dependencies.cfg | 2 +- .../template_min_case_carryover_dependencies.cfg | 2 +- ...mplate_min_case_e3sm_diags_depend_on_climo.cfg | 2 +- ..._min_case_e3sm_diags_depend_on_climo_mvm_1.cfg | 2 +- ..._min_case_e3sm_diags_depend_on_climo_mvm_2.cfg | 2 +- .../template_min_case_e3sm_diags_depend_on_ts.cfg | 2 +- ...ate_min_case_e3sm_diags_depend_on_ts_mvm_1.cfg | 2 +- ...ate_min_case_e3sm_diags_depend_on_ts_mvm_2.cfg | 2 +- ...template_min_case_e3sm_diags_diurnal_cycle.cfg | 2 +- ...te_min_case_e3sm_diags_diurnal_cycle_mvm_1.cfg | 2 +- ...te_min_case_e3sm_diags_diurnal_cycle_mvm_2.cfg | 2 +- ...ate_min_case_e3sm_diags_lat_lon_land_mvm_1.cfg | 2 +- ...ate_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg | 2 +- .../template_min_case_e3sm_diags_streamflow.cfg | 2 +- ...plate_min_case_e3sm_diags_streamflow_mvm_1.cfg | 2 +- ...plate_min_case_e3sm_diags_streamflow_mvm_2.cfg | 2 +- .../template_min_case_e3sm_diags_tc_analysis.cfg | 2 +- ...late_min_case_e3sm_diags_tc_analysis_mvm_1.cfg | 2 +- ...late_min_case_e3sm_diags_tc_analysis_mvm_2.cfg | 2 +- ...e_min_case_e3sm_diags_tc_analysis_parallel.cfg | 2 +- ...emplate_min_case_e3sm_diags_tc_analysis_v2.cfg | 2 +- ...e_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg | 2 +- ...e_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg | 2 +- ...in_case_e3sm_diags_tc_analysis_v2_parallel.cfg | 2 +- ...e_min_case_e3sm_diags_tropical_subseasonal.cfg | 2 +- ...case_e3sm_diags_tropical_subseasonal_mvm_1.cfg | 2 +- ...case_e3sm_diags_tropical_subseasonal_mvm_2.cfg | 2 +- ...al_time_series_comprehensive_v3_setup_only.cfg | 2 +- ...emplate_min_case_global_time_series_custom.cfg | 2 +- ...ate_min_case_global_time_series_original_8.cfg | 2 +- ..._case_global_time_series_original_8_no_ocn.cfg | 2 +- tests/integration/template_min_case_ilamb.cfg | 2 +- .../template_min_case_ilamb_diff_years.cfg | 2 +- .../template_min_case_ilamb_land_only.cfg | 2 +- .../template_min_case_mpas_analysis.cfg | 2 +- tests/integration/template_min_case_nco.cfg | 2 +- ...mplate_min_case_tc_analysis_simultaneous_1.cfg | 2 +- ...mplate_min_case_tc_analysis_simultaneous_2.cfg | 2 +- ...ate_min_case_tc_analysis_v2_simultaneous_1.cfg | 2 +- ...ate_min_case_tc_analysis_v2_simultaneous_2.cfg | 2 +- tests/integration/template_weekly_bundles.cfg | 2 +- .../template_weekly_comprehensive_v2.cfg | 2 +- .../template_weekly_comprehensive_v3.cfg | 2 +- tests/integration/utils.py | 15 ++++++++++++--- 80 files changed, 91 insertions(+), 82 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 index 0ee81cdc..ef84fe93 100644 --- a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg @@ -11,7 +11,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg index cc0fd50e..8d8c1f97 100644 --- a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg @@ -26,7 +26,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index c8d1a9bc..1238eb0c 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index dab95aba..2ab6a865 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 2a56fbf8..d094eb19 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 68bd25af..998f65bc 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 03147e49..51cfd973 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 703179a0..cc694380 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 748883de..6016c7e3 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 0160066c..938aa8f6 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 4d7985f5..a3ee1fd6 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index f8074879..0b13acfe 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 8c71b45d..5c7fd909 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index de3942ca..448078da 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index 37ab3c9f..98ca91b8 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index d1705ec3..70469f73 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" 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 index dbf72683..3520160b 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/v3.LR.historical_0051" 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 index cd307a9d..7401b998 100644 --- 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 @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg index 5bea95bd..1740f190 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg @@ -4,7 +4,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg index 4e745b2c..294292a0 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg index 5cd57105..dd643995 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_tropical_subseasonal_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg index 90919f53..340f0d65 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_tropical_subseasonal_mvm_1_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg index 72f6ad58..3fc9860b 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_tropical_subseasonal_mvm_2_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg index ad7b5de1..5b0acf38 100644 --- a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg @@ -6,7 +6,7 @@ environment_commands = "" fail_on_dependency_skip = True guess_path_parameters = False guess_section_parameters = False -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_global_time_series_comprehensive_v3_setup_only_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg index 895bcb53..0ce5dcbb 100644 --- a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_global_time_series_custom_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg index 907b851f..6ba5d107 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_global_time_series_original_8_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg index 47337ead..82d1132d 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_global_time_series_original_8_no_ocn_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg index 28ffa23b..a01a52d6 100644 --- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_ilamb_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg index dd2a3169..e2bc6e7a 100644 --- a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_ilamb_diff_years_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg index b78d5445..506dda2a 100644 --- a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_ilamb_land_only_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg index 0cf4232b..21c1131d 100644 --- a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_mpas_analysis_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_nco_chrysalis.cfg b/tests/integration/generated/test_min_case_nco_chrysalis.cfg index 7e8ec09f..db62c7ec 100644 --- a/tests/integration/generated/test_min_case_nco_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_nco_chrysalis.cfg @@ -6,7 +6,7 @@ environment_commands = "" fail_on_dependency_skip = True guess_path_parameters = False guess_section_parameters = False -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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_nco_output/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg index 1fb4a68f..e6f23006 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg @@ -3,7 +3,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg index c397018c..832d43cd 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg @@ -5,7 +5,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/v3.LR.historical_0051" diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg index e731a6c5..01a9f9e4 100644 --- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg @@ -28,7 +28,7 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" environment_commands = "" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg index d09e8113..58896b65 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg @@ -6,7 +6,7 @@ environment_commands = "" fail_on_dependency_skip = True guess_path_parameters = False guess_section_parameters = False -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051 +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/unique_id/v3.LR.historical_0051" diff --git a/tests/integration/template_min_case_add_dependencies.cfg b/tests/integration/template_min_case_add_dependencies.cfg index df16ef97..6f1a8e15 100644 --- a/tests/integration/template_min_case_add_dependencies.cfg +++ b/tests/integration/template_min_case_add_dependencies.cfg @@ -11,7 +11,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_add_dependencies_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_carryover_dependencies.cfg b/tests/integration/template_min_case_carryover_dependencies.cfg index c789ef00..56227947 100644 --- a/tests/integration/template_min_case_carryover_dependencies.cfg +++ b/tests/integration/template_min_case_carryover_dependencies.cfg @@ -26,7 +26,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_carryover_dependencies_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg index a8eded71..aa6547a7 100644 --- a/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg +++ b/tests/integration/template_min_case_e3sm_diags_depend_on_climo.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_climo_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_1.cfg index a0fdf732..08d50d16 100644 --- a/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg index 38b255db..7de1ccf3 100644 --- a/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_depend_on_climo_mvm_2.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_ts.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_ts.cfg index 66cd4c8b..4c28c9f9 100644 --- a/tests/integration/template_min_case_e3sm_diags_depend_on_ts.cfg +++ b/tests/integration/template_min_case_e3sm_diags_depend_on_ts.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_ts_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_1.cfg index c840c724..cf473b57 100644 --- a/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_2.cfg index 747afc20..44a82f80 100644 --- a/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_depend_on_ts_mvm_2.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_diurnal_cycle.cfg b/tests/integration/template_min_case_e3sm_diags_diurnal_cycle.cfg index 6d4f0ed0..c1ad2194 100644 --- a/tests/integration/template_min_case_e3sm_diags_diurnal_cycle.cfg +++ b/tests/integration/template_min_case_e3sm_diags_diurnal_cycle.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_diurnal_cycle_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_1.cfg index ad30b2b6..2393b187 100644 --- a/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_2.cfg index d6e664cc..c4afe3db 100644 --- a/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_diurnal_cycle_mvm_2.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_1.cfg index 50a72a70..45608eaa 100644 --- a/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg index 5b83882b..cfce4746 100644 --- a/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_lat_lon_land_mvm_2.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_streamflow.cfg b/tests/integration/template_min_case_e3sm_diags_streamflow.cfg index 2712f094..a68c5df6 100644 --- a/tests/integration/template_min_case_e3sm_diags_streamflow.cfg +++ b/tests/integration/template_min_case_e3sm_diags_streamflow.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_streamflow_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_1.cfg index 76200561..4ab631dd 100644 --- a/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_streamflow_mvm_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_2.cfg index 3fe7c451..40ba291a 100644 --- a/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_streamflow_mvm_2.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_streamflow_mvm_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg index c9895df6..5f8e7166 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# 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#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg index c068e382..71d552f1 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# 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#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg index 65972e30..ddec5d86 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_mvm_2.cfg @@ -4,7 +4,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# 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_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg index c7952e7a..842b507d 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_parallel.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# 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_parallel_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg index 52cba8b4..f7df2f5f 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2.cfg @@ -3,7 +3,7 @@ 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 = #expand user_input_v2#/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_v2#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg index 808d35fa..04cf4573 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_1.cfg @@ -3,7 +3,7 @@ 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 = #expand user_input_v2#/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_v2#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg index 743de4d3..31f1ef47 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_mvm_2.cfg @@ -4,7 +4,7 @@ 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 = #expand user_input_v2#/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_2_output/#expand unique_id#/#expand case_name_v2#" diff --git a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg index 46179a59..03644515 100644 --- a/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tc_analysis_v2_parallel.cfg @@ -3,7 +3,7 @@ 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 = #expand user_input_v2#/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_parallel_output/#expand unique_id#/#expand case_name_v2#" diff --git a/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal.cfg b/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal.cfg index 788bd1da..c19d3589 100644 --- a/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_tropical_subseasonal_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_1.cfg b/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_1.cfg index 0c190691..d6e4022a 100644 --- a/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_1.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_2.cfg b/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_2.cfg index 66d46f7c..8b3b9fea 100644 --- a/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_2.cfg +++ b/tests/integration/template_min_case_e3sm_diags_tropical_subseasonal_mvm_2.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_global_time_series_comprehensive_v3_setup_only.cfg b/tests/integration/template_min_case_global_time_series_comprehensive_v3_setup_only.cfg index 3c743694..0d8d9941 100644 --- a/tests/integration/template_min_case_global_time_series_comprehensive_v3_setup_only.cfg +++ b/tests/integration/template_min_case_global_time_series_comprehensive_v3_setup_only.cfg @@ -6,7 +6,7 @@ environment_commands = "#expand environment_commands#" fail_on_dependency_skip = True guess_path_parameters = False guess_section_parameters = False -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_global_time_series_custom.cfg b/tests/integration/template_min_case_global_time_series_custom.cfg index 3b16536d..c5ecea3c 100644 --- a/tests/integration/template_min_case_global_time_series_custom.cfg +++ b/tests/integration/template_min_case_global_time_series_custom.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_global_time_series_custom_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_global_time_series_original_8.cfg b/tests/integration/template_min_case_global_time_series_original_8.cfg index fd676996..b9aecdca 100644 --- a/tests/integration/template_min_case_global_time_series_original_8.cfg +++ b/tests/integration/template_min_case_global_time_series_original_8.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_global_time_series_original_8_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_global_time_series_original_8_no_ocn.cfg b/tests/integration/template_min_case_global_time_series_original_8_no_ocn.cfg index b22072c0..c95c91df 100644 --- a/tests/integration/template_min_case_global_time_series_original_8_no_ocn.cfg +++ b/tests/integration/template_min_case_global_time_series_original_8_no_ocn.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_global_time_series_original_8_no_ocn_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_ilamb.cfg b/tests/integration/template_min_case_ilamb.cfg index 5bc64dd8..29d7d459 100644 --- a/tests/integration/template_min_case_ilamb.cfg +++ b/tests/integration/template_min_case_ilamb.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_ilamb_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_ilamb_diff_years.cfg b/tests/integration/template_min_case_ilamb_diff_years.cfg index 2f37ff87..e8319fbe 100644 --- a/tests/integration/template_min_case_ilamb_diff_years.cfg +++ b/tests/integration/template_min_case_ilamb_diff_years.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_ilamb_diff_years_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_ilamb_land_only.cfg b/tests/integration/template_min_case_ilamb_land_only.cfg index add58685..146b17c3 100644 --- a/tests/integration/template_min_case_ilamb_land_only.cfg +++ b/tests/integration/template_min_case_ilamb_land_only.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_ilamb_land_only_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_mpas_analysis.cfg b/tests/integration/template_min_case_mpas_analysis.cfg index 67d2339c..9a856d7c 100644 --- a/tests/integration/template_min_case_mpas_analysis.cfg +++ b/tests/integration/template_min_case_mpas_analysis.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_mpas_analysis_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_nco.cfg b/tests/integration/template_min_case_nco.cfg index 9b9ea993..8f224e7b 100644 --- a/tests/integration/template_min_case_nco.cfg +++ b/tests/integration/template_min_case_nco.cfg @@ -6,7 +6,7 @@ environment_commands = "#expand environment_commands#" fail_on_dependency_skip = True guess_path_parameters = False guess_section_parameters = False -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_nco_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg b/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg index 51f2b3de..548eeaad 100644 --- a/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg +++ b/tests/integration/template_min_case_tc_analysis_simultaneous_1.cfg @@ -3,7 +3,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_1_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg b/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg index 0eba3e68..9625c296 100644 --- a/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg +++ b/tests/integration/template_min_case_tc_analysis_simultaneous_2.cfg @@ -5,7 +5,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_min_case_tc_analysis_simultaneous_2_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg index 1e0ddf65..17c7de41 100644 --- a/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg +++ b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_1.cfg @@ -3,7 +3,7 @@ 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 = #expand user_input_v2#/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_tc_analysis_simultaneous_1_output/#expand unique_id#/#expand case_name_v2#" diff --git a/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg index ad361b9d..3b6e413d 100644 --- a/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg +++ b/tests/integration/template_min_case_tc_analysis_v2_simultaneous_2.cfg @@ -5,7 +5,7 @@ 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 = #expand user_input_v2#/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_tc_analysis_simultaneous_2_output/#expand unique_id#/#expand case_name_v2#" diff --git a/tests/integration/template_weekly_bundles.cfg b/tests/integration/template_weekly_bundles.cfg index b5aeb8d6..a877f32f 100644 --- a/tests/integration/template_weekly_bundles.cfg +++ b/tests/integration/template_weekly_bundles.cfg @@ -28,7 +28,7 @@ case = "#expand case_name#" constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py diff --git a/tests/integration/template_weekly_comprehensive_v2.cfg b/tests/integration/template_weekly_comprehensive_v2.cfg index db3d592a..ae157b19 100644 --- a/tests/integration/template_weekly_comprehensive_v2.cfg +++ b/tests/integration/template_weekly_comprehensive_v2.cfg @@ -4,7 +4,7 @@ constraint = "#expand constraint#" dry_run = "#expand dry_run#" environment_commands = "#expand environment_commands#" fail_on_dependency_skip = True -input = #expand user_input#/E3SMv2/#expand case_name_v2# +input = #expand user_input_v2#/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_weekly_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#" diff --git a/tests/integration/template_weekly_comprehensive_v3.cfg b/tests/integration/template_weekly_comprehensive_v3.cfg index 7872c923..07066558 100644 --- a/tests/integration/template_weekly_comprehensive_v3.cfg +++ b/tests/integration/template_weekly_comprehensive_v3.cfg @@ -6,7 +6,7 @@ environment_commands = "#expand environment_commands#" fail_on_dependency_skip = True guess_path_parameters = False guess_section_parameters = False -input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/#expand case_name# +input = #expand user_input_v3#/E3SMv3/#expand case_name# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" output = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#" diff --git a/tests/integration/utils.py b/tests/integration/utils.py index db97f883..534d5ae8 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -174,7 +174,8 @@ def get_chyrsalis_expansions(config): "partition_short": "debug", "qos_long": "regular", "qos_short": "regular", - "user_input": "/lcrc/group/e3sm/ac.forsyth2/", + "user_input_v2": "/lcrc/group/e3sm/ac.forsyth2/", + "user_input_v3": "/lcrc/group/e3sm2/ac.wlin/", "user_output": f"/lcrc/group/e3sm/{username}/", "user_www": f"{web_base_path}/{username}/", } @@ -202,7 +203,8 @@ def get_compy_expansions(config): "partition_short": "short", "qos_long": "regular", "qos_short": "regular", - "user_input": "/compyfs/fors729/", + "user_input_v2": "/compyfs/fors729/", + "user_input_v3": "/compyfs/fors729/", "user_output": f"/compyfs/{username}/", "user_www": f"{web_base_path}/{username}/", } @@ -231,7 +233,8 @@ def get_perlmutter_expansions(config): "qos_long": "regular", "qos_short": "regular", # debug walltime too short? # Use CFS for large datasets - "user_input": "/global/cfs/cdirs/e3sm/forsyth/", + "user_input_v2": "/global/cfs/cdirs/e3sm/forsyth/", + "user_input_v3": "/global/cfs/cdirs/e3sm/forsyth/", "user_output": f"/global/cfs/cdirs/e3sm/{username}/", "user_www": f"{web_base_path}/{username}/", } @@ -280,7 +283,13 @@ def generate_cfgs(unified_testing=False, dry_run=False): ) expansions = get_expansions() if unified_testing: + expansions["diags_environment_commands"] = expansions[ + "environment_commands_test" + ] expansions["environment_commands"] = expansions["environment_commands_test"] + expansions["global_time_series_environment_commands"] = expansions[ + "environment_commands_test" + ] else: # The cfg doesn't need this line, # but it would be difficult to only write environment_commands in the unified_testing case.