Add DISMF compsets

E3SM-Ocean-Discussion · May 17, 2023 · a5b2366 · a5b2366
1 parent c20a03d
commit a5b2366
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
@@ -281,7 +281,7 @@ def buildnml(case, caseroot, compname):
             ic_date = '230220'
             ic_prefix = 'mpaso.ECwISC30to60E2r1.rstFromG-anvil'
         if ocn_ismf == 'data':
-            data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E2r1.230329.nc'
+            data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E2r1.230429.nc'
 
     #--------------------------------------------------------------------
     # Set OCN_FORCING = datm_forced_restoring if restoring file is available

diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml
@@ -37,6 +37,11 @@
     <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%NYFAIS45_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-NYF-DISMF</alias>
+    <lname>2000_DATM%NYF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%NYFAIS45_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-IAF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DATMFORCED_DROF%IAF_SGLC_SWAV</lname>
@@ -62,6 +67,11 @@
     <lname>2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-JRA1p5-DIB-DISMF</alias>
+    <lname>2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-JRA1p4</alias>
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
@@ -72,6 +82,11 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-JRA1p4-DISMF</alias>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-JRA1p4-DIB</alias>
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%JRA-1p4-2018-AIS0ICE_SGLC_SWAV</lname>
@@ -82,11 +97,21 @@
     <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-JRA1p4-DIB-DISMF</alias>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-IAF-PISMF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-IAF-DISMF</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-DIB-NYF</alias>
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYFAIS55_SGLC_SWAV</lname>
@@ -97,6 +122,11 @@
     <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%NYFAIS00_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>GMPAS-DIB-NYF-DISMF</alias>
+    <lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%NYFAIS00_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>GMPAS-DIB-IAF</alias>
     <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%IAFAIS55_SGLC_SWAV</lname>
@@ -108,8 +138,18 @@
   </compset>
 
   <compset>
-    <alias>GMPAS-MALI-DIB-IAF-PISMF</alias>
-    <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBPISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>
+    <alias>GMPAS-DIB-IAF-DISMF</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%IAFAIS00_SGLC_SWAV</lname>
+  </compset>
+
+  <compset>
+    <alias>GMPAS-MALI-DIB-IAF-DISMF</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>
+  </compset>
+
+    <compset>
+    <alias>GMPAS-MALI-DIB-IAF-DISMF</alias>
+    <lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>
   </compset>
 
   <compset>