E3SM-Project · forsyth2 · Dec 18, 2024 · Dec 7, 2024 · Dec 10, 2024 · Dec 10, 2024
diff --git a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg
@@ -25,7 +25,6 @@ years = "1985:1995:10",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:50:00"
 # ts is in 5 year increments
 years = "1985:1995:5"
@@ -35,7 +34,6 @@ years = "1985:1995:5"
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
   vars = "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U,ICEFRAC,LANDFRAC,OCNFRAC,PS,CLDICE,CLDLIQ,T,AODDUST"
 
   [[ land_monthly ]]
@@ -45,7 +43,6 @@ years = "1985:1995:5"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
-  ts_fmt = "cmip"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
   [[ rof_monthly ]]
@@ -79,6 +76,21 @@ years = "1985:1995:5"
   mapping_file = "glb"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
+[e3sm_to_cmip]
+active = True
+frequency = "monthly"
+walltime = "00:50:00"
+ts_num_years = 5
+years = "1985:1995:5"
+
+  [[ atm_monthly_180x360_aave ]]
+  # for ilamb
+  input_files = "eam.h0"
+
+  [[ land_monthly ]]
+  # for ilamb
+  input_files = "elm.h0"
+
 [e3sm_diags]
 active = True
 environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"

diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg
@@ -60,14 +60,12 @@ walltime = "00:30:00"
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
 
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
@@ -99,9 +97,20 @@ walltime = "00:30:00"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
-  ts_fmt = "cmip"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
+[e3sm_to_cmip]
+active = True
+frequency = "monthly"
+ts_num_years = 2
+walltime = "00:30:00"
+
+  [[ atm_monthly_180x360_aave ]]
+  input_files = "eam.h0"
+
+  [[ land_monthly ]]
+  input_files = "elm.h0"
+
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
 # [tc_analysis]
 # # The second run should run in parallel with the first run.

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
@@ -14,14 +14,12 @@ years = "1985:1989:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  #ts_fmt = "cmip"
 
 [e3sm_diags]
 active = True

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
@@ -14,11 +14,9 @@ years = "1985:1989:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  #ts_fmt = "cmip"
diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg
@@ -14,14 +14,12 @@ years = "1995:1999:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  #ts_fmt = "cmip"
 
 [e3sm_diags]
 active = True

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
@@ -14,7 +14,6 @@ years = "1985:1989:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ rof_monthly ]]

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
@@ -14,7 +14,6 @@ years = "1985:1989:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ rof_monthly ]]

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
@@ -14,7 +14,6 @@ years = "1995:1999:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ rof_monthly ]]

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
@@ -14,7 +14,6 @@ years = "1985:1989:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_daily_180x360_aave ]]

diff --git a/...s/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg b/...s/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg
@@ -14,7 +14,6 @@ years = "1985:1989:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_daily_180x360_aave ]]

diff --git a/...s/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg b/...s/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg
@@ -14,7 +14,6 @@ years = "1995:1999:4",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_daily_180x360_aave ]]

diff --git a/...tion/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg b/...tion/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg
@@ -17,7 +17,6 @@ years = "1985:1989:2",
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_glb ]]
@@ -51,14 +50,3 @@ walltime = "00:30:00"
 
 # (This cfg is the setup portion only)
 # [global_time_series]
-# active = True
-# climo_years = "1985-1989", "1990-1995",
-# environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
-# experiment_name = "v3.LR.historical_0051"
-# figstr = "v3.LR.historical_0051"
-# moc_file=mocTimeSeries_1985-1995.nc
-# plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
-# ts_num_years = 5
-# ts_years = "1985-1989", "1985-1995",
-# walltime = "00:30:00"
-# years = "1985-1995",
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
@@ -13,7 +13,6 @@ www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 years = "1985:1995:5",
 

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
@@ -13,7 +13,6 @@ www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_glb ]]

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
@@ -13,7 +13,6 @@ www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_glb ]]

diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg
@@ -13,9 +13,7 @@ www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:50:00"
-ts_fmt = "cmip"
 years = "1985:2014:30"
 
   [[ atm_monthly_180x360_aave ]]
