Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and add new support for configurations with dynamic Greenland ice sheet component #6226

Merged
merged 33 commits into from
May 1, 2024
Merged

Update and add new support for configurations with dynamic Greenland ice sheet component #6226

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ef3511b
Add support for 20 km Greenland tri-grid confg
stephenprice Jul 13, 2023
30f2dd4
Make MALI higher-order default for IG cases.
stephenprice Jul 13, 2023
6d9af83
Update path in 'help' description.
stephenprice Jul 13, 2023
0b6899c
Add Albany path for perlmutter build.
stephenprice Jul 17, 2023
31a4bf2
Add / update support for GIS grids
stephenprice Aug 10, 2023
77e453f
Add CIME support for new GIS 1-to-10 (r02)
stephenprice Aug 10, 2023
9df499b
Addition of various support for Greenland ice sheet configurations.
stephenprice Jan 3, 2024
f38128b
Clean up stray comment in config machines file.
stephenprice Jan 3, 2024
c5a39d1
Update default settings for mali's (Albany) velocity solver.
stephenprice Jan 4, 2024
ed14c21
Simplify glcmask specs used for 20 km Greenland test case
stephenprice Jan 4, 2024
18965ab
Resolve merge conflict for chrysalis
stephenprice Feb 7, 2024
7f2e5a6
Correct Kokkos path in pm-cpu machine file (for mali support)
stephenprice Jan 4, 2024
71ff4fb
Add support for ERS and ERP tests for 20km Greenland IG config.
stephenprice Jan 5, 2024
dd43257
Add default pe layout for BG case w/ high-res Greenland ice sheet.
stephenprice Jan 8, 2024
7e0da04
Minor updates in support of coupled configs. with active Greenland ic…
stephenprice Jan 8, 2024
423b9a3
Fix specs for default PE layout for Greenland 20 km config
stephenprice Jan 8, 2024
0179780
Mods towards default PE layout for Greenland 1-to-10 km working on mu…
stephenprice Jan 8, 2024
202f394
Resolve merge conflict in pesall file
stephenprice Feb 7, 2024
e6d689d
Update defualt PE layouts for GIS 1-to-10km for pm-cpu and chrysalis
stephenprice Jan 19, 2024
88d2dc1
Fix a few more merge conflicts in pesall file
stephenprice Feb 7, 2024
6a39312
Additional support for compsets with active Greenland ice sheet.
stephenprice Feb 20, 2024
7d8afb5
Minor edits and additions in response to PR review by M. Hoffman.
stephenprice Mar 14, 2024
7077dbd
Remove extraneous comments from albany solver input file.
stephenprice Mar 14, 2024
28b66fd
Remove support for CISM meshes.
stephenprice Mar 14, 2024
c0abc0b
Add default PE layout and remove unecessary nl file edits
stephenprice Apr 2, 2024
1327c10
Update mapping and domain files, add support for v3 ocn/ice mesh
jonbob Apr 10, 2024
057cc51
Remove support for Greenland 20km ERP test
stephenprice Apr 16, 2024
133dada
Add detail on Greenland 1-to-10km mesh being used.
stephenprice Apr 18, 2024
aca8a93
Point to correct, updated glsmask file for GIS 20km configurations.
stephenprice Apr 24, 2024
3306bae
Remove new landice devel tests from e3sm devel test suite.
stephenprice Apr 25, 2024
d8e3c71
Remove SMS.f09_g16_a.IGELM_MLI from e3sm_developer suite
jonbob Apr 25, 2024
4d2427b
Fix cut-and-paste error for TL319-gis1to10kmR2
jonbob Apr 25, 2024
b11528d
Fix environment variables in config machine file
mperego Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/allactive/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@

<compset>
<alias>BGWCYCL1850</alias>
<lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI%STATIC_SWAV</lname>
<lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV</lname>
</compset>

<!-- EAMXX fully coupled compset -->
Expand Down
204 changes: 140 additions & 64 deletions cime_config/allactive/config_pesall.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions cime_config/config_archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@

