From 581201010ce59c52a8e52c5084e43ce75502a31f Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Thu, 12 Dec 2024 12:54:33 -0600 Subject: [PATCH] Address comments --- .../test_min_case_add_dependencies_chrysalis.cfg | 12 +++--------- ...est_min_case_carryover_dependencies_chrysalis.cfg | 8 ++------ .../generated/test_min_case_ilamb_chrysalis.cfg | 9 ++------- .../test_min_case_ilamb_land_only_chrysalis.cfg | 6 ++---- .../generated/test_weekly_bundles_chrysalis.cfg | 8 ++------ .../test_weekly_comprehensive_v2_chrysalis.cfg | 6 +----- .../test_weekly_comprehensive_v3_chrysalis.cfg | 7 +------ .../template_min_case_add_dependencies.cfg | 12 +++--------- .../template_min_case_carryover_dependencies.cfg | 8 ++------ tests/integration/template_min_case_ilamb.cfg | 9 ++------- .../template_min_case_ilamb_land_only.cfg | 6 ++---- tests/integration/template_weekly_bundles.cfg | 8 ++------ .../integration/template_weekly_comprehensive_v2.cfg | 6 +----- .../integration/template_weekly_comprehensive_v3.cfg | 7 +------ tests/test_zppy_e3sm_diags.py | 1 - zppy/defaults/default.ini | 2 ++ zppy/e3sm_diags.py | 10 ---------- zppy/e3sm_to_cmip.py | 6 ------ zppy/templates/e3sm_to_cmip.bash | 4 ++-- zppy/ts.py | 1 - 20 files changed, 30 insertions(+), 106 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 8a0e4619..0ee81cdc 100644 --- a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg @@ -78,24 +78,18 @@ years = "1985:1995:5" [e3sm_to_cmip] active = True +frequency = "monthly" walltime = "00:50:00" -# ts is in 5 year increments +ts_num_years = 5 years = "1985:1995:5" [[ atm_monthly_180x360_aave ]] - # for e3sm_diags (depend_on_ts), ilamb - frequency = "monthly" + # for ilamb input_files = "eam.h0" - input_subdir = "archive/atm/hist" - 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 ]] # for ilamb - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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_diags] active = True 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 6799c2ba..cc0fd50e 100644 --- a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg @@ -101,19 +101,15 @@ walltime = "00:30:00" [e3sm_to_cmip] active = True +frequency = "monthly" +ts_num_years = 2 walltime = "00:30:00" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" # TODO: Add "tc_analysis" back in after empty dat is resolved. # [tc_analysis] diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg index cb1c8eb3..705c31c8 100644 --- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg @@ -32,21 +32,16 @@ years = "1985:2014:30" [e3sm_to_cmip] active = True +frequency = "monthly" +ts_num_years = 30 walltime = "00:50:00" years = "1985:2014:30" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" - 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 ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" [ilamb] active = True 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 c4e38ae5..b78d5445 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 @@ -26,15 +26,13 @@ years = "1985:2014:30" [e3sm_to_cmip] active = True +frequency = "monthly" +ts_num_years = 30 walltime = "00:50:00" years = "1985:2014:30" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" [ilamb] active = True diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg index 8ab34d5e..e731a6c5 100644 --- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg @@ -96,19 +96,15 @@ years = "1985:1989:2", [e3sm_to_cmip] active = True bundle = "bundle1" +frequency = "monthly" +ts_num_years = 2 years = "1985:1989:2", [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc" - vars = "LAISHA,LAISUN" # TODO: Add "tc_analysis" back in after empty dat is resolved. # [tc_analysis] diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg index fd0f90f9..12f93642 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg @@ -83,19 +83,15 @@ walltime = "00:30:00" [e3sm_to_cmip] active = True +frequency = "monthly" ts_num_years=2 walltime = "00:30:00" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - vars = "LAISHA,LAISUN" [tc_analysis] active = True diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg index ef516feb..846f8876 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg @@ -87,20 +87,15 @@ walltime = "00:30:00" [e3sm_to_cmip] active = True +frequency = "monthly" ts_num_years=2 walltime = "00:30:00" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" # TODO: Add "tc_analysis" back in after empty dat is resolved. # [tc_analysis] diff --git a/tests/integration/template_min_case_add_dependencies.cfg b/tests/integration/template_min_case_add_dependencies.cfg index 09f7f4a3..df16ef97 100644 --- a/tests/integration/template_min_case_add_dependencies.cfg +++ b/tests/integration/template_min_case_add_dependencies.cfg @@ -78,24 +78,18 @@ years = "1985:1995:5" [e3sm_to_cmip] active = True +frequency = "monthly" walltime = "00:50:00" -# ts is in 5 year increments +ts_num_years = 5 years = "1985:1995:5" [[ atm_monthly_180x360_aave ]] - # for e3sm_diags (depend_on_ts), ilamb - frequency = "monthly" + # for ilamb input_files = "eam.h0" - input_subdir = "archive/atm/hist" - 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 ]] # for ilamb - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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_diags] active = True diff --git a/tests/integration/template_min_case_carryover_dependencies.cfg b/tests/integration/template_min_case_carryover_dependencies.cfg index 23c7ddc9..c789ef00 100644 --- a/tests/integration/template_min_case_carryover_dependencies.cfg +++ b/tests/integration/template_min_case_carryover_dependencies.cfg @@ -101,19 +101,15 @@ walltime = "00:30:00" [e3sm_to_cmip] active = True +frequency = "monthly" +ts_num_years = 2 walltime = "00:30:00" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" # TODO: Add "tc_analysis" back in after empty dat is resolved. # [tc_analysis] diff --git a/tests/integration/template_min_case_ilamb.cfg b/tests/integration/template_min_case_ilamb.cfg index 81931fa3..d4ff87a4 100644 --- a/tests/integration/template_min_case_ilamb.cfg +++ b/tests/integration/template_min_case_ilamb.cfg @@ -32,21 +32,16 @@ years = "1985:2014:30" [e3sm_to_cmip] active = True +frequency = "monthly" +ts_num_years = 30 walltime = "00:50:00" years = "1985:2014:30" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" - 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 ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" [ilamb] active = True diff --git a/tests/integration/template_min_case_ilamb_land_only.cfg b/tests/integration/template_min_case_ilamb_land_only.cfg index 2e182627..add58685 100644 --- a/tests/integration/template_min_case_ilamb_land_only.cfg +++ b/tests/integration/template_min_case_ilamb_land_only.cfg @@ -26,15 +26,13 @@ years = "1985:2014:30" [e3sm_to_cmip] active = True +frequency = "monthly" +ts_num_years = 30 walltime = "00:50:00" years = "1985:2014:30" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" [ilamb] active = True diff --git a/tests/integration/template_weekly_bundles.cfg b/tests/integration/template_weekly_bundles.cfg index 7fa058d2..b5aeb8d6 100644 --- a/tests/integration/template_weekly_bundles.cfg +++ b/tests/integration/template_weekly_bundles.cfg @@ -96,19 +96,15 @@ years = "1985:1989:2", [e3sm_to_cmip] active = True bundle = "bundle1" +frequency = "monthly" +ts_num_years = 2 years = "1985:1989:2", [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc" - vars = "LAISHA,LAISUN" # TODO: Add "tc_analysis" back in after empty dat is resolved. # [tc_analysis] diff --git a/tests/integration/template_weekly_comprehensive_v2.cfg b/tests/integration/template_weekly_comprehensive_v2.cfg index 484fcfe8..e9ebac2e 100644 --- a/tests/integration/template_weekly_comprehensive_v2.cfg +++ b/tests/integration/template_weekly_comprehensive_v2.cfg @@ -83,19 +83,15 @@ walltime = "00:30:00" [e3sm_to_cmip] active = True +frequency = "monthly" ts_num_years=2 walltime = "00:30:00" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - vars = "LAISHA,LAISUN" [tc_analysis] active = True diff --git a/tests/integration/template_weekly_comprehensive_v3.cfg b/tests/integration/template_weekly_comprehensive_v3.cfg index ea91a5d8..5d23aa3f 100644 --- a/tests/integration/template_weekly_comprehensive_v3.cfg +++ b/tests/integration/template_weekly_comprehensive_v3.cfg @@ -87,20 +87,15 @@ walltime = "00:30:00" [e3sm_to_cmip] active = True +frequency = "monthly" ts_num_years=2 walltime = "00:30:00" [[ atm_monthly_180x360_aave ]] - frequency = "monthly" input_files = "eam.h0" - input_subdir = "archive/atm/hist" [[ land_monthly ]] - frequency = "monthly" input_files = "elm.h0" - input_subdir = "archive/lnd/hist" - 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" # TODO: Add "tc_analysis" back in after empty dat is resolved. # [tc_analysis] diff --git a/tests/test_zppy_e3sm_diags.py b/tests/test_zppy_e3sm_diags.py index 20cb7743..61216a86 100644 --- a/tests/test_zppy_e3sm_diags.py +++ b/tests/test_zppy_e3sm_diags.py @@ -548,7 +548,6 @@ def test_add_ts_dependencies(): add_ts_dependencies(c, dependencies, "script_dir", 1980) assert dependencies == [ "script_dir/ts_sub_1980-1984-0005.status", - "script_dir/e3sm_to_cmip_sub_1980-1984-0005.status", ] c = {"sets": ["streamflow"]} diff --git a/zppy/defaults/default.ini b/zppy/defaults/default.ini index e4193a7f..8e1a53df 100644 --- a/zppy/defaults/default.ini +++ b/zppy/defaults/default.ini @@ -119,6 +119,8 @@ input_component = string(default="") [e3sm_to_cmip] cmip_metadata = string(default="inclusions/e3sm_to_cmip/default_metadata.json") # Model component having generated input files (eam, eamxx, elm, mosart, ...) +cmip_var_atm = string(default="pr, tas, rsds, rlds, rsus") +cmip_var_land = string(default="mrsos, mrso, mrfso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, tsl, lai, cLitter, cProduct, cSoilFast, cSoilMedium, cSoilSlow, fFire, fHarvest, cVeg, nbp, gpp, ra, rh") input_component = string(default="") [[__many__]] diff --git a/zppy/e3sm_diags.py b/zppy/e3sm_diags.py index c0a544f2..2c77f5b9 100644 --- a/zppy/e3sm_diags.py +++ b/zppy/e3sm_diags.py @@ -295,16 +295,6 @@ def add_ts_dependencies( end_yr, c["ts_num_years"], ) - # e3sm_to_cmip task - add_dependencies( - dependencies, - script_dir, - "e3sm_to_cmip", - ts_sub, # Relies on having the same subsection name as the corresponding ts subsection! - start_yr, - end_yr, - c["ts_num_years"], - ) if "streamflow" in c["sets"]: add_dependencies( dependencies, diff --git a/zppy/e3sm_to_cmip.py b/zppy/e3sm_to_cmip.py index 93c0f094..d6f24d20 100644 --- a/zppy/e3sm_to_cmip.py +++ b/zppy/e3sm_to_cmip.py @@ -13,9 +13,6 @@ get_years, initialize_template, make_executable, - set_component_and_prc_typ, - set_grid, - set_mapping_file, submit_script, write_settings_file, ) @@ -34,9 +31,6 @@ def e3sm_to_cmip(config: ConfigObj, script_dir: str, existing_bundles, job_ids_f # --- Generate and submit e3sm_to_cmip scripts --- for c in tasks: dependencies: List[str] = [] - set_mapping_file(c) - set_grid(c) - set_component_and_prc_typ(c) c["cmor_tables_prefix"] = c["diagnostics_base_path"] year_sets: List[Tuple[int, int]] = get_years(c["years"]) # Loop over year sets diff --git a/zppy/templates/e3sm_to_cmip.bash b/zppy/templates/e3sm_to_cmip.bash index e9974d79..1a0d871d 100644 --- a/zppy/templates/e3sm_to_cmip.bash +++ b/zppy/templates/e3sm_to_cmip.bash @@ -33,13 +33,13 @@ EOF ${dest_cmip}/${tmp_dir} \ {% if input_files.split(".")[0] == 'clm2' or input_files.split(".")[0] == 'elm' -%} --var-list \ - 'mrsos, mrso, mrfso, mrros, mrro, prveg, evspsblveg, evspsblsoi, tran, tsl, lai, cLitter, cProduct, cSoilFast, cSoilMedium, cSoilSlow, fFire, fHarvest, cVeg, nbp, gpp, ra, rh' \ + '{{ cmip_var_lnd }}' \ --realm \ lnd \ {% endif -%} {% if input_files.split(".")[0] == 'cam' or input_files.split(".")[0] == 'eam' -%} --var-list \ - 'pr, tas, rsds, rlds, rsus' \ + '{{ cmip_var_atm }}' \ --realm \ atm \ {% endif -%} diff --git a/zppy/ts.py b/zppy/ts.py index ea724887..b9976057 100644 --- a/zppy/ts.py +++ b/zppy/ts.py @@ -35,7 +35,6 @@ def ts(config: ConfigObj, script_dir: str, existing_bundles, job_ids_file): set_mapping_file(c) set_grid(c) set_component_and_prc_typ(c) - c["cmor_tables_prefix"] = c["diagnostics_base_path"] year_sets: List[Tuple[int, int]] = get_years(c["years"]) # Loop over year sets for s in year_sets: