Skip to content

Commit

Permalink
Merge pull request #4513 from ESMCI/wlin/reset_ics_e3smv3_pgn_tsc_tests
Browse files Browse the repository at this point in the history
E3SMv3 atmosphere model default configuration is changed to use 80
vertical levels. The atm initial conditions for PGN and TSC with ne4 grid
need to be updated with those from an EAMv3-based F2010 run. The
land initial conditions are also replaced from the same run.

[NBFB] for PGN and TSC tests. Baseline comparison will have an exception
as the number of vertical levels in atm history output files differs

Test suite: chrysalis_atm_nbfb
Test baseline: chrys/intel/master
Test namelist changes: atm and lnd ICs (ncdata and finidat)
Test status: [bit for bit, roundoff, climate changing]: climate changing for these specific tests.
  • Loading branch information
rljacob authored Feb 16, 2024
2 parents 2f38b10 + 34c2b12 commit 12142ee
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
8 changes: 5 additions & 3 deletions CIME/SystemTests/pgn.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
]
)
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"


Expand Down Expand Up @@ -95,8 +97,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):
Expand Down
8 changes: 5 additions & 3 deletions CIME/SystemTests/tsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
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",
Expand Down Expand Up @@ -100,8 +102,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):
Expand Down

0 comments on commit 12142ee

Please sign in to comment.