@@ -32,6 +30,19 @@ years = "1985:2014:30"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
+[e3sm_to_cmip]
+active = True
+frequency = "monthly"
+ts_num_years = 30
+walltime = "00:50:00"
+years = "1985:2014:30"
+
+  [[ atm_monthly_180x360_aave ]]
+  input_files = "eam.h0"
+
+  [[ land_monthly ]]
+  input_files = "elm.h0"
+
 [ilamb]
 active = True
 nodes = 8

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
@@ -13,9 +13,7 @@ www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:50:00"
-ts_fmt = "cmip"
 years = "1985:2014:30"
 
   [[ land_monthly ]]
@@ -26,6 +24,16 @@ years = "1985:2014:30"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
 
+[e3sm_to_cmip]
+active = True
+frequency = "monthly"
+ts_num_years = 30
+walltime = "00:50:00"
+years = "1985:2014:30"
+
+  [[ land_monthly ]]
+  input_files = "elm.h0"
+
 [ilamb]
 active = True
 land_only = True

diff --git a/tests/integration/generated/test_min_case_nco_chrysalis.cfg b/tests/integration/generated/test_min_case_nco_chrysalis.cfg
@@ -40,14 +40,12 @@ walltime = "00:30:00"
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
 
   [[ atm_daily_180x360_aave ]]
   frequency = "daily"
@@ -85,5 +83,4 @@ walltime = "00:30:00"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
-  ts_fmt = "cmip"
   vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg
@@ -8,6 +8,8 @@
 #         > atm_monthly_diurnal_8xdaily_180x360_aave
 #   ts > atm_monthly_180x360_aave
 #      > land_monthly
+#   e3sm_to_cmip > atm_monthly_180x360_aave
+#                > land_monthly
 #   e3sm_diags > atm_monthly_180x360_aave
 # bundle 2:
 #   ts > atm_monthly_glb
@@ -59,14 +61,12 @@ years = "1985:1989:2",
 [ts]
 active = True
 bundle = "bundle1"
-e3sm_to_cmip_environment_commands = ""
 years = "1985:1989:2",
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
 
   [[ atm_monthly_glb ]]
   bundle = "bundle2" # Override bundle1
@@ -77,14 +77,12 @@ years = "1985:1989:2",
   years = "1985:1995:5",
 
   [[ land_monthly ]]
-  e3sm_to_cmip_environment_commands = ""
   extra_vars = "landfrac"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
   mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
   vars = "LAISHA,LAISUN"
-  ts_fmt = "cmip"
 
   [[ rof_monthly ]]
   bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
@@ -95,6 +93,19 @@ years = "1985:1989:2",
   mapping_file = ""
   vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
 
+[e3sm_to_cmip]
+active = True
+bundle = "bundle1"
+frequency = "monthly"
+ts_num_years = 2
+years = "1985:1989:2",
+
+  [[ atm_monthly_180x360_aave ]]
+  input_files = "eam.h0"
+
+  [[ land_monthly ]]
+  input_files = "elm.h0"
+
 # TODO: Add "tc_analysis" back in after empty dat is resolved.
 # [tc_analysis]
 # active = True

diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
@@ -37,14 +37,12 @@ walltime = "00:30:00"
 
 [ts]
 active = True
-e3sm_to_cmip_environment_commands = ""
 walltime = "00:30:00"
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
-  ts_fmt = "cmip"
 
   [[ atm_daily_180x360_aave ]]
   frequency = "daily"
@@ -81,9 +79,20 @@ walltime = "00:30:00"
   frequency = "monthly"
   input_files = "elm.h0"
   input_subdir = "archive/lnd/hist"
-  ts_fmt = "cmip"
   vars = "LAISHA,LAISUN"
 
+[e3sm_to_cmip]
+active = True
+frequency = "monthly"
+ts_num_years=2
+walltime = "00:30:00"
+
+  [[ atm_monthly_180x360_aave ]]
+  input_files = "eam.h0"
+
+  [[ land_monthly ]]
+  input_files = "elm.h0"
+
 [tc_analysis]
 active = True
 walltime = "00:30:00"