Merge branch 'matthewhoffman/mali/ais-meshes' (PR #6440)

Add Antarctic Ice Sheet meshes for MALI This PR introduces two new meshes of the Antarctic Ice Sheet for MALI: * high res production mesh: mpas.ais4to20km * low-res testing mesh: mpas.ais8to30km Associated with these MALI meshes are 5 new E3SM model_grids: * ultra low res mesh for testing GG cases with JRA forcing: TL319_oQU240wLI_ais8to30 * v3 low res mesh for BG and IG cases with low res Antarctica: ne30pg2_r05_IcoswISC30E3r5_ais8to30 * v3 low res mesh for GG cases with JRA forcing with low res Antarctica: TL319_IcoswISC30E3r5_ais8to30 * v3 low res mesh for BG and IG cases with high res Antarctica: ne30pg2_r05_IcoswISC30E3r5_ais4to20 * v3 low res mesh for GG with JRA forcing cases with high res Antarctica TL319_IcoswISC30E3r5_ais4to20 [BFB] for all currently tested configurations
E3SM-Project · Aug 14, 2024 · ebc39ea · ebc39ea
2 parents a4de483 + 0a92e25
commit ebc39ea
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 7 deletions.
diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml
@@ -421,6 +421,11 @@
   <lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI%SIA_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>MPAS_FOLISIO_JRA1p5</alias>
+  <lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI_SWAV</lname>
+</compset>
+
 <!-- Slab ocean cases -->
 <compset>
   <alias>E1850C5ELM</alias>

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
@@ -1845,6 +1845,8 @@
 
     <!--- mali grids -->
 
+    <!--- mali grids with AIS and GIS -->
+
     <model_grid alias="ne30_oECv3_aisgis" compset="_MALI">
       <grid name="atm">ne30np4</grid>
       <grid name="lnd">ne30np4</grid>
@@ -1865,6 +1867,8 @@
       <mask>oEC60to30v3wLI</mask>
     </model_grid>
 
+    <!--- mali grids with GIS -->
+
     <model_grid alias="ne30_oECv3_gis" compset="_MALI">
       <grid name="atm">ne30np4</grid>
       <grid name="lnd">ne30np4</grid>
@@ -1995,6 +1999,8 @@
       <mask>gx1v6</mask>
     </model_grid>
 
+    <!--- mali grids with AIS -->
+
     <model_grid alias="f09_g16_a" compset="_MALI">
       <grid name="atm">0.9x1.25</grid>
       <grid name="lnd">0.9x1.25</grid>
@@ -2015,6 +2021,56 @@
       <mask>oQU240wLI</mask>
     </model_grid>
 
+    <model_grid alias="TL319_oQU240wLI_ais8to30" compset="_MALI">
+      <grid name="atm">TL319</grid>
+      <grid name="lnd">TL319</grid>
+      <grid name="ocnice">oQU240wLI</grid>
+      <grid name="rof">JRA025</grid>
+      <grid name="glc">mpas.ais8to30km</grid>
+      <grid name="wav">null</grid>
+      <mask>oQU240wLI</mask>
+    </model_grid>
+
+    <model_grid alias="ne30pg2_r05_IcoswISC30E3r5_ais8to30" compset="_MALI">
+      <grid name="atm">ne30np4.pg2</grid>
+      <grid name="lnd">r05</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">r05</grid>
+      <grid name="glc">mpas.ais8to30km</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
+    <model_grid alias="TL319_IcoswISC30E3r5_ais8to30" compset="_MALI">
+      <grid name="atm">TL319</grid>
+      <grid name="lnd">TL319</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">JRA025</grid>
+      <grid name="glc">mpas.ais8to30km</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
+    <model_grid alias="ne30pg2_r05_IcoswISC30E3r5_ais4to20" compset="_MALI">
+      <grid name="atm">ne30np4.pg2</grid>
+      <grid name="lnd">r05</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">r05</grid>
+      <grid name="glc">mpas.ais4to20km</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
+    <model_grid alias="TL319_IcoswISC30E3r5_ais4to20" compset="_MALI">
+      <grid name="atm">TL319</grid>
+      <grid name="lnd">TL319</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">JRA025</grid>
+      <grid name="glc">mpas.ais4to20km</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
     <!-- new runoff grids for data runoff model DROF -->
 
     <model_grid alias="T31_g37_rx1" compset="_DROF">
@@ -3289,6 +3345,18 @@
       <desc>mpas.ais20km is a uniform-resolution 20km MALI grid of the Antarctic Ice Sheet.  It is primarily intended for testing.</desc>
     </domain>
 
+    <domain name="mpas.ais8to30km">
+      <nx>98341</nx>
+      <ny>1</ny>
+      <desc>mpas.ais8to30km is a variable resolution MALI mesh of the Antarctic Ice Sheet with resolution varying from 8 km in fast flowing regions and near the ice-sheet margins to 30 km in the ice-sheet interior.  It behaves reasonably well for most of the ice sheet but results in Thwaites Glacier retreating too rapidly due to insufficient resolution there.  It is meant as a cheaper alternative to mpas.ais4to20km for testing realistic conditions.</desc>
+    </domain>
+
+    <domain name="mpas.ais4to20km">
+      <nx>385379</nx>
+      <ny>1</ny>
+      <desc>mpas.ais4to20km is a variable resolution MALI mesh of the Antarctic Ice Sheet with resolution varying from 4 km in fast flowing regions and near the ice-sheet margins to 20 km in the ice-sheet interior.  It was the primary mesh and initial condition used for ISMIP6-Antarctica-2300 and is the primary Antarctic mesh to use for E3SM v3 simulation and development with an active Antarctic Ice Sheet component.</desc>
+    </domain>
+
     <!-- WW3 domains-->
 
     <domain name="wQU225EC60to30">
@@ -5632,6 +5700,76 @@
       <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240wLI_esmfnearestdtos.20240509.nc</map>
     </gridmap>
 
+    <!-- ====================    -->
+    <!-- GLC: mpas.ais8to30km    -->
+    <!-- ====================    -->
+
+    <gridmap glc_grid="mpas.ais8to30km" lnd_grid="r05">
+      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_ais8to30_traave.20240701.nc</map>
+      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_ais8to30_trbilin.20240701.nc</map>
+      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_r05_traave.20240701.nc</map>
+      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_r05_traave.20240701.nc</map>
+    </gridmap>
+
+    <gridmap glc_grid="mpas.ais8to30km" lnd_grid="TL319">
+      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais8to30_traave.20240701.nc</map>
+      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais8to30_trbilin.20240701.nc</map>
+      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_TL319_traave.20240701.nc</map>
+      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_TL319_traave.20240701.nc</map>
+    </gridmap>
+
+    <gridmap glc_grid="mpas.ais8to30km" ocn_grid="oQU240wLI">
+      <map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oQU240wLI/map_oQU240wLI-nomask_to_ais8to30_esmfaave.20240701.nc</map>
+      <map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oQU240wLI/map_oQU240wLI-nomask_to_ais8to30_esmfbilin.20240701.nc</map>
+      <map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfaave.20240701.nc</map>
+      <map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfbilin.20240701.nc</map>
+      <map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfaave.20240701.nc</map>
+      <map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfbilin.20240701.nc</map>
+      <map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfnearestdtos.20240701.nc</map>
+      <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI_esmfnearestdtos.20240701.nc</map>
+    </gridmap>
+
+    <gridmap glc_grid="mpas.ais8to30km" ocn_grid="IcoswISC30E3r5">
+      <map name="OCN2GLC_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais8to30_esmfaave.20240701.nc</map>
+      <map name="OCN2GLC_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais8to30_esmfbilin.20240701.nc</map>
+      <map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
+      <map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
+      <map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
+      <map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
+      <map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfnearestdtos.20240701.nc</map>
+      <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc</map>
+    </gridmap>
+
+    <!-- ====================    -->
+    <!-- GLC: mpas.ais4to20km    -->
+    <!-- ====================    -->
+
+    <gridmap glc_grid="mpas.ais4to20km" lnd_grid="r05">
+      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_ais4to20_traave.20240701.nc</map>
+      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_ais4to20_trbilin.20240701.nc</map>
+      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_r05_traave.20240701.nc</map>
+      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_r05_traave.20240701.nc</map>
+    </gridmap>
+
+    <gridmap glc_grid="mpas.ais4to20km" lnd_grid="TL319">
+      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais4to20_traave.20240701.nc</map>
+      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais4to20_trbilin.20240701.nc</map>
+      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_TL319_traave.20240701.nc</map>
+      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_TL319_traave.20240701.nc</map>
+    </gridmap>
+
+    <gridmap glc_grid="mpas.ais4to20km" ocn_grid="IcoswISC30E3r5">
+      <map name="OCN2GLC_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfaave.20240701.nc</map>
+      <map name="OCN2GLC_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfbilin.20240701.nc</map>
+      <map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
+      <map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
+      <map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
+      <map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
+      <map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfnearestdtos.20240701.nc</map>
+      <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc</map>
+    </gridmap>
+
+
     <!-- ======================================================== -->
     <!-- GRIDS: glc to ocn mapping                                -->
     <!--                                                          -->

diff --git a/components/mpas-albany-landice/cime_config/buildnml b/components/mpas-albany-landice/cime_config/buildnml
@@ -62,16 +62,26 @@ def buildnml(case, caseroot, compname):
         grid_prefix += 'aisgis20km'
         decomp_date += '20190326'
         decomp_prefix += 'mpasli.graph.info.'
-    elif glc_grid == 'mpas.gis20km':
-        grid_date += '20210824'
-        grid_prefix += 'gis_20km_r01'
-        decomp_date += '150922'
-        decomp_prefix += 'mpasli.graph.info.'
     elif glc_grid == 'mpas.ais20km':
         grid_date += '150910'
         grid_prefix += 'ais20km'
         decomp_date += '150910'
         decomp_prefix += 'mpasli.graph.info.'
+    elif glc_grid == 'mpas.ais8to30km':
+        grid_date += '20221027'
+        grid_prefix += 'ais_8to30km'
+        decomp_date += '240507'
+        decomp_prefix += 'mpasli.graph.info.'
+    elif glc_grid == 'mpas.ais4to20km':
+        grid_date += '20240708'
+        grid_prefix += 'ais_4to20km'
+        decomp_date += '240507'
+        decomp_prefix += 'mpasli.graph.info.'
+    elif glc_grid == 'mpas.gis20km':
+        grid_date += '20210824'
+        grid_prefix += 'gis_20km_r01'
+        decomp_date += '150922'
+        decomp_prefix += 'mpasli.graph.info.'
     elif glc_grid == 'mpas.gis1to10km':
         grid_date += '20210824'
         grid_prefix += 'gis_1to10km_r01'

diff --git a/driver-mct/cime_config/config_component.xml b/driver-mct/cime_config/config_component.xml
@@ -1085,7 +1085,7 @@
 
   <entry id="GLC_GRID">
     <type>char</type>
-    <valid_values>mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
+    <valid_values>mpas.aisgis20km,mpas.ais20km,mpas.ais8to30km,mpas.ais4to20km,mpas.gis20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
     <default_value>mpas.gis20km</default_value>
     <group>build_grid</group>
     <file>env_build.xml</file>

diff --git a/driver-moab/cime_config/config_component.xml b/driver-moab/cime_config/config_component.xml
@@ -1085,7 +1085,7 @@
 
   <entry id="GLC_GRID">
     <type>char</type>
-    <valid_values>mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,gis1to10kmR2,null</valid_values>
+    <valid_values>mpas.aisgis20km,mpas.ais20km,mpas.ais8to30km,mpas.ais4to20km,mpas.gis20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
     <default_value>mpas.gis20km</default_value>
     <group>build_grid</group>
     <file>env_build.xml</file>