From 6f55274c0691c40ac93d17a3113a052cc351b0cd Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 28 Feb 2024 14:16:10 -0600
Subject: [PATCH 1/7] Add NARRM14to30E3r1 and r2 to MPAS-Ocean

---
 .../namelist_defaults_mpaso.xml               | 18 +++++++++++++++
 components/mpas-ocean/cime_config/buildnml    | 22 +++++++++++++++++++
 2 files changed, 40 insertions(+)

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 248654ef10f5..c0d79a937369 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,8 @@
 <config_dt ocn_grid="FRISwISC04to60E3r1">'00:04:00'</config_dt>
 <config_dt ocn_grid="FRISwISC02to60E3r1">'00:02:00'</config_dt>
 <config_dt ocn_grid="FRISwISC01to60E3r1">'00:01:00'</config_dt>
+<config_dt ocn_grid="NARRM14to30E3r1">'00:10:00'</config_dt>
+<config_dt ocn_grid="NARRM14to30E3r2">'00:10:00'</config_dt>
 <config_time_integrator>'split_explicit_ab2'</config_time_integrator>
 <config_number_of_time_levels>2</config_number_of_time_levels>
 
@@ -83,6 +85,8 @@
 <config_hmix_scaleWithMesh ocn_grid="FRISwISC04to60E3r1">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="FRISwISC02to60E3r1">.true.</config_hmix_scaleWithMesh>
 <config_hmix_scaleWithMesh ocn_grid="FRISwISC01to60E3r1">.true.</config_hmix_scaleWithMesh>
+<config_hmix_scaleWithMesh ocn_grid="NARRM14to30E3r1">.true.</config_hmix_scaleWithMesh>
+<config_hmix_scaleWithMesh ocn_grid="NARRM14to30E3r2">.true.</config_hmix_scaleWithMesh>
 <config_maxMeshDensity>-1.0</config_maxMeshDensity>
 <config_hmix_use_ref_cell_width>.false.</config_hmix_use_ref_cell_width>
 <config_hmix_ref_cell_width>30.0e3</config_hmix_ref_cell_width>
@@ -104,6 +108,8 @@
 <config_use_mom_del2 ocn_grid="FRISwISC04to60E3r1">.true.</config_use_mom_del2>
 <config_use_mom_del2 ocn_grid="FRISwISC02to60E3r1">.true.</config_use_mom_del2>
 <config_use_mom_del2 ocn_grid="FRISwISC01to60E3r1">.true.</config_use_mom_del2>
+<config_use_mom_del2 ocn_grid="NARRM14to30E3r1">.true.</config_use_mom_del2>
+<config_use_mom_del2 ocn_grid="NARRM14to30E3r2">.true.</config_use_mom_del2>
 <config_mom_del2>10.0</config_mom_del2>
 <config_mom_del2 ocn_grid="oEC60to30v3">1000.0</config_mom_del2>
 <config_mom_del2 ocn_grid="oEC60to30v3wLI">1000.0</config_mom_del2>
@@ -119,6 +125,8 @@
 <config_mom_del2 ocn_grid="FRISwISC04to60E3r1">154.0</config_mom_del2>
 <config_mom_del2 ocn_grid="FRISwISC02to60E3r1">77.0</config_mom_del2>
 <config_mom_del2 ocn_grid="FRISwISC01to60E3r1">38.5</config_mom_del2>
+<config_mom_del2 ocn_grid="NARRM14to30E3r1">462.0</config_mom_del2>
+<config_mom_del2 ocn_grid="NARRM14to30E3r2">462.0</config_mom_del2>
 <config_use_tracer_del2>.false.</config_use_tracer_del2>
 <config_tracer_del2>10.0</config_tracer_del2>
 
@@ -149,6 +157,8 @@
 <config_mom_del4 ocn_grid="FRISwISC04to60E3r1">4.37e08</config_mom_del4>
 <config_mom_del4 ocn_grid="FRISwISC02to60E3r1">5.46e07</config_mom_del4>
 <config_mom_del4 ocn_grid="FRISwISC01to60E3r1">6.83e06</config_mom_del4>