<comp_archive_spec compname="mali" compclass="glc" exclude_testing="true">
<rest_file_extension>rst</rest_file_extension>
<rest_file_extension>rst.am.timeSeriesStatsMonthly</rest_file_extension>
<hist_file_extension>hist</hist_file_extension>
<rest_history_varname>unset</rest_history_varname>
<rpointer>
Expand All @@ -129,9 +128,8 @@
<test_file_names>
<tfile disposition="copy">rpointer.glc</tfile>
<tfile disposition="copy">casename.mali.rst.1976-01-01_00000.nc</tfile>
<tfile disposition="copy">casename.mali.rst.am.timeSeriesStatsMonthly.1976-01-01_00000.nc</tfile>
<tfile disposition="move">casename.mali.hist.am.globalStats.1976-01-01.nc</tfile>
<tfile disposition="move">casename.mali.hist.am.highFrequencyOutput.1976-01-01_00.00.00.nc</tfile>
<tfile disposition="move">casename.mali.hist.1976-01-01_00000.nc</tfile>
matthewhoffman marked this conversation as resolved.
Show resolved Hide resolved
<tfile disposition="move">casename.mali.hist.am.1976-01-01.nc</tfile>
</test_file_names>
</comp_archive_spec>

Expand Down
93 changes: 90 additions & 3 deletions cime_config/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<grid name="rof" compset="DROF%CPLHIST">r05</grid>
<grid name="rof" compset="XROF">r05</grid>
<grid name="glc" compset="SGLC">null</grid>
<grid name="glc" compset="CISM1">gland5UM</grid>
<grid name="glc" compset="CISM2">gland4</grid>
<grid name="glc" compset="XGLC">gland4</grid>
<grid name="wav" compset="SWAV">null</grid>
<grid name="wav" compset="DWAV">null</grid>
<grid name="wav" compset="XWAV">null</grid>
Expand Down Expand Up @@ -1658,6 +1655,16 @@
<mask>oEC60to30v3</mask>
</model_grid>

<model_grid alias="ne30pg2_r05_EC30to60E2r2_gis20" compset="_MALI">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r05</grid>
<grid name="ocnice">EC30to60E2r2</grid>
<grid name="rof">r05</grid>
<grid name="glc">mpas.gis20km</grid>
<grid name="wav">null</grid>
<mask>EC30to60E2r2</mask>
</model_grid>

<model_grid alias="ne30pg2_r05_oECv3_gis1to10" compset="_MALI">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r05</grid>
Expand All @@ -1678,6 +1685,16 @@
<mask>oEC60to30v3</mask>
</model_grid>

<model_grid alias="ne30pg2_r05_EC30to60E2r2_gis1to10" compset="_MALI">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see note below - do we really want to add both this and the R2 version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will leave this question open for now (see initial response to this above and comment further there).

<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r05</grid>
<grid name="ocnice">EC30to60E2r2</grid>
<grid name="rof">r05</grid>
<grid name="glc">mpas.gis1to10km</grid>
<grid name="wav">null</grid>
<mask>EC30to60E2r2</mask>
</model_grid>

<model_grid alias="ne30pg2_r0125_EC30to60E2r2_gis1to10" compset="_MALI">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r0125</grid>
Expand All @@ -1688,6 +1705,16 @@
<mask>EC30to60E2r2</mask>
</model_grid>

<model_grid alias="ne30pg2_r05_EC30to60E2r2_gis1to10r02" compset="_MALI">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r05</grid>
<grid name="ocnice">EC30to60E2r2</grid>
<grid name="rof">r05</grid>
<grid name="glc">mpas.gis1to10kmR2</grid>
<grid name="wav">null</grid>
<mask>EC30to60E2r2</mask>
</model_grid>

<model_grid alias="ne120pg2_r0125_EC30to60E2r2_gis1to10" compset="_MALI">
<grid name="atm">ne120np4.pg2</grid>
<grid name="lnd">r0125</grid>
Expand Down Expand Up @@ -2885,6 +2912,12 @@
<desc>mpas.gis1to10km is a variable-resolution, from 1- to 10-km, MALI grid of the Greenland Ice Sheet.</desc>
</domain>

<domain name="mpas.gis1to10kmR2">
matthewhoffman marked this conversation as resolved.
Show resolved Hide resolved
<nx>427386</nx>
<ny>1</ny>
<desc>mpas.gis1to10kmR2 is an updated (fewer grid cells; improved optimization) variable-resolution, from 1- to 10-km, MALI grid of the Greenland Ice Sheet.</desc>
</domain>

<domain name="mpas.ais20km">
<nx>45675</nx>
<ny>1</ny>
Expand Down Expand Up @@ -4823,6 +4856,31 @@
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_mpas.gis20km_to_oEC60to30v3_aave.181115.nc</map>
</gridmap>

