Skip to content

Commit ebc39ea

Browse files
jonbobjonbob
committed
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
2 parents a4de483 + 0a92e25 commit ebc39ea

File tree

5 files changed

+160
-7
lines changed

5 files changed

+160
-7
lines changed

‎cime_config/allactive/config_compsets.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,11 @@
421421
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI%SIA_SWAV</lname>
422422
</compset>
423423

424+
<compset>
425+
<alias>MPAS_FOLISIO_JRA1p5</alias>
426+
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI_SWAV</lname>
427+
</compset>
428+
424429
<!-- Slab ocean cases -->
425430
<compset>
426431
<alias>E1850C5ELM</alias>

‎cime_config/config_grids.xml‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,6 +1845,8 @@
18451845

18461846
<!--- mali grids -->
18471847

1848+
<!--- mali grids with AIS and GIS -->
1849+
18481850
<model_grid alias="ne30_oECv3_aisgis" compset="_MALI">
18491851
<grid name="atm">ne30np4</grid>
18501852
<grid name="lnd">ne30np4</grid>
@@ -1865,6 +1867,8 @@
18651867
<mask>oEC60to30v3wLI</mask>
18661868
</model_grid>
18671869

1870+
<!--- mali grids with GIS -->
1871+
18681872
<model_grid alias="ne30_oECv3_gis" compset="_MALI">
18691873
<grid name="atm">ne30np4</grid>
18701874
<grid name="lnd">ne30np4</grid>
@@ -1995,6 +1999,8 @@
19951999
<mask>gx1v6</mask>
19962000
</model_grid>
19972001

2002+
<!--- mali grids with AIS -->
2003+
19982004
<model_grid alias="f09_g16_a" compset="_MALI">
19992005
<grid name="atm">0.9x1.25</grid>
20002006
<grid name="lnd">0.9x1.25</grid>
@@ -2015,6 +2021,56 @@
20152021
<mask>oQU240wLI</mask>
20162022
</model_grid>
20172023

2024+
<model_grid alias="TL319_oQU240wLI_ais8to30" compset="_MALI">
2025+
<grid name="atm">TL319</grid>
2026+
<grid name="lnd">TL319</grid>
2027+
<grid name="ocnice">oQU240wLI</grid>
2028+
<grid name="rof">JRA025</grid>
2029+
<grid name="glc">mpas.ais8to30km</grid>
2030+
<grid name="wav">null</grid>
2031+
<mask>oQU240wLI</mask>
2032+
</model_grid>
2033+
2034+
<model_grid alias="ne30pg2_r05_IcoswISC30E3r5_ais8to30" compset="_MALI">
2035+
<grid name="atm">ne30np4.pg2</grid>
2036+
<grid name="lnd">r05</grid>
2037+
<grid name="ocnice">IcoswISC30E3r5</grid>
2038+
<grid name="rof">r05</grid>
2039+
<grid name="glc">mpas.ais8to30km</grid>
2040+
<grid name="wav">null</grid>
2041+
<mask>IcoswISC30E3r5</mask>
2042+
</model_grid>
2043+
2044+
<model_grid alias="TL319_IcoswISC30E3r5_ais8to30" compset="_MALI">
2045+
<grid name="atm">TL319</grid>
2046+
<grid name="lnd">TL319</grid>
2047+
<grid name="ocnice">IcoswISC30E3r5</grid>
2048+
<grid name="rof">JRA025</grid>
2049+
<grid name="glc">mpas.ais8to30km</grid>
2050+
<grid name="wav">null</grid>
2051+
<mask>IcoswISC30E3r5</mask>
2052+
</model_grid>
2053+
2054+
<model_grid alias="ne30pg2_r05_IcoswISC30E3r5_ais4to20" compset="_MALI">
2055+
<grid name="atm">ne30np4.pg2</grid>
2056+
<grid name="lnd">r05</grid>
2057+
<grid name="ocnice">IcoswISC30E3r5</grid>
2058+
<grid name="rof">r05</grid>
2059+
<grid name="glc">mpas.ais4to20km</grid>
2060+
<grid name="wav">null</grid>
2061+
<mask>IcoswISC30E3r5</mask>
2062+
</model_grid>
2063+
2064+
<model_grid alias="TL319_IcoswISC30E3r5_ais4to20" compset="_MALI">
2065+
<grid name="atm">TL319</grid>
2066+
<grid name="lnd">TL319</grid>
2067+
<grid name="ocnice">IcoswISC30E3r5</grid>
2068+
<grid name="rof">JRA025</grid>
2069+
<grid name="glc">mpas.ais4to20km</grid>
2070+
<grid name="wav">null</grid>
2071+
<mask>IcoswISC30E3r5</mask>
2072+
</model_grid>
2073+
20182074
<!-- new runoff grids for data runoff model DROF -->
20192075

