From ded4546e43a140d5c6d1066d41defbd51d92566c Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Thu, 9 Nov 2023 17:46:05 -0800 Subject: [PATCH 1/2] Update e3smv3 pgn and tsc tests with L80 ICs for atm and lnd --- CIME/SystemTests/pgn.py | 6 +++--- CIME/SystemTests/tsc.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CIME/SystemTests/pgn.py b/CIME/SystemTests/pgn.py index a597cc71f97..afbdd236e8e 100644 --- a/CIME/SystemTests/pgn.py +++ b/CIME/SystemTests/pgn.py @@ -45,7 +45,7 @@ ] ) FCLD_NC = "cam.h0.cloud.nc" -INIT_COND_FILE_TEMPLATE = "20210915.v2.ne4_oQU240.F2010.{}.{}.0002-{:02d}-01-00000.nc" +INIT_COND_FILE_TEMPLATE = "20231105.v3b01.F2010.ne4_oQU240.chrysalis.{}.{}.0002-{:02d}-01-00000.nc" INSTANCE_FILE_TEMPLATE = "{}{}_{:04d}.h0.0001-01-01-00000{}.nc" @@ -95,8 +95,8 @@ def build_phase(self, sharedlib_only=False, model_only=False): logger.debug("PGN_INFO: Updating user_nl_* files") csmdata_root = self._case.get_value("DIN_LOC_ROOT") - csmdata_atm = os.path.join(csmdata_root, "atm/cam/inic/homme/ne4_v2_init") - csmdata_lnd = os.path.join(csmdata_root, "lnd/clm2/initdata/ne4_oQU240_v2_init") + csmdata_atm = os.path.join(csmdata_root, "atm/cam/inic/homme/ne4_v3_init") + csmdata_lnd = os.path.join(csmdata_root, "lnd/clm2/initdata/ne4_oQU240_v3_init") iinst = 1 for icond in range(1, NUMBER_INITIAL_CONDITIONS + 1): diff --git a/CIME/SystemTests/tsc.py b/CIME/SystemTests/tsc.py index 3ecaefe75d0..3a122af893d 100644 --- a/CIME/SystemTests/tsc.py +++ b/CIME/SystemTests/tsc.py @@ -32,7 +32,7 @@ SIM_LENGTH = 600 # seconds OUT_FREQ = 10 # seconds INSPECT_AT = [300, 450, 600] # seconds -INIT_COND_FILE_TEMPLATE = "20210915.v2.ne4_oQU240.F2010.{}.{}.0002-{:02d}-01-00000.nc" +INIT_COND_FILE_TEMPLATE = "20231105.v3b01.F2010.ne4_oQU240.chrysalis.{}.{}.0002-{:02d}-01-00000.nc" VAR_LIST = [ "T", "Q", @@ -100,8 +100,8 @@ def _run_with_specified_dtime(self, dtime=2): self._case.set_value("STOP_OPTION", "nsteps") csmdata_root = self._case.get_value("DIN_LOC_ROOT") - csmdata_atm = os.path.join(csmdata_root, "atm/cam/inic/homme/ne4_v2_init") - csmdata_lnd = os.path.join(csmdata_root, "lnd/clm2/initdata/ne4_oQU240_v2_init") + csmdata_atm = os.path.join(csmdata_root, "atm/cam/inic/homme/ne4_v3_init") + csmdata_lnd = os.path.join(csmdata_root, "lnd/clm2/initdata/ne4_oQU240_v3_init") nstep_output = OUT_FREQ // dtime for iinst in range(1, NINST + 1): From 34c2b12b3913b96a5f17f7e0b48c7fde0dc1e9b7 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Fri, 16 Feb 2024 16:03:31 -0600 Subject: [PATCH 2/2] black formatting for pgn.py tsc.py --- CIME/SystemTests/pgn.py | 4 +++- CIME/SystemTests/tsc.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CIME/SystemTests/pgn.py b/CIME/SystemTests/pgn.py index afbdd236e8e..ac68773aeb4 100644 --- a/CIME/SystemTests/pgn.py +++ b/CIME/SystemTests/pgn.py @@ -45,7 +45,9 @@ ] ) FCLD_NC = "cam.h0.cloud.nc" -INIT_COND_FILE_TEMPLATE = "20231105.v3b01.F2010.ne4_oQU240.chrysalis.{}.{}.0002-{:02d}-01-00000.nc" +INIT_COND_FILE_TEMPLATE = ( + "20231105.v3b01.F2010.ne4_oQU240.chrysalis.{}.{}.0002-{:02d}-01-00000.nc" +) INSTANCE_FILE_TEMPLATE = "{}{}_{:04d}.h0.0001-01-01-00000{}.nc" diff --git a/CIME/SystemTests/tsc.py b/CIME/SystemTests/tsc.py index 3a122af893d..1a37ecaac5d 100644 --- a/CIME/SystemTests/tsc.py +++ b/CIME/SystemTests/tsc.py @@ -32,7 +32,9 @@ SIM_LENGTH = 600 # seconds OUT_FREQ = 10 # seconds INSPECT_AT = [300, 450, 600] # seconds -INIT_COND_FILE_TEMPLATE = "20231105.v3b01.F2010.ne4_oQU240.chrysalis.{}.{}.0002-{:02d}-01-00000.nc" +INIT_COND_FILE_TEMPLATE = ( + "20231105.v3b01.F2010.ne4_oQU240.chrysalis.{}.{}.0002-{:02d}-01-00000.nc" +) VAR_LIST = [ "T", "Q",