+<config_mom_del4 ocn_grid="NARRM14to30E3r1">1.18e10</config_mom_del4>
+<config_mom_del4 ocn_grid="NARRM14to30E3r2">1.18e10</config_mom_del4>
 <config_mom_del4_div_factor>1.0</config_mom_del4_div_factor>
 <config_use_tracer_del4>.false.</config_use_tracer_del4>
 <config_tracer_del4>0.0</config_tracer_del4>
@@ -215,6 +225,8 @@
 <config_GM_closure ocn_grid="FRISwISC04to60E3r1">'N2_dependent'</config_GM_closure>
 <config_GM_closure ocn_grid="FRISwISC02to60E3r1">'N2_dependent'</config_GM_closure>
 <config_GM_closure ocn_grid="FRISwISC01to60E3r1">'N2_dependent'</config_GM_closure>
+<config_GM_closure ocn_grid="NARRM14to30E3r1">'constant'</config_GM_closure>
+<config_GM_closure ocn_grid="NARRM14to30E3r2">'constant'</config_GM_closure>
 <config_GM_constant_kappa>900.0</config_GM_constant_kappa>
 <config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="oEC60to30v3wLI">600.0</config_GM_constant_kappa>
 <config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="ECwISC30to60E1r2">600.0</config_GM_constant_kappa>
@@ -229,6 +241,8 @@
 <config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="FRISwISC04to60E3r1">600.0</config_GM_constant_kappa>
 <config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="FRISwISC02to60E3r1">600.0</config_GM_constant_kappa>
 <config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="FRISwISC01to60E3r1">600.0</config_GM_constant_kappa>
+<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="NARRM14to30E3r1">600.0</config_GM_constant_kappa>
+<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="NARRM14to30E3r2">600.0</config_GM_constant_kappa>
 <config_GM_constant_bclModeSpeed>0.3</config_GM_constant_bclModeSpeed>
 <config_GM_minBclModeSpeed_method>'constant'</config_GM_minBclModeSpeed_method>
 <config_GM_spatially_variable_min_kappa>300.0</config_GM_spatially_variable_min_kappa>
@@ -553,6 +567,8 @@
 <config_btr_dt ocn_grid="FRISwISC04to60E3r1">'0000_00:00:05'</config_btr_dt>
 <config_btr_dt ocn_grid="FRISwISC02to60E3r1">'0000_00:00:02.5'</config_btr_dt>
 <config_btr_dt ocn_grid="FRISwISC01to60E3r1">'0000_00:00:01.25'</config_btr_dt>
+<config_btr_dt ocn_grid="NARRM14to30E3r1">'0000_00:00:15'</config_btr_dt>
+<config_btr_dt ocn_grid="NARRM14to30E3r2">'0000_00:00:15'</config_btr_dt>
 <config_n_btr_cor_iter>2</config_n_btr_cor_iter>
 <config_vel_correction>.true.</config_vel_correction>
 <config_btr_subcycle_loop_factor>2</config_btr_subcycle_loop_factor>
@@ -1124,6 +1140,8 @@
 <config_AM_mocStreamfunction_enable ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_mocStreamfunction_enable>
 <config_AM_mocStreamfunction_enable ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_mocStreamfunction_enable>
 <config_AM_mocStreamfunction_enable ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_mocStreamfunction_enable>
+<config_AM_mocStreamfunction_enable ocn_grid="NARRM14to30E3r1">.true.</config_AM_mocStreamfunction_enable>
+<config_AM_mocStreamfunction_enable ocn_grid="NARRM14to30E3r2">.true.</config_AM_mocStreamfunction_enable>
 <config_AM_mocStreamfunction_compute_interval>'0000-00-00_01:00:00'</config_AM_mocStreamfunction_compute_interval>
 <config_AM_mocStreamfunction_output_stream>'mocStreamfunctionOutput'</config_AM_mocStreamfunction_output_stream>
 <config_AM_mocStreamfunction_compute_on_startup>.true.</config_AM_mocStreamfunction_compute_on_startup>
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 47076dee726a..ccfcbac3c9b7 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -365,6 +365,28 @@ def buildnml(case, caseroot, compname):
             ic_date = '20240314'
             ic_prefix = 'mpaso.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis'
 
