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..ffd45353943e 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
@@ -149,6 +151,7 @@
4.37e08
5.46e07
6.83e06
+3.2e09
1.0
.false.
0.0
@@ -165,6 +168,7 @@
.false.
.false.
.false.
+.false.
'constant'
400.0
400.0
@@ -203,6 +207,7 @@
.false.
.false.
.false.
+.false.
'EdenGreatbatch'
'constant'
'constant'
@@ -399,6 +404,7 @@
'pressure_only'
'pressure_only'
'pressure_only'
+'pressure_only'
'Jenkins'
.false.
10.0
@@ -417,6 +423,7 @@
4.48e-3
4.48e-3
4.48e-3
+4.48e-3
1e-4
5e-2
0.011
@@ -430,6 +437,7 @@
0.00295
0.00295
0.00295
+0.00295
3.1e-4
8.42e-5
8.42e-5
@@ -441,6 +449,7 @@
8.42e-5
8.42e-5
8.42e-5
+8.42e-5
'flux-form'
@@ -469,6 +478,7 @@
4.48e-3
4.48e-3
4.48e-3
+4.48e-3
1.0e-3
10.0
2.5e-3
@@ -555,6 +565,7 @@
'0000_00:00:05'
'0000_00:00:02.5'
'0000_00:00:01.25'
+'0000_00:00:10'
2
.true.
2
@@ -601,6 +612,7 @@
.false.
.false.
.false.
+.false.
.false.
.false.
.false.
@@ -1126,6 +1138,7 @@
.true.
.true.
.true.
+.true.
'0000-00-00_01:00:00'
'mocStreamfunctionOutput'
.true.
@@ -1213,6 +1226,7 @@
.true.
.true.
.true.
+.true.
'dt'
'conservationCheckOutput'
.false.
@@ -1224,6 +1238,7 @@
.true.
.true.
.true.
+.true.
.false.
.true.
.true.
@@ -1233,6 +1248,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('