diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index 7c8eb0ff75bd..0d0ed53b9490 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -406,6 +406,16 @@
IcoswISC30E3r5
+
+ T62
+ T62
+ RRSwISC6to18E3r5
+ rx1
+ null
+ null
+ RRSwISC6to18E3r5
+
+
TL319
TL319
@@ -616,6 +626,16 @@
IcosXISC30E3r7
+
+ TL319
+ TL319
+ RRSwISC6to18E3r5
+ JRA025
+ null
+ null
+ RRSwISC6to18E3r5
+
+
TL319
TL319
@@ -1340,6 +1360,16 @@
IcoswISC30E3r5
+
+ ne30np4.pg2
+ ne30np4.pg2
+ RRSwISC6to18E3r5
+ r05
+ null
+ null
+ RRSwISC6to18E3r5
+
+
ne0np4_northamericax4v1
r0125
@@ -1623,6 +1653,26 @@
IcoswISC30E3r5
+
+ ne120np4.pg2
+ r05
+ RRSwISC6to18E3r5
+ r05
+ null
+ null
+ RRSwISC6to18E3r5
+
+
+
+ ne120np4.pg2
+ r025
+ RRSwISC6to18E3r5
+ r025
+ null
+ null
+ RRSwISC6to18E3r5
+
+
ne240np4
ne240np4
@@ -2291,6 +2341,16 @@
IcosXISC30E3r7
+
+ ne30np4.pg2
+ r05
+ RRSwISC6to18E3r5
+ r05
+ null
+ null
+ RRSwISC6to18E3r5
+
+
ne30np4.pg2
r05
@@ -2601,6 +2661,7 @@
$DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r5.231121.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.T62_RRSwISC6to18E3r5.240328.nc
T62 is Gaussian grid:
@@ -2657,6 +2718,8 @@
$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcosXISC30E3r7.240326.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.240326.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_RRSwISC6to18E3r5.240328.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_RRSwISC6to18E3r5.240328.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc
TL319 is JRA lat/lon grid:
@@ -2768,6 +2831,8 @@
$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcosXISC30E3r7.240326.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.240326.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_RRSwISC6to18E3r5.240328.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_RRSwISC6to18E3r5.240328.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc
ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:
@@ -2839,6 +2904,8 @@
$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_ICOS10.230120.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_IcoswISC30E3r5.231121.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_IcoswISC30E3r5.231121.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_RRSwISC6to18E3r5.240328.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_RRSwISC6to18E3r5.240328.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.ne120pg2_gx1v6.190819.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.ne120pg2_gx1v6.190819.nc
ne120np4 is Spectral Elem 1/4-deg grid w/ 2x2 FV physics grid
@@ -3077,6 +3144,13 @@
IcosXISC30E3r7 is a MPAS ocean grid generated with the jigsaw/compass process using a dual mesh that is a subdivided icosahedron, resulting in a nearly uniform resolution of 30 km.:
+
+ 4062533
+ 1
+ $DIN_LOC_ROOT/share/domains/domain.ocn.RRSwISC6to18E3r5.240328.nc
+ RRSwISC6to18E3r5 is a MPAS ocean grid generated with the jigsaw/compass process using a mesh density function that is roughly proportional to the Rossby radius of deformation, with 18 km gridcells at low and 6 km gridcells at high latitudes. Additionally, it has ocean in ice-shelf cavities:
+
+
@@ -3111,6 +3185,8 @@
$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_RRSwISC6to18E3r5.240328.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.r05_RRSwISC6to18E3r5.240328.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc
r05 is 1/2 degree river routing grid:
@@ -3144,6 +3220,8 @@
1440
720
$DIN_LOC_ROOT/share/domains/domain.lnd.r025_IcoswISC30E3r5.240129.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.r025_RRSwISC6to18E3r5.240402.nc
+ r025 is 1/4 degree river routing grid:
@@ -3601,6 +3679,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -3676,6 +3764,14 @@
+
+
+
+
+
+
+
+
@@ -3775,22 +3871,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3839,6 +3919,14 @@
+
+
+
+
+
+
+
+
@@ -3846,11 +3934,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4368,6 +4469,14 @@
+
+
+
+
+
+
+
+
@@ -4512,6 +4621,14 @@
+
+
+
+
+
+
+
+
@@ -4892,6 +5009,10 @@
+
+
+
+
@@ -5002,6 +5123,11 @@
+
+
+
+
+
@@ -5092,6 +5218,11 @@
+
+
+
+
+
@@ -5182,11 +5313,21 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml
index 0f8b03dfec38..55206b5de6b4 100644
--- a/components/elm/bld/namelist_files/namelist_definition.xml
+++ b/components/elm/bld/namelist_files/namelist_definition.xml
@@ -1423,7 +1423,7 @@ Representative concentration pathway for future scenarios [radiative forcing at
+ valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,TL319,cruncep,oEC60to30v3,oEC60to30v3wLI,ECwISC30to60E1r2,EC30to60E2r2,WC14to60E2r3,WCAtl12to45E2r4,SOwISC12to60E2r4,ECwISC30to60E2r1,oRRS18to6,oRRS18to6v3,oRRS15to5,oARRM60to10,oARRM60to6,ARRM10to60E2r1,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2,ICOS10,IcoswISC30E3r5,IcosXISC30E3r7,RRSwISC6to18E3r5">
Land mask description
diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
index 2880bf2ce5cb..6b9b14eb4e85 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -54,6 +54,7 @@
'00:04:00'
'00:02:00'
'00:01:00'
+'00:05:00'
'split_explicit_ab2'
2
@@ -83,6 +84,7 @@
.true.
.true.
.true.
+.true.
-1.0
.false.
30.0e3
@@ -104,6 +106,7 @@
.true.
.true.
.true.
+.true.
10.0
1000.0
1000.0
@@ -119,6 +122,7 @@
154.0
77.0
38.5
+100.0
.false.
10.0
@@ -149,6 +153,7 @@
4.37e08
5.46e07
6.83e06
+3.2e09
1.0
.false.
0.0
@@ -165,6 +170,7 @@
.false.
.false.
.false.
+.false.
'constant'
400.0
400.0
@@ -203,6 +209,7 @@
.false.
.false.
.false.
+.false.
'EdenGreatbatch'
'constant'
'constant'
@@ -399,6 +406,7 @@
'pressure_only'
'pressure_only'
'pressure_only'
+'pressure_only'
'Jenkins'
.false.
10.0
@@ -417,6 +425,7 @@
4.48e-3
4.48e-3
4.48e-3
+4.48e-3
1e-4
5e-2
0.011
@@ -430,6 +439,7 @@
0.00295
0.00295
0.00295
+0.00295
3.1e-4
8.42e-5
8.42e-5
@@ -441,6 +451,7 @@
8.42e-5
8.42e-5
8.42e-5
+8.42e-5
'flux-form'
@@ -469,6 +480,7 @@
4.48e-3
4.48e-3
4.48e-3
+4.48e-3
1.0e-3
10.0
2.5e-3
@@ -555,6 +567,7 @@
'0000_00:00:05'
'0000_00:00:02.5'
'0000_00:00:01.25'
+'0000_00:00:05'
2
.true.
2
@@ -601,6 +614,7 @@
.false.
.false.
.false.
+.false.
.false.
.false.
.false.
@@ -1126,6 +1140,7 @@
.true.
.true.
.true.
+.true.
'0000-00-00_01:00:00'
'mocStreamfunctionOutput'
.true.
@@ -1213,6 +1228,7 @@
.true.
.true.
.true.
+.true.
'dt'
'conservationCheckOutput'
.false.
@@ -1224,6 +1240,7 @@
.true.
.true.
.true.
+.true.
.false.
.true.
.true.
@@ -1233,6 +1250,7 @@
.true.
.true.
.true.
+.true.
.true.
'conservationCheckRestart'
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 47076dee726a..99c028a8808b 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -365,6 +365,20 @@ def buildnml(case, caseroot, compname):
ic_date = '20240314'
ic_prefix = 'mpaso.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis'
+ elif ocn_grid == 'RRSwISC6to18E3r5':
+ decomp_date = '20240404'
+ decomp_prefix = 'partitions/mpas-o.graph.info.'
+ restoring_file = 'sss.PHC2_monthlyClimatology.RRSwISC6to18E3r5.20240327.nc'
+ analysis_mask_file = 'RRSwISC6to18E3r5_mocBasinsAndTransects20210623.nc'
+ ic_date = '20240327'
+ ic_prefix = 'mpaso.RRSwISC6to18E3r5'
+ if ocn_ic_mode == 'spunup':
+ logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case")
+ logger.warning(" But no file available for this grid.")
+ if ocn_ismf == 'data':
+ data_ismf_file = 'prescribed_ismf_paolo2023.RRSwISC6to18E3r5.20240327.nc'
+
+
#--------------------------------------------------------------------
# Set OCN_FORCING = datm_forced_restoring if restoring file is available
#--------------------------------------------------------------------
@@ -491,7 +505,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('')
lines.append('')
lines.append('')
lines.append(' ')
lines.append(' ')
- if not ocn_grid.startswith("oRRS1"):
+ if not (ocn_grid.startswith("oRRS1") or ocn_grid.startswith("RRSwISC6")):
lines.append(' ')
lines.append(' ')
lines.append(' ')
@@ -1438,7 +1458,8 @@ def buildnml(case, caseroot, compname):
lines.append('240.0
120.0
60.0
+900.0
'noleap'
'2000-01-01_00:00:00'
'none'
@@ -89,6 +90,7 @@
75.0
85.0
85.0
+85.0
-60.0
-75.0
-75.0
@@ -103,6 +105,7 @@
-85.0
-85.0
-85.0
+-85.0
'uniform'
0.0
0.0
@@ -166,6 +169,7 @@
1
1
1
+2
true
true
120
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index 8337fcfc7061..5522d8ac6511 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -318,6 +318,16 @@ def buildnml(case, caseroot, compname):
grid_date = '20240314'
grid_prefix = 'mpassi.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis'
+ elif ice_grid == 'RRSwISC6to18E3r5':
+ decomp_date = '20240404'
+ decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+ grid_date = '20240327'
+ grid_prefix = 'mpassi.RRSwISC6to18E3r5'
+ data_iceberg_file = 'Iceberg_Climatology_Merino.RRSwISC6to18E3r5.20240327.nc'
+ if ice_ic_mode == 'spunup':
+ logger.warning("WARNING: The specified compset is requesting seaice ICs spunup from a G-case")
+ logger.warning(" But no file available for this grid.")
+
elif ice_grid == 'ICOS10':
grid_date = '211015'
grid_prefix = 'seaice.ICOS10'
@@ -451,7 +461,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('CESM1_MOD
CESM1_MOD
RASM_OPTION1
+ RASM_OPTION2
run_coupling
env_run.xml