+    elif ocn_grid == 'NARRM14to30E3r1':
+        decomp_date = '20240227'
+        decomp_prefix = 'partitions/mpas-o.graph.info.'
+        restoring_file = 'sss.PHC2_monthlyClimatology.NARRM14to30E3r1.20240227.nc'
+        analysis_mask_file = 'NARRM14to30E3r1_mocBasinsAndTransects20210623.nc'
+        ic_date = '20240227'
+        ic_prefix = 'mpaso.NARRM14to30E3r1'
+        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.")
+
+    elif ocn_grid == 'NARRM14to30E3r2':
+        decomp_date = '20240228'
+        decomp_prefix = 'partitions/mpas-o.graph.info.'
+        restoring_file = 'sss.PHC2_monthlyClimatology.NARRM14to30E3r2.20240228.nc'
+        analysis_mask_file = 'NARRM14to30E3r2_mocBasinsAndTransects20210623.nc'
+        ic_date = '2024022088'
+        ic_prefix = 'mpaso.NARRM14to30E3r2'
+        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.")
+
     #--------------------------------------------------------------------
     # Set OCN_FORCING = datm_forced_restoring if restoring file is available
     #--------------------------------------------------------------------

From 7f90f4778d448540c9b1a657518a7dd94ec15481 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 28 Feb 2024 14:17:08 -0600
Subject: [PATCH 2/7] Add NARRM14to30E3r1 and r2 to MPAS-Seaice

---
 .../namelist_defaults_mpassi.xml               |  4 ++++
 components/mpas-seaice/cime_config/buildnml    | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml
index 23f258f2a308..8fd8e67ed24a 100644
--- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml
+++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml
@@ -30,6 +30,8 @@
 <config_dt ice_grid="FRISwISC04to60E3r1">240.0</config_dt>
 <config_dt ice_grid="FRISwISC02to60E3r1">120.0</config_dt>
 <config_dt ice_grid="FRISwISC01to60E3r1">60.0</config_dt>
+<config_dt ice_grid="NARRM14to30E3r1">1800.0</config_dt>
+<config_dt ice_grid="NARRM14to30E3r2">1800.0</config_dt>
 <config_calendar_type>'noleap'</config_calendar_type>
 <config_start_time>'2000-01-01_00:00:00'</config_start_time>
 <config_stop_time>'none'</config_stop_time>
@@ -168,6 +170,8 @@
 <config_dynamics_subcycle_number ice_grid="FRISwISC04to60E3r1">1</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="FRISwISC02to60E3r1">1</config_dynamics_subcycle_number>
 <config_dynamics_subcycle_number ice_grid="FRISwISC01to60E3r1">1</config_dynamics_subcycle_number>
+<config_dynamics_subcycle_number ice_grid="NARRM14to30E3r1">1</config_dynamics_subcycle_number>
+<config_dynamics_subcycle_number ice_grid="NARRM14to30E3r2">1</config_dynamics_subcycle_number>
 <config_rotate_cartesian_grid>true</config_rotate_cartesian_grid>
 <config_include_metric_terms>true</config_include_metric_terms>
 <config_elastic_subcycle_number>120</config_elastic_subcycle_number>
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index 2e602311033d..3d36052a0996 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -318,6 +318,24 @@ def buildnml(case, caseroot, compname):
             grid_date = '20240314'
             grid_prefix = 'mpassi.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis'
 
+    elif ice_grid == 'NARRM14to30E3r1':
+        decomp_date = '20240227'
+        decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+        grid_date = '20240227'
+        grid_prefix = 'mpassi.NARRM14to30E3r1'
+        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 == 'NARRM14to30E3r2':
+        decomp_date = '20240228'
+        decomp_prefix = 'partitions/mpas-seaice.graph.info.'
+        grid_date = '20240228'
+        grid_prefix = 'mpassi.NARRM14to30E3r2'
+        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'

