From d879143ed2c5593909a30c4aeb26f1f32530df34 Mon Sep 17 00:00:00 2001 From: Matthew Hoffman Date: Mon, 6 May 2024 17:02:39 -0500 Subject: [PATCH 1/6] add 2 new AIS meshes for MALI This commit adds the mpas.ais4to20km and mpas.ais8to30km meshes for MALI. Mapping file entries are added but the mapping files themselves don't exist yet. --- cime_config/config_grids.xml | 117 ++++++++++++++++++ .../mpas-albany-landice/cime_config/buildnml | 20 ++- driver-mct/cime_config/config_component.xml | 2 +- driver-moab/cime_config/config_component.xml | 2 +- 4 files changed, 134 insertions(+), 7 deletions(-) diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 6d1ca9d6b8e5..bc4af123c519 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -1845,6 +1845,8 @@ + + ne30np4 ne30np4 @@ -1865,6 +1867,8 @@ oEC60to30v3wLI + + ne30np4 ne30np4 @@ -1995,6 +1999,8 @@ gx1v6 + + 0.9x1.25 0.9x1.25 @@ -2015,6 +2021,46 @@ oQU240wLI + + ne30np4.pg2 + r05 + IcoswISC30E3r5 + r05 + mpas.ais8to30km + null + IcoswISC30E3r5 + + + + TL319 + TL319 + IcoswISC30E3r5 + JRA025 + mpas.ais8to30km + null + IcoswISC30E3r5 + + + + ne30np4.pg2 + r05 + IcoswISC30E3r5 + r05 + mpas.ais4to20km + null + IcoswISC30E3r5 + + + + TL319 + TL319 + IcoswISC30E3r5 + JRA025 + mpas.ais4to20km + null + IcoswISC30E3r5 + + @@ -3289,6 +3335,18 @@ mpas.ais20km is a uniform-resolution 20km MALI grid of the Antarctic Ice Sheet. It is primarily intended for testing. + + 98341 + 1 + 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. + + + + 385379 + 1 + 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. + + @@ -5632,6 +5690,65 @@ cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240wLI_esmfnearestdtos.20240509.nc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/mpas-albany-landice/cime_config/buildnml b/components/mpas-albany-landice/cime_config/buildnml index 0a3b35df93eb..62e8dbc92449 100755 --- 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 += '20231222' + grid_prefix += 'ais8to30km' + decomp_date += '240507' + decomp_prefix += 'mpasli.graph.info.' + elif glc_grid == 'mpas.ais4to20km': + grid_date += '20230105' + grid_prefix += 'ais4to20km' + 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 index 271c13139555..8cddad0abf89 100644 --- a/driver-mct/cime_config/config_component.xml +++ b/driver-mct/cime_config/config_component.xml @@ -1085,7 +1085,7 @@ char - mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,mpas.gis1to10kmR2,null + mpas.aisgis20km,mpas.ais20km,mpas.ais8to30km,mpas.ais4to20km,mpas.gis20km,mpas.gis1to10km,mpas.gis1to10kmR2,null mpas.gis20km build_grid env_build.xml diff --git a/driver-moab/cime_config/config_component.xml b/driver-moab/cime_config/config_component.xml index 0f21eeb02097..d3685126c61e 100644 --- a/driver-moab/cime_config/config_component.xml +++ b/driver-moab/cime_config/config_component.xml @@ -1085,7 +1085,7 @@ char - mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,gis1to10kmR2,null + mpas.aisgis20km,mpas.ais20km,mpas.ais8to30km,mpas.ais4to20km,mpas.gis20km,mpas.gis1to10km,mpas.gis1to10kmR2,null mpas.gis20km build_grid env_build.xml From 8fc885168ba6c255d8a4e064fa83bce8a81e3c4d Mon Sep 17 00:00:00 2001 From: Matthew Hoffman Date: Tue, 7 May 2024 11:22:40 -0500 Subject: [PATCH 2/6] Add TL319_oQU240wLI_ais8to30 grid This will provide a low res testing configuration. Mapping files are listed but the filenames not yet added. --- cime_config/config_grids.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index bc4af123c519..ee618e83dcb2 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -2021,6 +2021,16 @@ oQU240wLI + + TL319 + TL319 + oQU240wLI + JRA025 + mpas.ais8to30km + null + oQU240wLI + + ne30np4.pg2 r05 @@ -5708,6 +5718,17 @@ + + + + + + + + + + + From a264ba99ab7cf6c7174cd3b0cf2faf2d098bffea Mon Sep 17 00:00:00 2001 From: Matthew Hoffman Date: Wed, 26 Jun 2024 12:46:17 -0500 Subject: [PATCH 3/6] Correct filenames in buildnml --- components/mpas-albany-landice/cime_config/buildnml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mpas-albany-landice/cime_config/buildnml b/components/mpas-albany-landice/cime_config/buildnml index 62e8dbc92449..5f5caed83a80 100755 --- a/components/mpas-albany-landice/cime_config/buildnml +++ b/components/mpas-albany-landice/cime_config/buildnml @@ -69,12 +69,12 @@ def buildnml(case, caseroot, compname): decomp_prefix += 'mpasli.graph.info.' elif glc_grid == 'mpas.ais8to30km': grid_date += '20231222' - grid_prefix += 'ais8to30km' + grid_prefix += 'ais_8to30km' decomp_date += '240507' decomp_prefix += 'mpasli.graph.info.' elif glc_grid == 'mpas.ais4to20km': grid_date += '20230105' - grid_prefix += 'ais4to20km' + grid_prefix += 'ais_4to20km' decomp_date += '240507' decomp_prefix += 'mpasli.graph.info.' elif glc_grid == 'mpas.gis20km': From 687149b3bbc9d2734fa8e88eb4f34f02e749cca2 Mon Sep 17 00:00:00 2001 From: Jon Wolfe Date: Wed, 3 Jul 2024 14:21:58 -0500 Subject: [PATCH 4/6] Add mapping files for ais4to20 and ais8to30 --- cime_config/config_grids.xml | 80 ++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index ee618e83dcb2..0f1c3512ec8a 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -5705,39 +5705,39 @@ - - - - + cpl/gridmaps/r05/map_r05_to_ais8to30_traave.20240701.nc + cpl/gridmaps/r05/map_r05_to_ais8to30_trbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_r05_traave.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_r05_traave.20240701.nc - - - - + cpl/gridmaps/TL319/map_TL319_to_ais8to30_traave.20240701.nc + cpl/gridmaps/TL319/map_TL319_to_ais8to30_trbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_TL319_traave.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_TL319_traave.20240701.nc - - - - - - - - + cpl/gridmaps/oQU240wLI/map_oQU240wLI-nomask_to_ais8to30_esmfaave.20240701.nc + cpl/gridmaps/oQU240wLI/map_oQU240wLI-nomask_to_ais8to30_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfaave.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfaave.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI-nomask_esmfnearestdtos.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_oQU240wLI_esmfnearestdtos.20240701.nc - - - - - - - - + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais8to30_esmfaave.20240701.nc + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais8to30_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5-nomask_esmfnearestdtos.20240701.nc + cpl/gridmaps/mpas.ais8to30km/map_ais8to30_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc @@ -5745,28 +5745,28 @@ - - - - + cpl/gridmaps/r05/map_r05_to_ais4to20_traave.20240701.nc + cpl/gridmaps/r05/map_r05_to_ais4to20_trbilin.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_r05_traave.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_r05_traave.20240701.nc - - - - + cpl/gridmaps/TL319/map_TL319_to_ais4to20_traave.20240701.nc + cpl/gridmaps/TL319/map_TL319_to_ais4to20_trbilin.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_TL319_traave.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_TL319_traave.20240701.nc - - - - - - - - + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfaave.20240701.nc + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfnearestdtos.20240701.nc + cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5_esmfnearestdtos.20240701.nc From 4975d490b2236fcf8c78901bc2f27e6322519b60 Mon Sep 17 00:00:00 2001 From: Matthew Hoffman Date: Wed, 24 Jul 2024 09:49:21 -0500 Subject: [PATCH 5/6] Update mpas.ais4to20km and mpas.ais8to30km meshes to new versions The updated mpas.ais4to20km mesh correctly handles merging bedmap2 for Amundsen Sea Sector into the BedMachine geometry elsewhere. The previous version had an error in how that was done. The updated mpas.ais8to30km mesh rolls back from an inadequately tested 8km mesh to the version that was used in ISMIP6-AIS-2300. --- components/mpas-albany-landice/cime_config/buildnml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mpas-albany-landice/cime_config/buildnml b/components/mpas-albany-landice/cime_config/buildnml index 5f5caed83a80..4d927c4370fd 100755 --- a/components/mpas-albany-landice/cime_config/buildnml +++ b/components/mpas-albany-landice/cime_config/buildnml @@ -68,12 +68,12 @@ def buildnml(case, caseroot, compname): decomp_date += '150910' decomp_prefix += 'mpasli.graph.info.' elif glc_grid == 'mpas.ais8to30km': - grid_date += '20231222' + grid_date += '20221027' grid_prefix += 'ais_8to30km' decomp_date += '240507' decomp_prefix += 'mpasli.graph.info.' elif glc_grid == 'mpas.ais4to20km': - grid_date += '20230105' + grid_date += '20240708' grid_prefix += 'ais_4to20km' decomp_date += '240507' decomp_prefix += 'mpasli.graph.info.' From 0a92e253ec7f155e7d6483d07f894ef50969ba7b Mon Sep 17 00:00:00 2001 From: Matthew Hoffman Date: Wed, 24 Jul 2024 15:08:33 -0500 Subject: [PATCH 6/6] Add FOLISIO compset This commit adds a FOLISIO compset (First-Order Land Ice, Sea Ice, Ocean) that uses the Albany First-Order velocity solver in MALI instead of the standard shallow-ice approximation solver. The SIA solver is inappropriate for Antarctica and was causing CFL violations when used with the new mesh, making it not practical to use even for smoketesting. --- cime_config/allactive/config_compsets.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml index 6ecf2fbf29c6..21032c483714 100755 --- a/cime_config/allactive/config_compsets.xml +++ b/cime_config/allactive/config_compsets.xml @@ -421,6 +421,11 @@ 2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI%SIA_SWAV + + MPAS_FOLISIO_JRA1p5 + 2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI_SWAV + + E1850C5ELM