<gridmap glc_grid="mpas.gis20km" lnd_grid="ne30np4.pg2">
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis20km_mono.230510.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis20km_bilin.230510.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_ne30pg2_mono.230510.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_ne30pg2_mono.230510.nc</map>
</gridmap>
stephenprice marked this conversation as resolved.
Show resolved Hide resolved

<gridmap glc_grid="mpas.gis20km" lnd_grid="r05">
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_gis20km_mono.230510.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_gis20km_bilin.230510.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_r05_mono.230510.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_r05_mono.230510.nc</map>
</gridmap>

<gridmap glc_grid="mpas.gis20km" ocn_grid="EC30to60E2r2">
matthewhoffman marked this conversation as resolved.
Show resolved Hide resolved
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis20km_aave.230510.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis20km_bilin.230510.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
</gridmap>

<!-- ==================== -->
<!-- GLC: mpas.gis1to10km -->
<!-- ==================== -->
Expand Down Expand Up @@ -4870,6 +4928,35 @@
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_EC30to60E2r2_aave.210304.nc</map>
</gridmap>

<!-- ==================== -->
<!-- GLC: mpas.gis1to10kmR2 -->
<!-- ==================== -->

<gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="r05">
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/r05/map_r05_to_gis1to10r02_mono.230725.nc</map>
matthewhoffman marked this conversation as resolved.
Show resolved Hide resolved
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/r05/map_r05_to_gis1to10r02_bilin.230725.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_r05_mono.230725.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_r05_mono.230725.nc</map>
</gridmap>

<gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="ne30np4.pg2">
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10r02_mono.230725.nc</map>
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10r02_bilin.230725.nc</map>
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_ne30pg2_mono.230725.nc</map>
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_ne30pg2_mono.230725.nc</map>
</gridmap>

<gridmap glc_grid="mpas.gis1to10kmR2" ocn_grid="EC30to60E2r2">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10r02_aave.230725.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10r02_bilin.230725.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
</gridmap>

<!-- ==================== -->
<!-- GLC: mpas.ais20km -->
<!-- ==================== -->
Expand Down
8 changes: 7 additions & 1 deletion cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,9 @@
<env name="PERL5LIB">/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch</env>
<env name="FI_CXI_RX_MATCH_MODE">software</env>
<env name="MPICH_COLL_SYNC">MPI_Bcast</env>
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/albany-e3sm-serial-release-gcc; else echo "$Albany_ROOT"; fi}</env>
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/albany-e3sm-serial-release-gcc-cmake-fix; else echo "$Albany_ROOT"; fi}</env>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we put these changes in the gnu environment_variables compiler like done in Chrysalis?

<environment_variables compiler="gnu">
   <env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/albany-e3sm-serial-release-gcc-cmake-fix; else echo "$Albany_ROOT"; fi}</env>
    <env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/trilinos-e3sm-serial-release-gcc; else echo "$Trilinos_ROOT"; fi}</env>
    <env name="Kokkos_ROOT">$SHELL{if [ -z "$Kokkos_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/trilinos-e3sm-serial-release-gcc; else echo "$Kokkos_ROOT"; fi}</env>
</environment_variables>

<env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/trilinos-e3sm-serial-release-gcc; else echo "$Trilinos_ROOT"; fi}</env>
<env name="Kokkos_ROOT">$SHELL{if [ -z "$Kokkos_ROOT" ]; then echo /global/common/software/e3sm/mali_tpls/trilinos-e3sm-serial-release-gcc; else echo "$Kokkos_ROOT"; fi}</env>
<env name="NETCDF_PATH">$ENV{CRAY_NETCDF_HDF5PARALLEL_PREFIX}</env>
<env name="PNETCDF_PATH">$ENV{CRAY_PARALLEL_NETCDF_PREFIX}</env>
<env name="GATOR_INITIAL_MB">4000MB</env>
Expand Down Expand Up @@ -2641,6 +2642,11 @@
<environment_variables compiler="gnu" mpilib="openmpi">
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/chrysalis/gnu; else echo "$MOAB_ROOT"; fi}</env>
</environment_variables>
<environment_variables compiler="gnu">
<env name="Albany_ROOT">$SHELL{if [ -z "$Albany_ROOT" ]; then echo /lcrc/group/e3sm/ac.jwatkins/LandIce/AlbanyBuilds/build-gcc-sfad12-e3sm/install; else echo "$Albany_ROOT"; fi}</env>
<env name="Trilinos_ROOT">$SHELL{if [ -z "$Trilinos_ROOT" ]; then echo /lcrc/group/e3sm/ac.jwatkins/LandIce/TrilinosBuilds/build-gcc-e3sm/install; else echo "$Trilinos_ROOT"; fi}</env>
<env name="Kokkos_ROOT">$SHELL{if [ -z "$Kokkos_ROOT" ]; then echo /lcrc/group/e3sm/ac.jwatkins/LandIce/TrilinosBuilds/build-gcc-e3sm/install; else echo "$Kokkos_ROOT"; fi}</env>
</environment_variables>
</machine>