From dd64e2851f3435d7398454e6f9c4a6223776c3eb Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Wed, 28 Feb 2024 14:17:27 -0600
Subject: [PATCH 3/7] Add NARRM14to30E3r1 and r2 to ELM definitions

---
 components/elm/bld/namelist_files/namelist_definition.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/elm/bld/namelist_files/namelist_definition.xml b/components/elm/bld/namelist_files/namelist_definition.xml
index 0f8b03dfec38..b42d4461ddfe 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
 
 <entry id="mask" type="char*20" category="default_settings"
        group="default_settings"
-       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">
+       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,NARRM14to30E3r1,NARRM14to30E3r2">
 Land mask description
 </entry>
 

From 68d80e835e2cc0dca9ecf013aa6bc8a7c8c29bfc Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Tue, 12 Mar 2024 19:25:48 -0500
Subject: [PATCH 4/7] Add domain, mapping, and spunup IC support for
 NARRM14to30E3r1

---
 cime_config/config_grids.xml                | 136 +++++++++++++++++++-
 components/mpas-ocean/cime_config/buildnml  |   4 +-
 components/mpas-seaice/cime_config/buildnml |   4 +-
 3 files changed, 137 insertions(+), 7 deletions(-)

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index ccfb3d908d86..d135030f5016 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -406,6 +406,16 @@
       <mask>IcoswISC30E3r5</mask>
     </model_grid>
 
+    <model_grid alias="T62_NARRM14to30E3r1" compset="(DATM|XATM|SATM)">
+      <grid name="atm">T62</grid>
+      <grid name="lnd">T62</grid>
+      <grid name="ocnice">NARRM14to30E3r1</grid>
+      <grid name="rof">rx1</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>NARRM14to30E3r1</mask>
+    </model_grid>
+
     <model_grid alias="TL319_oEC60to30v3" compset="(DATM|XATM|SATM)">
       <grid name="atm">TL319</grid>
       <grid name="lnd">TL319</grid>
@@ -606,6 +616,16 @@
       <mask>IcosXISC30E3r7</mask>
     </model_grid>
 
+    <model_grid alias="TL319_NARRM14to30E3r1" compset="(DATM|XATM|SATM)">
+      <grid name="atm">TL319</grid>
+      <grid name="lnd">TL319</grid>
+      <grid name="ocnice">NARRM14to30E3r1</grid>
+      <grid name="rof">JRA025</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>NARRM14to30E3r1</mask>
+    </model_grid>
+
     <model_grid alias="TL319_oRRS18to6v3" compset="(DATM|XATM|SATM)">
       <grid name="atm">TL319</grid>
       <grid name="lnd">TL319</grid>
@@ -1100,6 +1120,16 @@
       <mask>WC14to60E2r3</mask>
     </model_grid>
 
+    <model_grid alias="northamericax4v1pg2_r025_NARRM14to30E3r1" compset="(DOCN|XOCN|SOCN|AQP1|EAM.+ELM.+MPASO)">
+      <grid name="atm">ne0np4_northamericax4v1.pg2</grid>
+      <grid name="lnd">r025</grid>
+      <grid name="ocnice">NARRM14to30E3r1</grid>
+      <grid name="rof">r025</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>NARRM14to30E3r1</mask>
+    </model_grid>
+
     <model_grid alias="northamericax4v1pg2_WC14to60E2r3" compset="(DOCN|EAM.+ELM.+MPASO)">
       <grid name="atm">ne0np4_northamericax4v1.pg2</grid>
       <grid name="lnd">ne0np4_northamericax4v1.pg2</grid>
@@ -1330,6 +1360,16 @@
       <mask>IcoswISC30E3r5</mask>
     </model_grid>
 