20202076
<model_grid alias="T31_g37_rx1" compset="_DROF">
@@ -3289,6 +3345,18 @@
32893345
<desc>mpas.ais20km is a uniform-resolution 20km MALI grid of the Antarctic Ice Sheet. It is primarily intended for testing.</desc>
32903346
</domain>
32913347

3348+
<domain name="mpas.ais8to30km">
3349+
<nx>98341</nx>
3350+
<ny>1</ny>
3351+
<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>
3352+
</domain>
3353+
3354+
<domain name="mpas.ais4to20km">
3355+
<nx>385379</nx>
3356+
<ny>1</ny>
3357+
<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>
3358+
</domain>
3359+
32923360
<!-- WW3 domains-->
32933361

32943362
<domain name="wQU225EC60to30">
@@ -5632,6 +5700,76 @@
56325700
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240wLI_esmfnearestdtos.20240509.nc</map>
56335701
</gridmap>
56345702

5703+
<!-- ==================== -->
5704+
<!-- GLC: mpas.ais8to30km -->
5705+
<!-- ==================== -->
5706+
5707+
<gridmap glc_grid="mpas.ais8to30km" lnd_grid="r05">
5708+
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_ais8to30_traave.20240701.nc</map>
5709+
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_ais8to30_trbilin.20240701.nc</map>
5710+
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_r05_traave.20240701.nc</map>
5711+
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_r05_traave.20240701.nc</map>
5712+
</gridmap>
5713+
5714+
<gridmap glc_grid="mpas.ais8to30km" lnd_grid="TL319">
5715+
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais8to30_traave.20240701.nc</map>
5716+
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais8to30_trbilin.20240701.nc</map>
5717+
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_TL319_traave.20240701.nc</map>
5718+
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_TL319_traave.20240701.nc</map>
5719+
</gridmap>
5720+
5721+
<gridmap glc_grid="mpas.ais8to30km" ocn_grid="oQU240wLI">
5722+
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oQU240wLI/map_oQU240wLI-nomask_to_ais8to30_esmfaave.20240701.nc</map>
5723+
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oQU240wLI/map_oQU240wLI-nomask_to_ais8to30_esmfbilin.20240701.nc</map>
5724+
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfaave.20240701.nc</map>
5725+
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfbilin.20240701.nc</map>
5726+
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfaave.20240701.nc</map>
5727+
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfbilin.20240701.nc</map>
5728+
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfnearestdtos.20240701.nc</map>
5729+
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI_esmfnearestdtos.20240701.nc</map>
5730+
</gridmap>
5731+
5732+
<gridmap glc_grid="mpas.ais8to30km" ocn_grid="IcoswISC30E3r5">
5733+
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais8to30_esmfaave.20240701.nc</map>
5734+
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais8to30_esmfbilin.20240701.nc</map>
5735+
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
5736+
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
5737+
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
5738+
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
5739+
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfnearestdtos.20240701.nc</map>
5740+
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc</map>
5741+
</gridmap>
5742+
5743+
<!-- ==================== -->
5744+
<!-- GLC: mpas.ais4to20km -->
5745+
<!-- ==================== -->
5746+
5747+
<gridmap glc_grid="mpas.ais4to20km" lnd_grid="r05">
5748+
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_ais4to20_traave.20240701.nc</map>
5749+
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_ais4to20_trbilin.20240701.nc</map>
5750+
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_r05_traave.20240701.nc</map>
5751+
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_r05_traave.20240701.nc</map>
5752+
</gridmap>
5753+
5754+
<gridmap glc_grid="mpas.ais4to20km" lnd_grid="TL319">
5755+
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais4to20_traave.20240701.nc</map>
5756+
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ais4to20_trbilin.20240701.nc</map>
5757+
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_TL319_traave.20240701.nc</map>
5758+
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_TL319_traave.20240701.nc</map>
5759+
</gridmap>
5760+
5761+
<gridmap glc_grid="mpas.ais4to20km" ocn_grid="IcoswISC30E3r5">
5762+
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfaave.20240701.nc</map>
5763+
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfbilin.20240701.nc</map>
5764+
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
5765+
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
5766+
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
5767+
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
5768+
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfnearestdtos.20240701.nc</map>
5769+
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc</map>
5770+
</gridmap>
5771+
5772+
56355773
<!-- ======================================================== -->
56365774
<!-- GRIDS: glc to ocn mapping -->
56375775
<!-- -->

