From 8641b38bd1fd874d7802044a1b5d82b256a5b918 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 16 May 2024 11:28:58 -0600 Subject: [PATCH] remove reference to cice5 and ww3dev, no longer required --- CIME/XML/archive_base.py | 9 +-------- CIME/case/case_st_archive.py | 4 ---- CIME/data/config/cesm/config_files.xml | 18 +++++------------- CIME/hist_utils.py | 6 ------ 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/CIME/XML/archive_base.py b/CIME/XML/archive_base.py index fa42e186937..1b4ef9e7bd9 100644 --- a/CIME/XML/archive_base.py +++ b/CIME/XML/archive_base.py @@ -127,10 +127,6 @@ def get_all_hist_files(self, casename, model, from_dir, suffix="", ref_case=None # remove when component name is changed if model == "fv3gfs": model = "fv3" - if model == "cice5": - model = "cice" - if model == "ww3dev": - model = "ww3" hist_files = [] extensions = self.get_hist_file_extensions(self.get_entry(dmodel)) @@ -237,10 +233,7 @@ def _get_extension(model, filepath, ext_regexes): # Remove with component namechange if model == "fv3gfs": model = "fv3" - if model == "cice5": - model = "cice" - if model == "ww3dev": - model = "ww3" + basename = os.path.basename(filepath) m = None if ext_regexes is None: diff --git a/CIME/case/case_st_archive.py b/CIME/case/case_st_archive.py index 8238cf2f912..d735d6c587a 100644 --- a/CIME/case/case_st_archive.py +++ b/CIME/case/case_st_archive.py @@ -533,10 +533,6 @@ def _archive_restarts_date_comp( # the compname is drv but the files are named cpl if compname == "drv": compname = "cpl" - if compname == "cice5": - compname = "cice" - if compname == "ww3dev": - compname = "ww3" # get file_extension suffixes for suffix in archive.get_rest_file_extensions(archive_entry): diff --git a/CIME/data/config/cesm/config_files.xml b/CIME/data/config/cesm/config_files.xml index e128a870af9..688a8ad5437 100644 --- a/CIME/data/config/cesm/config_files.xml +++ b/CIME/data/config/cesm/config_files.xml @@ -179,7 +179,6 @@ unset $SRCROOT/components/ww3/ - $SRCROOT/components/ww3dev $SRCROOT/components/cpl7/components/data_comps_$COMP_INTERFACE/dwav $SRCROOT/components/cdeps/dwav $SRCROOT/components/cpl7/components/stub_comps_$COMP_INTERFACE/swav @@ -309,14 +308,12 @@ $COMP_ROOT_DIR_ATM/cime_config/config_compsets.xml $COMP_ROOT_DIR_GLC/cime_config/config_compsets.xml $COMP_ROOT_DIR_LND/cime_config/config_compsets.xml - $COMP_ROOT_DIR_LND/cime_config/config_compsets.xml - $COMP_ROOT_DIR_ICE/cime_config/config_compsets.xml $COMP_ROOT_DIR_ICE/cime_config/config_compsets.xml $COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml $COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml $COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml $COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml - $COMP_ROOT_DIR_WAV/cime_config/config_compsets.xml + $COMP_ROOT_DIR_WAV/cime_config/config_compsets.xml case_last env_case.xml @@ -334,14 +331,12 @@ $COMP_ROOT_DIR_ATM/cime_config/config_pes.xml $COMP_ROOT_DIR_GLC/cime_config/config_pes.xml $COMP_ROOT_DIR_LND/cime_config/config_pes.xml - $COMP_ROOT_DIR_LND/cime_config/config_pes.xml - $COMP_ROOT_DIR_ICE/cime_config/config_pes.xml $COMP_ROOT_DIR_ICE/cime_config/config_pes.xml $COMP_ROOT_DIR_OCN/cime_config/config_pes.xml $COMP_ROOT_DIR_OCN/cime_config/config_pes.xml $COMP_ROOT_DIR_OCN/cime_config/config_pes.xml $COMP_ROOT_DIR_OCN/cime_config/config_pes.xml - $COMP_ROOT_DIR_WAV/cime_config/config_pes.xml + $COMP_ROOT_DIR_WAV/cime_config/config_pes.xml case_last env_case.xml @@ -366,8 +361,6 @@ $COMP_ROOT_DIR_ATM/cime_config/config_archive.xml $COMP_ROOT_DIR_GLC/cime_config/config_archive.xml $COMP_ROOT_DIR_LND/cime_config/config_archive.xml - $COMP_ROOT_DIR_LND/cime_config/config_archive.xml - $COMP_ROOT_DIR_ICE/cime_config/config_archive.xml $COMP_ROOT_DIR_ICE/cime_config/config_archive.xml $COMP_ROOT_DIR_OCN/cime_config/config_archive.xml $COMP_ROOT_DIR_OCN/cime_config/config_archive.xml @@ -376,7 +369,7 @@ $COMP_ROOT_DIR_ROF/cime_config/config_archive.xml $COMP_ROOT_DIR_ROF/cime_config/config_archive.xml $COMP_ROOT_DIR_ROF/cime_config/config_archive.xml - $COMP_ROOT_DIR_WAV/cime_config/config_archive.xml + $COMP_ROOT_DIR_WAV/cime_config/config_archive.xml case_last env_case.xml @@ -389,18 +382,17 @@ $CIMEROOT/CIME/SystemTests $COMP_ROOT_DIR_LND/cime_config/SystemTests - $COMP_ROOT_DIR_LND/cime_config/SystemTests $COMP_ROOT_DIR_ATM/cime_config/SystemTests $COMP_ROOT_DIR_OCN/cime_config/SystemTests $COMP_ROOT_DIR_OCN/cime_config/SystemTests $COMP_ROOT_DIR_OCN/cime_config/SystemTests $COMP_ROOT_DIR_OCN/cime_config/SystemTests - $COMP_ROOT_DIR_ICE/cime_config/SystemTests $COMP_ROOT_DIR_ICE/cime_config/SystemTests $COMP_ROOT_DIR_GLC/cime_config/SystemTests $COMP_ROOT_DIR_ROF/cime_config/SystemTests $COMP_ROOT_DIR_ROF/cime_config/SystemTests $COMP_ROOT_DIR_ROF/cime_config/SystemTests + $COMP_ROOT_DIR_WAV/cime_config/SystemTests test env_test.xml @@ -426,7 +418,7 @@ $COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_rtm.xml $COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_mosart.xml $COMP_ROOT_DIR_ROF/cime_config/testdefs/testlist_mizuRoute.xml - $COMP_ROOT_DIR_WAV/cime_config/testdefs/testlist_ww3dev.xml + $COMP_ROOT_DIR_WAV/cime_config/testdefs/testlist_ww3.xml $SRCROOT/components/cdeps/datm/cime_config/testdefs/testlist_datm.xml $SRCROOT/components/cdeps/dice/cime_config/testdefs/testlist_dice.xml $SRCROOT/components/cdeps/dlnd/cime_config/testdefs/testlist_dlnd.xml diff --git a/CIME/hist_utils.py b/CIME/hist_utils.py index 86ce16e6d43..b67301c2824 100644 --- a/CIME/hist_utils.py +++ b/CIME/hist_utils.py @@ -181,9 +181,6 @@ def _hists_match(model, hists1, hists2, suffix1="", suffix2=""): multi_normalized1, multi_normalized2 = [], [] multiinst = False - if model == "ww3dev": - model = "ww3" - for hists, suffix, normalized, multi_normalized in [ (hists1, suffix1, normalized1, multi_normalized1), (hists2, suffix2, normalized2, multi_normalized2), @@ -630,9 +627,6 @@ def _generate_baseline_impl(case, baseline_dir=None, allow_baseline_overwrite=Fa logger.debug("latest_files: {}".format(hists)) num_gen += len(hists) - if model == "ww3dev": - model = "ww3" - for hist in hists: offset = hist.rfind(model) expect(