+    <model_grid alias="ne30pg2_NARRM14to30E3r1">
+      <grid name="atm">ne30np4.pg2</grid>
+      <grid name="lnd">ne30np4.pg2</grid>
+      <grid name="ocnice">NARRM14to30E3r1</grid>
+      <grid name="rof">r05</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>NARRM14to30E3r1</mask>
+    </model_grid>
+
     <model_grid alias="northamericax4v1_r0125_northamericax4v1" compset="(DOCN|XOCN|SOCN|AQP1)">
       <grid name="atm">ne0np4_northamericax4v1</grid>
       <grid name="lnd">r0125</grid>
@@ -2271,6 +2311,16 @@
       <mask>IcosXISC30E3r7</mask>
     </model_grid>
 
+    <model_grid alias="ne30pg2_r05_NARRM14to30E3r1">
+      <grid name="atm">ne30np4.pg2</grid>
+      <grid name="lnd">r05</grid>
+      <grid name="ocnice">NARRM14to30E3r1</grid>
+      <grid name="rof">r05</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>NARRM14to30E3r1</mask>
+    </model_grid>
+
     <model_grid alias="ne30pg2_r05_WC14to60E2r3">
       <grid name="atm">ne30np4.pg2</grid>
       <grid name="lnd">r05</grid>
@@ -2581,6 +2631,7 @@
       <file grid="atm|lnd" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc</file>
       <file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc</file>
       <file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r5.231121.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240228.nc</file>
       <desc>T62 is Gaussian grid:</desc>
     </domain>
 
@@ -2635,6 +2686,8 @@
       <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc</file>
       <file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcosXISC30E3r7.240326.nc</file>
       <file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.240326.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240228.nc</file>
+      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240228.nc</file>
       <file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc</file>
       <file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc</file>
       <desc>TL319 is JRA lat/lon grid:</desc>
@@ -2746,6 +2799,8 @@
       <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc</file>
       <file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcosXISC30E3r7.240326.nc</file>
       <file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.240326.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240228.nc</file>
+      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240228.nc</file>
       <file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc</file>
       <file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc</file>
       <desc>ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:</desc>
@@ -3055,6 +3110,13 @@
       <desc>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.:</desc>
     </domain>
 
+    <domain name="NARRM14to30E3r1">
+      <nx>662141</nx>
+      <ny>1</ny>
+      <file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240228.nc</file>
+      <desc>NARRM14to30E3r1 is a MPAS ocean grid generated with the jigsaw/compass process XXXX TODO:</desc>
+    </domain>
+
     <!-- ROF (river) grids-->
 
     <domain name="r2">
@@ -3089,6 +3151,8 @@
       <file grid="lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc</file>
       <file grid="atm" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
       <file grid="lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
+      <file grid="atm" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc</file>
+      <file grid="lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc</file>
       <file grid="lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc</file>
       <desc>r05 is 1/2 degree river routing grid:</desc>
     </domain>
@@ -3254,6 +3318,8 @@
       <file grid="ice|ocn" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_EC30to60E2r2.220428.nc</file>
       <file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_IcoswISC30E3r5.240416.nc</file>
       <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_IcoswISC30E3r5.240416.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240304.nc</file>
+      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240304.nc</file>
       <desc>1-deg with 1/4-deg over North America (version 1) pg2:</desc>
     </domain>
 
@@ -3579,6 +3645,16 @@
       <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trfvnp2.20240326.nc</map>
     </gridmap>
 
+    <gridmap atm_grid="ne30np4.pg2" ocn_grid="NARRM14to30E3r1">
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240228.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc</map>
+      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc</map>
+      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc</map>
+    </gridmap>
+
     <gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
       <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc</map>
       <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc</map>
@@ -4075,6 +4151,16 @@
       <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_IcoswISC30E3r5_trfvnp2.20240331.nc</map>
     </gridmap>
 
