diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index 1894ef66fa5d..448480b10e93 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -509,6 +509,46 @@
SOwISC12to60E2r4
+
+ TL319
+ TL319
+ FRISwISC08to60E3r1
+ JRA025
+ null
+ null
+ FRISwISC08to60E3r1
+
+
+
+ TL319
+ TL319
+ FRISwISC04to60E3r1
+ JRA025
+ null
+ null
+ FRISwISC04to60E3r1
+
+
+
+ TL319
+ TL319
+ FRISwISC02to60E3r1
+ JRA025
+ null
+ null
+ FRISwISC02to60E3r1
+
+
+
+ TL319
+ TL319
+ FRISwISC01to60E3r1
+ JRA025
+ null
+ null
+ FRISwISC01to60E3r1
+
+
TL319
TL319
@@ -2404,6 +2444,14 @@
$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_WCAtl12to45E2r4.210318.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_SOwISC12to60E2r4.210119.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_SOwISC12to60E2r4.210119.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_FRISwISC08to60E3r1.240214.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_FRISwISC08to60E3r1.240214.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_FRISwISC04to60E3r1.240214.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_FRISwISC04to60E3r1.240214.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_FRISwISC02to60E3r1.240214.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_FRISwISC02to60E3r1.240214.nc
+ $DIN_LOC_ROOT/share/domains/domain.lnd.TL319_FRISwISC01to60E3r1.240216.nc
+ $DIN_LOC_ROOT/share/domains/domain.ocn.TL319_FRISwISC01to60E3r1.240216.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E2r1.201007.nc
$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc
$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcoswISC30E3r5.231121.nc
@@ -2777,6 +2825,34 @@
SOwISC12to60E2r4 is a MPAS ice/ocean grid with enhanced resolution of 12km in the Southern Ocean around Antarctica. The high resolution regions smoothly transition to the background resolution of the standard low resolution 60to30km grid:
+
+ 605169
+ 1
+ $DIN_LOC_ROOT/share/domains/domain.ocn.FRISwISC08to60E3r1.240214.nc
+ FRISwISC08to60E3r1 is a MPAS ice/ocean grid with enhanced resolution of 12km in the Southern Ocean around Antarctica and 4 km beneath the Filchner-Ronne Ice Shelf. The high resolution regions smoothly transition to the background resolution of the standard low resolution 60to30km grid:
+
+
+
+ 718054
+ 1
+ $DIN_LOC_ROOT/share/domains/domain.ocn.FRISwISC04to60E3r1.240214.nc
+ FRISwISC04to60E3r1 is a MPAS ice/ocean grid with enhanced resolution of 12km in the Southern Ocean around Antarctica and 4 km beneath the Filchner-Ronne Ice Shelf. The high resolution regions smoothly transition to the background resolution of the standard low resolution 60to30km grid:
+
+
+
+ 1055045
+ 1
+ $DIN_LOC_ROOT/share/domains/domain.ocn.FRISwISC02to60E3r1.240214.nc
+ FRISwISC02to60E3r1 is a MPAS ice/ocean grid with enhanced resolution of 12km in the Southern Ocean around Antarctica and 4 km beneath the Filchner-Ronne Ice Shelf. The high resolution regions smoothly transition to the background resolution of the standard low resolution 60to30km grid:
+
+
+
+ 2162616
+ 1
+ $DIN_LOC_ROOT/share/domains/domain.ocn.FRISwISC01to60E3r1.240216.nc
+ FRISwISC01to60E3r1 is a MPAS ice/ocean grid with enhanced resolution of 12km in the Southern Ocean around Antarctica and 4 km beneath the Filchner-Ronne Ice Shelf. The high resolution regions smoothly transition to the background resolution of the standard low resolution 60to30km grid:
+
+
237984
1
@@ -4084,6 +4160,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4610,6 +4718,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 4069eb144cff..e246729b3429 100644
--- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
+++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -49,6 +49,10 @@
'00:10:00'
'00:30:00'
'00:30:00'
+'00:08:00'
+'00:04:00'
+'00:02:00'
+'00:01:00'
'split_explicit_ab2'
2
@@ -73,6 +77,10 @@
.true.
.true.
.true.
+.true.
+.true.
+.true.
+.true.
-1.0
.false.
30.0e3
@@ -89,6 +97,10 @@
.true.
.true.
.true.
+.true.
+.true.
+.true.
+.true.
10.0
1000.0
1000.0
@@ -99,6 +111,10 @@
462.0
1000.0
1000.0
+308.0
+154.0
+77.0
+38.5
.false.
10.0
@@ -124,6 +140,10 @@
1.18e10
1.2e11
1.2e11
+3.50e09
+4.37e08
+5.46e07
+6.83e06
1.0
.false.
0.0
@@ -156,6 +176,10 @@
'RossbyRadius'
'ramp'
+'RossbyRadius'
+'RossbyRadius'
+'RossbyRadius'
+'RossbyRadius'
20e3
30e3
30e3
@@ -182,6 +206,10 @@
'N2_dependent'
'constant'
+'N2_dependent'
+'N2_dependent'
+'N2_dependent'
+'N2_dependent'
900.0
600.0
600.0
@@ -191,6 +219,10 @@
600.0
600.0
600.0
+600.0
+600.0
+600.0
+600.0
0.3
'constant'
300.0
@@ -200,6 +232,10 @@
1.0
3.0
+1.0
+1.0
+1.0
+1.0
0.13
1000.0
200.0
@@ -211,6 +247,10 @@
'RossbyRadius'
'ramp'
+'RossbyRadius'
+'RossbyRadius'
+'RossbyRadius'
+'RossbyRadius'
20e3
30e3
30e3
@@ -347,6 +387,10 @@
'pressure_only'
'pressure_only'
'pressure_only'
+'pressure_only'
+'pressure_only'
+'pressure_only'
+'pressure_only'
'Jenkins'
.false.
10.0
@@ -360,6 +404,10 @@
4.48e-3
4.48e-3
4.48e-3
+4.48e-3
+4.48e-3
+4.48e-3
+4.48e-3
1e-4
5e-2
0.011
@@ -368,12 +416,20 @@
0.00295
0.00295
0.00295
+0.00295
+0.00295
+0.00295
+0.00295
3.1e-4
8.42e-5
8.42e-5
8.42e-5
8.42e-5
8.42e-5
+8.42e-5
+8.42e-5
+8.42e-5
+8.42e-5
'flux-form'
@@ -397,6 +453,10 @@
4.48e-3
4.48e-3
4.48e-3
+4.48e-3
+4.48e-3
+4.48e-3
+4.48e-3
1.0e-3
10.0
2.5e-3
@@ -475,6 +535,10 @@
'0000_00:00:15'
'0000_00:01:15'
'0000_00:01:00'
+'0000_00:00:10'
+'0000_00:00:05'
+'0000_00:00:02.5'
+'0000_00:00:01.25'
2
.true.
2
@@ -516,6 +580,10 @@
.false.
.false.
.false.
+.false.
+.false.
+.false.
+.false.
.false.
.false.
.false.
@@ -1033,6 +1101,10 @@
.true.
.true.
.true.
+.true.
+.true.
+.true.
+.true.
'0000-00-00_01:00:00'
'mocStreamfunctionOutput'
.true.
@@ -1115,16 +1187,28 @@
.true.
.true.
.true.
+.true.
+.true.
+.true.
+.true.
'dt'
'conservationCheckOutput'
.false.
.true.
.true.
.true.
+.true.
+.true.
+.true.
+.true.
.false.
.true.
.true.
.true.
+.true.
+.true.
+.true.
+.true.
.true.
'conservationCheckRestart'
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index a363c27883a3..5b870cc87100 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -270,6 +270,58 @@ def buildnml(case, caseroot, compname):
if ocn_ismf == 'data':
data_ismf_file = 'prescribed_ismf_adusumilli2020.SOwISC12to60E2r4.230516.nc'
+ elif ocn_grid == 'FRISwISC08to60E3r1':
+ decomp_date = '20230913' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC08to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-o.graph.info.'
+ restoring_file = 'sss.PHC2_monthlyClimatology.FRISwISC08to60E3r1.20230913.nc'
+ analysis_mask_file = 'FRISwISC08to60E3r1_mocBasinsAndTransects20210623.nc'
+ ic_date = '20230913'
+ ic_prefix = 'mpaso.FRISwISC08to60E3r1' # from ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC08to60E3r1/mpaso.FRISwISC08to60E3r1.20230913.nc
+ if ocn_ic_mode == 'spunup':
+ ic_date = '20230913' # changed to same as decomp_date, but the spun up file does not yet exist
+ ic_prefix = 'mpaso.FRISwISC08to60E3r1.rstFromG-anvil' # the spun up file does not yet exist
+ if ocn_ismf == 'data':
+ data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC08to60E3r1.20230913.nc'
+
+ elif ocn_grid == 'FRISwISC04to60E3r1':
+ decomp_date = '20230913' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC04to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-o.graph.info.'
+ restoring_file = 'sss.PHC2_monthlyClimatology.FRISwISC04to60E3r1.20230913.nc'
+ analysis_mask_file = 'FRISwISC04to60E3r1_mocBasinsAndTransects20210623.nc'
+ ic_date = '20230913'
+ ic_prefix = 'mpaso.FRISwISC04to60E3r1' # from ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC04to60E3r1/mpaso.FRISwISC04to60E3r1.20230913.nc
+ if ocn_ic_mode == 'spunup':
+ ic_date = '20230913' # changed to same as decomp_date, but the spun up file does not yet exist
+ ic_prefix = 'mpaso.FRISwISC04to60E3r1.rstFromG-anvil' # the spun up file does not yet exist
+ if ocn_ismf == 'data':
+ data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC04to60E3r1.20230913.nc'
+
+ elif ocn_grid == 'FRISwISC02to60E3r1':
+ decomp_date = '20230914' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC02to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-o.graph.info.'
+ restoring_file = 'sss.PHC2_monthlyClimatology.FRISwISC02to60E3r1.20230914.nc'
+ analysis_mask_file = 'FRISwISC02to60E3r1_mocBasinsAndTransects20210623.nc'
+ ic_date = '20230914'
+ ic_prefix = 'mpaso.FRISwISC02to60E3r1' # from ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC02to60E3r1/mpaso.FRISwISC02to60E3r1.20230914.nc
+ if ocn_ic_mode == 'spunup':
+ ic_date = '20230914' # changed to same as decomp_date, but the spun up file does not yet exist
+ ic_prefix = 'mpaso.FRISwISC02to60E3r1.rstFromG-anvil' # the spun up file does not yet exist
+ if ocn_ismf == 'data':
+ data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC02to60E3r1.20230914.nc'
+
+ elif ocn_grid == 'FRISwISC01to60E3r1':
+ decomp_date = '20230915' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC01to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-o.graph.info.'
+ restoring_file = 'sss.PHC2_monthlyClimatology.FRISwISC01to60E3r1.20230915.nc'
+ analysis_mask_file = 'FRISwISC01to60E3r1_mocBasinsAndTransects20210623.nc'
+ ic_date = '20230915'
+ ic_prefix = 'mpaso.FRISwISC01to60E3r1' # from ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-o/FRISwISC01to60E3r1/mpaso.FRISwISC01to60E3r1.20230915.nc
+ if ocn_ic_mode == 'spunup':
+ ic_date = '20230915' # changed to same as decomp_date, but the spun up file does not yet exist
+ ic_prefix = 'mpaso.FRISwISC01to60E3r1.rstFromG-anvil' # the spun up file does not yet exist
+ if ocn_ismf == 'data':
+ data_ismf_file = 'prescribed_ismf_adusumilli2020.FRISwISC01to60E3r1.20230915.nc'
+
elif ocn_grid == 'ECwISC30to60E2r1':
decomp_date = '200915'
decomp_prefix = 'mpas-o.graph.info.'
@@ -422,7 +474,7 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('')
lines.append('')
lines.append('')
lines.append(' ')
+ if ocn_grid.startswith("FRIS"):
+ lines.append(' ')
+
lines.append(' ')
lines.append(' ')
lines.append(' ')
@@ -1362,7 +1417,7 @@ def buildnml(case, caseroot, compname):
lines.append('1800.0
1800.0
1800.0
+480.0
+240.0
+120.0
+60.0
'noleap'
'2000-01-01_00:00:00'
'none'
@@ -77,6 +81,10 @@
75.0
70.0
+85.0
+85.0
+85.0
+85.0
75.0
85.0
85.0
@@ -87,6 +95,10 @@
-75.0
-60.0
+-85.0
+-85.0
+-85.0
+-85.0
-85.0
-85.0
-85.0
@@ -148,6 +160,10 @@
1
1
1
+1
+1
+1
+1
true
true
120
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index 92e5eaf0d004..149dd9d148ea 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -243,6 +243,46 @@ def buildnml(case, caseroot, compname):
grid_date = '210203'
grid_prefix = 'mpassi.SOwISC12to60E2r4.rstFromG-anvil'
+ elif ice_grid == 'FRISwISC08to60E3r1':
+ decomp_date = '20230913' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-seaice/FRISwISC08to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+ grid_date = '20230913' # changed to same as decomp_date
+ grid_prefix = 'mpassi.FRISwISC08to60E3r1' # name from ../files_for_e3sm/assembled_files/inputdata/ice/mpas-seaice/FRISwISC08to60E3r1/mpassi.FRISwISC08to60E3r1.20230913.nc
+ data_iceberg_file += 'Iceberg_Climatology_Merino.FRISwISC08to60E3r1.20230913.nc'
+ if ice_ic_mode == 'spunup':
+ grid_date = '20230913' # changed to same as decomp_date, but the spun up file does not yet exist
+ grid_prefix = 'mpassi.FRISwISC08to60E3r1.rstFromG-anvil' #the spun up file does not yet exist
+
+ elif ice_grid == 'FRISwISC04to60E3r1':
+ decomp_date = '20230913' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-seaice/FRISwISC04to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+ grid_date = '20230913' # changed to same as decomp_date
+ grid_prefix = 'mpassi.FRISwISC04to60E3r1' # name from ../files_for_e3sm/assembled_files/inputdata/ice/mpas-seaice/FRISwISC04to60E3r1/mpassi.FRISwISC04to60E3r1.20230913.nc
+ data_iceberg_file += 'Iceberg_Climatology_Merino.FRISwISC04to60E3r1.20230913.nc'
+ if ice_ic_mode == 'spunup':
+ grid_date = '20230913' # changed to same as decomp_date, but the spun up file does not yet exist
+ grid_prefix = 'mpassi.FRISwISC04to60E3r1.rstFromG-anvil' #the spun up file does not yet exist
+
+ elif ice_grid == 'FRISwISC02to60E3r1':
+ decomp_date = '20230914' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-seaice/FRISwISC02to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+ grid_date = '20230914' # changed to same as decomp_date
+ grid_prefix = 'mpassi.FRISwISC02to60E3r1' # name from ../files_for_e3sm/assembled_files/inputdata/ice/mpas-seaice/FRISwISC02to60E3r1/mpassi.FRISwISC02to60E3r1.20230914.nc
+ data_iceberg_file += 'Iceberg_Climatology_Merino.FRISwISC02to60E3r1.20230914.nc'
+ if ice_ic_mode == 'spunup':
+ grid_date = '20230914' # changed to same as decomp_date, but the spun up file does not yet exist
+ grid_prefix = 'mpassi.FRISwISC02to60E3r1.rstFromG-anvil' #the spun up file does not yet exist
+
+ elif ice_grid == 'FRISwISC01to60E3r1':
+ decomp_date = '20230915' # changed to date of partiotions in ../files_for_e3sm/assembled_files/inputdata/ocn/mpas-seaice/FRISwISC01to60E3r1/partitions
+ decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+ grid_date = '20230915' # changed to same as decomp_date
+ grid_prefix = 'mpassi.FRISwISC01to60E3r1' # name from ../files_for_e3sm/assembled_files/inputdata/ice/mpas-seaice/FRISwISC01to60E3r1/mpassi.FRISwISC01to60E3r1.20230915.nc
+ data_iceberg_file += 'Iceberg_Climatology_Merino.FRISwISC01to60E3r1.20230915.nc'
+ if ice_ic_mode == 'spunup':
+ grid_date = '20230915' # changed to same as decomp_date, but the spun up file does not yet exist
+ grid_prefix = 'mpassi.FRISwISC01to60E3r1.rstFromG-anvil' #the spun up file does not yet exist
+
elif ice_grid == 'ECwISC30to60E2r1':
grid_date = '210413'
grid_prefix = 'seaice.ECwISC30to60E2r1'
@@ -396,7 +436,7 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('24
48
48
+ 180
+ 360
+ 720
+ 1440
48
48
96