<machine MACH="blues">
Expand Down
10 changes: 9 additions & 1 deletion cime_config/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@
)
},

"e3sm_landice_developer" : {
"tests" : (
"SMS.ne30pg2_r05_EC30to60E2r2_gis20.IGELM_MLI.elm-gis20kmSMS",
"ERS.ne30pg2_r05_EC30to60E2r2_gis20.IGELM_MLI.elm-gis20kmERS",
"ERP.ne30pg2_r05_EC30to60E2r2_gis20.IGELM_MLI.elm-gis20kmERP",
)
},

"eam_condidiag" : {
"tests" : (
"SMS_D_Ln5.ne4pg2_oQU480.F2010",
Expand Down Expand Up @@ -256,7 +264,7 @@
},

"e3sm_developer" : {
"inherit" : ("e3sm_land_developer", "e3sm_atm_developer", "e3sm_ice_developer"),
"inherit" : ("e3sm_land_developer", "e3sm_atm_developer", "e3sm_ice_developer", "e3sm_landice_developer"),
"time" : "0:45:00",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take this out of e3sm_developer for now since it has to run with gnu.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks.

"tests" : (
"ERS.f19_g16_rx1.A",
Expand Down
16 changes: 2 additions & 14 deletions components/elm/bld/namelist_files/namelist_defaults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,22 +576,10 @@ this mask will have smb calculated over the entire global land surface
<fglcmask hgrid="0.9x1.25" glc_grid="--ANYTHING--">lnd/clm2/griddata/glcmaskdata_0.9x1.25_GIS_AIS.nc</fglcmask>
<fglcmask hgrid="ne30np4" glc_grid="--ANYTHING--">lnd/clm2/griddata/glcmaskdata_ne30np4_GIS_AIS_171002.nc</fglcmask>


<fglcmask hgrid="48x96" glc_grid="gland20" >glc/cism/griddata/glcmaskdata_48x96_Gland20km.nc</fglcmask>
<fglcmask hgrid="48x96" glc_grid="gland10" >glc/cism/griddata/glcmaskdata_48x96_Gland10km.nc</fglcmask>
<fglcmask hgrid="48x96" glc_grid="gland5" >glc/cism/griddata/glcmaskdata_48x96_Gland5km.nc</fglcmask>
<fglcmask hgrid="48x96" glc_grid="gland5UM">glc/cism/griddata/glcmaskdata_48x96_Gland5km.nc</fglcmask>
<fglcmask hgrid="0.9x1.25" glc_grid="gland20" >glc/cism/griddata/glcmaskdata_0.9x1.25_Gland20km.nc</fglcmask>
<fglcmask hgrid="0.9x1.25" glc_grid="gland10" >glc/cism/griddata/glcmaskdata_0.9x1.25_Gland10km.nc</fglcmask>
<fglcmask hgrid="0.9x1.25" glc_grid="gland5" >glc/cism/griddata/glcmaskdata_0.9x1.25_Gland5km.nc</fglcmask>
<fglcmask hgrid="0.9x1.25" glc_grid="gland5UM">glc/cism/griddata/glcmaskdata_0.9x1.25_Gland5km.nc</fglcmask>
<fglcmask hgrid="1.9x2.5" glc_grid="gland20" >glc/cism/griddata/glcmaskdata_1.9x2.5_Gland20km.nc</fglcmask>
<fglcmask hgrid="1.9x2.5" glc_grid="gland10" >glc/cism/griddata/glcmaskdata_1.9x2.5_Gland10km.nc</fglcmask>
<fglcmask hgrid="1.9x2.5" glc_grid="gland5" >glc/cism/griddata/glcmaskdata_1.9x2.5_Gland5km.nc</fglcmask>
<fglcmask hgrid="1.9x2.5" glc_grid="gland5UM">glc/cism/griddata/glcmaskdata_1.9x2.5_Gland5km.nc</fglcmask>
<!-- MALI grids that could be used if the glc_grid logic was working. -->
<!-- MALI grids -->
<fglcmask hgrid="0.9x1.25" glc_grid="mpas.gis20km">glc/cism/griddata/glcmaskdata_0.9x1.25_Gland5km.nc</fglcmask> <!-- the CISM one works fine for this mesh -->
<fglcmask hgrid="0.9x1.25" glc_grid="mpas.ais20km">lnd/clm2/griddata/glcmaskdata_0.9x1.25_60S.nc</fglcmask>
<fglcmask hgrid="r05" glc_grid="mpas.gis20km">lnd/clm2/griddata/glcmaskdata_0.5x0.5_everywhere.nc</fglcmask>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the everywhere in this file name referring to? I don't think we'd ever want glacier land units to be active everywhere on the LND grid if that's what it means - I think that would have a noticeable degradation on ELM performance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is what it sounds like - the mask is true (ones) "everywhere". Since we're really only using the 20km GIS grid for testing and debugging, I figured this was ok (I've not noted any performance hit -- it's usually being run on only 1 or 2 nodes -- but it's certainly possible there is one). I made a few other attempts to "fix" the existing mask that was resulting in runtime errors but was unsuccessful. We can certainly do better if this seems important.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see - I wasn't aware the existing one was causing an error. Activating glacier land units for the low res testing mesh seems fine.

Did you try it with lnd/clm2/griddata/glcmaskdata_0.5x0.5_GIS_AIS.nc? My guess is the error comes when the GLC mesh extends beyond the masked region on the LND grid, which could be the case for the 20km GIS mesh. I'm asking because down the road we may need to make our GIS meshes extend farther to ensure they have overlap with the OCN meshes, so if there is an extent issue with the 20km GIS mesh, it will likely show up then too. (not necessary to figure out for this PR)

<fglcmask hgrid="r05" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_0.5x0.5_GIS_AIS.nc</fglcmask>
matthewhoffman marked this conversation as resolved.
Show resolved Hide resolved
<fglcmask hgrid="r0125" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_r0125_GIS_AIS.210407.nc</fglcmask>
<fglcmask hgrid="ne30np4.pg2" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_ne30pg2_GIS_AIS.210407.nc</fglcmask>
Expand Down
2 changes: 1 addition & 1 deletion components/elm/bld/namelist_files/namelist_defaults_overall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ determine default values for namelists.
<!-- Default glacier model grid/resolution -->

<glc_grid glc_nec="0">none</glc_grid>
<glc_grid >gland5UM</glc_grid>
<glc_grid >mpas.gis20km</glc_grid>
<glc_dyntopo >.false.</glc_dyntopo>
<glc_smb >.true.</glc_smb>
<glc_nec glc_nec="0" >0</glc_nec>
Expand Down
8 changes: 3 additions & 5 deletions components/elm/bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,10 @@ Normally this is ONLY used when running CESM with the active glacier model.
</entry>

<entry id="glc_grid" type="char*10" category="elm_physics"
group="elm_inparm" valid_values="gland20,gland10,gland5,gland5UM" >
group="elm_inparm" valid_values="mpas.gis20km,mpas.gis1to10km" >
stephenprice marked this conversation as resolved.
Show resolved Hide resolved
Glacier model grid
gland20 = Greenland at 20km resolution
gland10 = Greenland at 10km resolution
gland5 = Greenland at 5km resolution
gland5UM = Greenland at 5km resolution, using new UMontana ice sheet data for present day Greenland
mpas.gis20km = Greenland at 20km resolution
mpas.gis1to10km = Greenland at variable resolution (1-to-10km)
</entry>

<entry id="glc_smb" type="logical" category="elm_physics"
Expand Down
2 changes: 1 addition & 1 deletion components/elm/cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@

<compset>
<alias>IGELM_MLI</alias>
<lname>2000_DATM%QIA_ELM%SP_SICE_SOCN_MOSART_MALI%SIA_SWAV</lname>
<lname>2000_DATM%QIA_ELM%SP_SICE_SOCN_MOSART_MALI_SWAV</lname>
</compset>

<compset>
Expand Down
38 changes: 38 additions & 0 deletions components/elm/cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,4 +523,42 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%null_r%r05_g%mpas.gis20km_w%null_z%null_m%EC30to60E2r2">
stephenprice marked this conversation as resolved.
Show resolved Hide resolved
<mach name="chrysalis|pm-cpu|alvarez">
<pes compset="any" pesize="any">
<comment>GIS 20km (low-res) testing config</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_rof>128</ntasks_rof>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>128</ntasks_ocn>
<ntasks_glc>128</ntasks_glc>
stephenprice marked this conversation as resolved.
Show resolved Hide resolved
<ntasks_wav>128</ntasks_wav>
<ntasks_cpl>128</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
</config_pes>
10 changes: 10 additions & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20kmERP/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=3
./xmlchange REST_OPTION=ndays
./xmlchange REST_N=3
./xmlchange NCPL_BASE_PERIOD=year
./xmlchange ATM_NCPL=17520
./xmlchange LND_NCPL=17520
./xmlchange OCN_NCPL=8760
./xmlchange GLC_NCPL=365
./xmlchange ROF_NCPL=17520
8 changes: 8 additions & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20kmERP/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config_velocity_solver = 'FO'
config_thickness_advection = 'fo'
config_thermal_solver = 'none'
stephenprice marked this conversation as resolved.
Show resolved Hide resolved
config_pio_num_iotasks = 47
config_pio_stride = 64
stephenprice marked this conversation as resolved.
Show resolved Hide resolved
config_calving = 'none'
config_restore_calving_front = .true.
config_dt = '0000-00-01_00:00:00'
10 changes: 10 additions & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20kmERS/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=1
./xmlchange REST_OPTION=ndays
./xmlchange REST_N=1
./xmlchange NCPL_BASE_PERIOD=year
./xmlchange ATM_NCPL=17520
./xmlchange LND_NCPL=17520
./xmlchange OCN_NCPL=8760
./xmlchange GLC_NCPL=365
./xmlchange ROF_NCPL=17520
8 changes: 8 additions & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20kmERS/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config_velocity_solver = 'FO'
config_thickness_advection = 'fo'
config_thermal_solver = 'none'
stephenprice marked this conversation as resolved.
Show resolved Hide resolved
config_pio_num_iotasks = 47
config_pio_stride = 64
config_calving = 'none'
config_restore_calving_front = .true.
config_dt = '0000-00-01_00:00:00'
11 changes: 11 additions & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20kmSMS/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=2
./xmlchange REST_OPTION=ndays
./xmlchange REST_N=2
./xmlchange NCPL_BASE_PERIOD=year
./xmlchange ATM_NCPL=17520
./xmlchange LND_NCPL=17520
./xmlchange OCN_NCPL=8760
./xmlchange GLC_NCPL=365
./xmlchange ROF_NCPL=17520

8 changes: 8 additions & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20kmSMS/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config_velocity_solver = 'FO'
config_thickness_advection = 'fo'
config_thermal_solver = 'none'
config_pio_num_iotasks = 47
config_pio_stride = 64
config_calving = 'none'
config_restore_calving_front = .true.
config_dt = '0000-00-01_00:00:00'
2 changes: 1 addition & 1 deletion components/elm/src/main/elm_varcon.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ subroutine elm_varcon_init()
allocate( dzsoifl(1:nlevsoifl ))

if (use_extrasnowlayers) then
h2osno_max = 10000._r8
h2osno_max = 30000._r8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to be changing this in this PR. @stephenprice , on the call today, Chloe described a new PR she will make that includes this plus a few firn parameter tuning improvements that were used in the long firn spinups.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine, but a few weeks ago she asked me to just include this here. I'm happy to remove it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chloewhicker recently opened a PR that includes this change with a few other changes for the firn model in #6298, so I think it should be removed from this PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @stephenprice I didn't know I needed to submit the firn model changes when we talked about it. Matt is right, this line is included in my PR here: #6298 (review)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Not sure I need to revert this commit though as it will resolve itself in the merge, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#6298 has been merged already, so I think it is safe to leave this change here. I looked a the git history, and this change was part of a commit with changes we want to keep, so dropping this change is not as simple as just removing a commit from the branch history. I'm ok with leaving it in, unless @jonbob thinks it would be cleaner to remove it from the history or change it back.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it only affects cases with an active ice sheet model, its fine.

end if

end subroutine elm_varcon_init
Expand Down
Loading