+    <gridmap atm_grid="ne0np4_northamericax4v1.pg2" ocn_grid="NARRM14to30E3r1">
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240304.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc</map>
+      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc</map>
+      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc</map>
+    </gridmap>
+
     <gridmap atm_grid="ne0np4_northamericax4v1.pg2" lnd_grid="r0125">
       <map name="ATM2LND_FMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_mono.20200401.nc</map>
       <map name="ATM2LND_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_bilin.20200401.nc</map>
@@ -4346,6 +4432,14 @@
       <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_T62_traave.20231121.nc</map>
     </gridmap>
 
+    <gridmap atm_grid="T62" ocn_grid="NARRM14to30E3r1">
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240228.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240228.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc</map>
+    </gridmap>
+
     <gridmap atm_grid="TL319" ocn_grid="oEC60to30v3">
       <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_aave.181203.nc</map>
       <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_bilin.181203.nc</map>
@@ -4482,6 +4576,14 @@
       <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_TL319_traave.20240326.nc</map>
     </gridmap>
 
+    <gridmap atm_grid="TL319" ocn_grid="NARRM14to30E3r1">
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240228.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240228.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc</map>
+    </gridmap>
+
     <gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">
       <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc</map>
       <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc</map>
@@ -4862,6 +4964,14 @@
       <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_r05_traave.20240326.nc</map>
     </gridmap>
 
+    <gridmap rof_grid="r05" ocn_grid="NARRM14to30E3r1">
+      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240228.nc</map>
+    </gridmap>
+
+    <gridmap rof_grid="r025" ocn_grid="NARRM14to30E3r1">
+      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240304.nc</map>
+    </gridmap>
+
     <gridmap rof_grid="r05" ocn_grid="EC30to60E2r2">
       <map name="OCN2ROF_SMAPNAME">cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc</map>
     </gridmap>
@@ -4972,6 +5082,11 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc</map>
     </gridmap>
 
+    <gridmap ocn_grid="NARRM14to30E3r1" rof_grid="rx1">
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+    </gridmap>
+
     <gridmap ocn_grid="oEC60to30v3" rof_grid="JRA025">
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc</map>
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc</map>
@@ -5057,6 +5172,11 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc</map>
     </gridmap>
 
+    <gridmap ocn_grid="NARRM14to30E3r1" rof_grid="JRA025">
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+    </gridmap>
+
     <gridmap ocn_grid="oRRS18to6v3" rof_grid="JRA025">
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc</map>
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc</map>
@@ -5152,6 +5272,16 @@
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r025_to_IcoswISC30E3r5_cstmnn.r150e300.20240401.nc</map>
     </gridmap>
 
+    <gridmap ocn_grid="NARRM14to30E3r1" rof_grid="r05">
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+    </gridmap>
+
+    <gridmap ocn_grid="NARRM14to30E3r1" rof_grid="r025">
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+    </gridmap>
+
     <gridmap ocn_grid="WC14to60E2r3" rof_grid="r0125">
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
@@ -5363,21 +5493,21 @@
     <!-- ====================    -->
     <!-- GLC: mpas.gis1to10kmR2  -->
     <!-- ====================    -->
-      
+
     <gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="r05">
       <map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_gis1to10kmR2_traave.20240403.nc</map>
       <map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_gis1to10kmR2_trbilin.20240403.nc</map>
       <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r05_traave.20240403.nc</map>
       <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r05_traave.20240403.nc</map>
     </gridmap>
- 
+
     <gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="ne30np4.pg2">
       <map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_traave.20240403.nc</map>
       <map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_trbilin.20240403.nc</map>
       <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_ne30pg2_traave.20240403.nc</map>
       <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_ne30pg2_traave.20240403.nc</map>
     </gridmap>
- 
+
     <gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="TL319">
       <map name="LND2GLC_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_gis1to10kmR2_traave.20240404.nc</map>
       <map name="LND2GLC_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_gis1to10kmR2_trbilin.20240404.nc</map>
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index ccfcbac3c9b7..6420b20d3d89 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -373,8 +373,8 @@ def buildnml(case, caseroot, compname):
         ic_date = '20240227'
         ic_prefix = 'mpaso.NARRM14to30E3r1'
         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.")