‎components/mpas-albany-landice/cime_config/buildnml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,26 @@ def buildnml(case, caseroot, compname):
6262
grid_prefix += 'aisgis20km'
6363
decomp_date += '20190326'
6464
decomp_prefix += 'mpasli.graph.info.'
65-
elif glc_grid == 'mpas.gis20km':
66-
grid_date += '20210824'
67-
grid_prefix += 'gis_20km_r01'
68-
decomp_date += '150922'
69-
decomp_prefix += 'mpasli.graph.info.'
7065
elif glc_grid == 'mpas.ais20km':
7166
grid_date += '150910'
7267
grid_prefix += 'ais20km'
7368
decomp_date += '150910'
7469
decomp_prefix += 'mpasli.graph.info.'
70+
elif glc_grid == 'mpas.ais8to30km':
71+
grid_date += '20221027'
72+
grid_prefix += 'ais_8to30km'
73+
decomp_date += '240507'
74+
decomp_prefix += 'mpasli.graph.info.'
75+
elif glc_grid == 'mpas.ais4to20km':
76+
grid_date += '20240708'
77+
grid_prefix += 'ais_4to20km'
78+
decomp_date += '240507'
79+
decomp_prefix += 'mpasli.graph.info.'
80+
elif glc_grid == 'mpas.gis20km':
81+
grid_date += '20210824'
82+
grid_prefix += 'gis_20km_r01'
83+
decomp_date += '150922'
84+
decomp_prefix += 'mpasli.graph.info.'
7585
elif glc_grid == 'mpas.gis1to10km':
7686
grid_date += '20210824'
7787
grid_prefix += 'gis_1to10km_r01'

‎driver-mct/cime_config/config_component.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@
10851085

10861086
<entry id="GLC_GRID">
10871087
<type>char</type>
1088-
<valid_values>mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
1088+
<valid_values>mpas.aisgis20km,mpas.ais20km,mpas.ais8to30km,mpas.ais4to20km,mpas.gis20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
10891089
<default_value>mpas.gis20km</default_value>
10901090
<group>build_grid</group>
10911091
<file>env_build.xml</file>

‎driver-moab/cime_config/config_component.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@
10851085

10861086
<entry id="GLC_GRID">
10871087
<type>char</type>
1088-
<valid_values>mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,gis1to10kmR2,null</valid_values>
1088+
<valid_values>mpas.aisgis20km,mpas.ais20km,mpas.ais8to30km,mpas.ais4to20km,mpas.gis20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
10891089
<default_value>mpas.gis20km</default_value>
10901090
<group>build_grid</group>
10911091
<file>env_build.xml</file>

0 commit comments

Comments
 (0)