+            ic_date = '20240312'
+            ic_prefix = 'mpaso.NARRM14to30E3r1.rstFromG-chrysalis'
 
     elif ocn_grid == 'NARRM14to30E3r2':
         decomp_date = '20240228'
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index 3d36052a0996..b51386ff0020 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -324,8 +324,8 @@ def buildnml(case, caseroot, compname):
         grid_date = '20240227'
         grid_prefix = 'mpassi.NARRM14to30E3r1'
         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.")
+            grid_date = '20240312'
+            grid_prefix = 'mpassi.NARRM14to30E3r1.rstFromG-chrysalis'
 
     elif ice_grid == 'NARRM14to30E3r2':
         decomp_date = '20240228'

From 679dd31304ee149a1a8d607333c490dcd47acace Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Wed, 20 Mar 2024 13:54:34 -0500
Subject: [PATCH 5/7] Update r025_to_NARRM14to30E3r1 runoff mapping file

---
 cime_config/config_grids.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index d135030f5016..0715196b8110 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -5278,8 +5278,8 @@
     </gridmap>
 
     <gridmap ocn_grid="NARRM14to30E3r1" rof_grid="r025">
-      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
-      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240228.nc</map>
+      <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240320.nc</map>
+      <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r025_to_NARRM14to30E3r1_cstmnn.r150e300.20240320.nc</map>
     </gridmap>
 
     <gridmap ocn_grid="WC14to60E2r3" rof_grid="r0125">

From a829611d4e277593d03189d015e4975ee7a4f667 Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Tue, 26 Mar 2024 18:56:58 -0500
Subject: [PATCH 6/7] Replace domain and mapping files for NARRM14to30E3r1

---
 cime_config/config_grids.xml | 72 ++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index 0715196b8110..056973cce947 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -2631,7 +2631,7 @@
       <file grid="atm|lnd" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc</file>
       <file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc</file>
       <file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_IcoswISC30E3r5.231121.nc</file>
-      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240228.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_NARRM14to30E3r1.240326.nc</file>
       <desc>T62 is Gaussian grid:</desc>
     </domain>
 
@@ -2686,8 +2686,8 @@
       <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc</file>
       <file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcosXISC30E3r7.240326.nc</file>
       <file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.240326.nc</file>
-      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240228.nc</file>
-      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240228.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_NARRM14to30E3r1.240326.nc</file>
+      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_NARRM14to30E3r1.240326.nc</file>
       <file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc</file>
       <file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc</file>
       <desc>TL319 is JRA lat/lon grid:</desc>
@@ -2799,8 +2799,8 @@
       <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc</file>
       <file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcosXISC30E3r7.240326.nc</file>
       <file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.240326.nc</file>
-      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240228.nc</file>
-      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240228.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_NARRM14to30E3r1.240326.nc</file>
+      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_NARRM14to30E3r1.240326.nc</file>
       <file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc</file>
       <file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc</file>
       <desc>ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:</desc>
@@ -3113,7 +3113,7 @@
     <domain name="NARRM14to30E3r1">
       <nx>662141</nx>
       <ny>1</ny>
-      <file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240228.nc</file>
+      <file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.NARRM14to30E3r1.240326.nc</file>
       <desc>NARRM14to30E3r1 is a MPAS ocean grid generated with the jigsaw/compass process XXXX TODO:</desc>
     </domain>
 
@@ -3151,8 +3151,8 @@
       <file grid="lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc</file>
       <file grid="atm" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
       <file grid="lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
-      <file grid="atm" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc</file>
-      <file grid="lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240228.nc</file>
+      <file grid="atm" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240326.nc</file>
+      <file grid="lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_NARRM14to30E3r1.240326.nc</file>
       <file grid="lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc</file>
       <desc>r05 is 1/2 degree river routing grid:</desc>
     </domain>
@@ -3318,8 +3318,8 @@
       <file grid="ice|ocn" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_EC30to60E2r2.220428.nc</file>
       <file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_IcoswISC30E3r5.240416.nc</file>
       <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_IcoswISC30E3r5.240416.nc</file>
-      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240304.nc</file>
-      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240304.nc</file>
+      <file grid="atm|lnd" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.northamericax4v1pg2_NARRM14to30E3r1.240326.nc</file>
+      <file grid="ice|ocn" mask="NARRM14to30E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.northamericax4v1pg2_NARRM14to30E3r1.240326.nc</file>
       <desc>1-deg with 1/4-deg over North America (version 1) pg2:</desc>
     </domain>
 
@@ -3646,13 +3646,13 @@
     </gridmap>
 
     <gridmap atm_grid="ne30np4.pg2" ocn_grid="NARRM14to30E3r1">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240228.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240228.nc</map>
-      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc</map>
-      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240228.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_traave.20240326.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240326.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_ne30pg2_traave.20240326.nc</map>
+      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
+      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
@@ -4152,13 +4152,13 @@
     </gridmap>
 
     <gridmap atm_grid="ne0np4_northamericax4v1.pg2" ocn_grid="NARRM14to30E3r1">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240304.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240304.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240304.nc</map>
-      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc</map>
-      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240304.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_traave.20240326.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240326.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_northamericax4v1pg2_traave.20240326.nc</map>
+      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
+      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_NARRM14to30E3r1_trfvnp2.20240326.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne0np4_northamericax4v1.pg2" lnd_grid="r0125">
@@ -4433,11 +4433,11 @@
     </gridmap>
 
     <gridmap atm_grid="T62" ocn_grid="NARRM14to30E3r1">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240228.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240228.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240228.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_traave.20240326.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_NARRM14to30E3r1_esmfpatch.20240326.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240326.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_T62_traave.20240326.nc</map>
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="oEC60to30v3">
@@ -4577,11 +4577,11 @@
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="NARRM14to30E3r1">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240228.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240228.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240228.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240228.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_traave.20240326.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_trbilin.20240326.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_NARRM14to30E3r1_esmfpatch.20240326.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240326.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_TL319_traave.20240326.nc</map>
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">
@@ -4965,11 +4965,11 @@
     </gridmap>
 
     <gridmap rof_grid="r05" ocn_grid="NARRM14to30E3r1">
-      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240228.nc</map>
+      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r05_traave.20240326.nc</map>
     </gridmap>
 
     <gridmap rof_grid="r025" ocn_grid="NARRM14to30E3r1">
-      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240304.nc</map>
+      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/NARRM14to30E3r1/map_NARRM14to30E3r1_to_r025_traave.20240326.nc</map>
     </gridmap>
 
     <gridmap rof_grid="r05" ocn_grid="EC30to60E2r2">

From f609eadd23e235e56427920ad495fe8e1dfce45e Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Thu, 28 Mar 2024 13:03:49 -0500
Subject: [PATCH 7/7] Point at updated ocn/ice spunup IC files

---
 components/mpas-ocean/cime_config/buildnml  | 2 +-
 components/mpas-seaice/cime_config/buildnml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 6420b20d3d89..14f4125f6611 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -373,7 +373,7 @@ def buildnml(case, caseroot, compname):
         ic_date = '20240227'
         ic_prefix = 'mpaso.NARRM14to30E3r1'
         if ocn_ic_mode == 'spunup':
-            ic_date = '20240312'
+            ic_date = '20240328'
             ic_prefix = 'mpaso.NARRM14to30E3r1.rstFromG-chrysalis'
 
     elif ocn_grid == 'NARRM14to30E3r2':
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index b51386ff0020..e42572cd15d8 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -324,7 +324,7 @@ def buildnml(case, caseroot, compname):
         grid_date = '20240227'
         grid_prefix = 'mpassi.NARRM14to30E3r1'
         if ice_ic_mode == 'spunup':
-            grid_date = '20240312'
+            grid_date = '20240328'
             grid_prefix = 'mpassi.NARRM14to30E3r1.rstFromG-chrysalis'
 
     elif ice_grid == 'NARRM14to30E3r2':