Skip to content

Update testing for configurations with active Greenland ice sheet #7892

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

Merged
jonbob merged 7 commits into from
Jan 9, 2026
Merged

Update testing for configurations with active Greenland ice sheet #7892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93dd691
Update testing support for Greenland configurations
stephenprice Nov 13, 2025
77970bd
More updates to testing support for Greenland configurations
stephenprice Nov 14, 2025
f9cd810
Finish updated testing support for Greenland configurations
stephenprice Nov 18, 2025
17f9a1c
Additional changes to updated testing support for Greenland configura…
stephenprice Dec 2, 2025
43965dd
Update default PE layout for IG case using GIS 1to10km mesh
stephenprice Dec 8, 2025
fc4ecd8
Minor corrections and clean-up of default pe setting files.
stephenprice Dec 9, 2025
6b2926b
Fix typo in PE layout description.
stephenprice Dec 18, 2025
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
14 changes: 8 additions & 6 deletions cime_config/allactive/config_pesall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2365,7 +2365,7 @@
<grid name="a%ne30np4.pg2_l%.+_g%mpas.gis1to10kmR2">
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+MALI.+SWAV.+" pesize="M">
<comment>pm-cpu: GIS 1-to-10km (high-res) baseline config</comment>
<comment>chrysalis: BG-case production config. using 1-to-10km (high-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
Expand Down Expand Up @@ -2402,7 +2402,7 @@
</mach>
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+MALI.+SWAV.+" pesize="M">
<comment>GIS 1-to-10km (high-res) baseline config</comment>
<comment>chrysalis: BG-case production config. using 1-to-10km (high-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<ntasks>
Expand Down Expand Up @@ -2441,7 +2441,7 @@
<grid name="a%ne30np4.pg2_l%.+_g%mpas.gis4to40">
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+MALI.+SWAV.+" pesize="M">
<comment>pm-cpu: GIS 4-to-40km (med-res) baseline config</comment>
<comment>pm-cpu: BG-case testing config. using 4-to-40km (med-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
Expand Down Expand Up @@ -2478,7 +2478,7 @@
</mach>
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+MALI.+SWAV.+" pesize="M">
<comment>chrys: GIS 4-to-40km (med-res) baseline config</comment>
<comment>chrysalis: BG-case testing config. using 4-to-40km (med-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<ntasks>
Expand Down Expand Up @@ -2518,8 +2518,8 @@
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+MALI.+SWAV.+" 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>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>512</ntasks_atm>
<ntasks_lnd>512</ntasks_lnd>
Expand All @@ -2536,6 +2536,8 @@
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+MALI.+SWAV.+" pesize="any">
<comment>pm-cpu: GIS 20 or 40km (low-res) testing config, 2 nodes, 128x1</comment>
<ntasks>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks_atm>256</ntasks_atm>
<ntasks_lnd>256</ntasks_lnd>
<ntasks_rof>256</ntasks_rof>
Expand Down
2 changes: 2 additions & 0 deletions cime_config/config_archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
<comp_archive_spec compname="mali" compclass="glc">
<rest_file_extension>rst</rest_file_extension>
<hist_file_extension>hist</hist_file_extension>
<hist_file_ext_regex>\w+</hist_file_ext_regex>
<hist_file_ext_regex>\w+\.\w+</hist_file_ext_regex>
Comment on lines +127 to +128
Copy link
Contributor

@matthewhoffman matthewhoffman Nov 26, 2025

Choose a reason for hiding this comment

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

I'm not an expert in regex or familiar with how this file works, but I wonder if there is a more specific search we can employ or if both versions are necessary. Maybe not. @jonbob , do you have experience with this?

Copy link
Contributor Author

@stephenprice stephenprice Dec 2, 2025

Choose a reason for hiding this comment

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

What I was told a while back was that this should work but that there is some CIME bug preventing it from fully working. For the moment, it at least works to generate hist file baselines for MALI, which can then be later compared against newly generated baselines. It still does not work for including MALI hist files in a restart comparison unfortunately.

Copy link
Contributor

@jonbob jonbob Dec 2, 2025

Choose a reason for hiding this comment

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

@stephenprice -- it doesn't include MALI hist files in an ERS test? Or not MALI restart files?

Copy link
Contributor Author

@stephenprice stephenprice Dec 3, 2025

Choose a reason for hiding this comment

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

There are a few diff. issues here. First, those lines of code are supposed to allow both mali .hist and .am files to be compared against a set of baseline files. As discussed here though (in section titled "Notes from Jason Boutte..."). In my experimenting however, this does not work and only the .am files get compared. This is why I've set the user_nl_mali to exclude .am files from outputs for these tests. But I figure it does not hurt to include that functionality for if / when this problem gets attention and gets fixed (currently, we would at least be comparing newly generated mali .hist files to baselines during SMS testing).

It's possible that this is by design, but from what I can tell, in my ERS tests nothing gets compared aside from coupler history files. It would be nice if mpas component hist files were also compared. I think this is considered not necessary because the mpas components generate and pass fields that populate the cpl hist files. But right now, we pass very little to the cpl, and for short runs, most of those fields are going to contain all zeroes, which does not feel like a very rigorous restart test (for mali at least). It's unclear to me why hist files from other components, including mpas components, are not included in the comparison for ERS tests. Should they be?

<rest_history_varname>unset</rest_history_varname>
<rpointer>
<rpointer_file>rpointer.glc$NINST_STRING</rpointer_file>
Expand Down
1 change: 0 additions & 1 deletion cime_config/testmods_dirs/allactive/gis20km/user_nl_mali
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...ods_dirs/allactive/gis20km/shell_commands → ...s_dirs/allactive/landiceBG/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
./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
Expand Down
2 changes: 2 additions & 0 deletions cime_config/testmods_dirs/allactive/landiceBG/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config_am_globalstats_enable = .false.
config_am_regionalstats_enable = .false.
44 changes: 40 additions & 4 deletions cime_config/testmods_dirs/config_pes_tests.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,46 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%IcoswISC30E3r5_r%r05_g%mpas.gis20km_w%null_z%null_m%IcoswISC30E3r5">
<mach name="chrysalis|pm-cpu|muller-cpu|alvarez-cpu">
<grid name="a%ne30np4.pg2_l%r05_oi%IcoswISC30E3r5_r%r05_g%mpas.gis4to40km_w%null_z%null_m%IcoswISC30E3r5">
<mach name="chrysalis">
<pes compset="1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV" pesize="any">
<comment>chrysalis: BG-case testing config. using 4-to-40km (low-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>512</ntasks_atm>
<ntasks_lnd>512</ntasks_lnd>
<ntasks_rof>512</ntasks_rof>
<ntasks_ice>512</ntasks_ice>
<ntasks_ocn>512</ntasks_ocn>
<ntasks_glc>512</ntasks_glc>
<ntasks_wav>512</ntasks_wav>
<ntasks_cpl>512</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>
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
<pes compset="1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV" pesize="any">
<comment>GIS 20km (low-res) testing config</comment>
<comment>pm-cpu: BG-case testing config. using 4-to-40km (low-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
Expand All @@ -366,7 +402,7 @@
<ntasks_rof>512</ntasks_rof>
<ntasks_ice>512</ntasks_ice>
<ntasks_ocn>512</ntasks_ocn>
<ntasks_glc>256</ntasks_glc>
<ntasks_glc>512</ntasks_glc>
<ntasks_wav>512</ntasks_wav>
<ntasks_cpl>512</ntasks_cpl>
</ntasks>
Expand Down
10 changes: 5 additions & 5 deletions cime_config/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@

"e3sm_landice_developer" : {
"tests" : (
"SMS.ne30pg2_r05_IcoswISC30E3r5_gis20.IGELM_MLI.mali-gis20km",
"ERS.ne30pg2_r05_IcoswISC30E3r5_gis20.IGELM_MLI.mali-gis20km",
"SMS.ne30pg2_r05_IcoswISC30E3r5_gis20.BGWCYCL1850.allactive-gis20km",
"SMS.ne30pg2_r05_IcoswISC30E3r5_gis4to40.BGWCYCL1850.allactive-gis20km",
"SMS.ne30_oECv3_gis.IGELM_MLI.elm-extrasnowlayers",
"SMS.ne30pg2_r05_IcoswISC30E3r5_gis4to40.IGELM_MLI.mali-landiceIG",
"ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5_gis4to40.IGELM_MLI.mali-landiceIG",
"SMS.ne30pg2_r05_IcoswISC30E3r5_gis4to40.BGWCYCL1850.allactive-landiceBG",
"ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5_gis4to40.BGWCYCL1850.allactive-landiceBG",
"SMS.ne30pg2_r05_IcoswISC30E3r5_gis4to40.IGELM_MLI.elm-extrasnowlayers",
"ERS_Ld5.TL319_oQU240wLI_gis4to40.MPAS_FOLISIO_JRA1p5.mpaso-jra_1958",
"ERS_Ld5.TL319_oQU240wLI_ais8to30.MPAS_FOLISIO_JRA1p5.mpaso-jra_1958",
)
Expand Down
106 changes: 91 additions & 15 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 @@ -460,7 +460,83 @@
<grid name="a%ne30np4.pg2_l%r05_oi%null_r%r05_g%mpas.gis20km_w%null_z%null_m%EC30to60E2r2">
<mach name="chrysalis|pm-cpu|muller-cpu|alvarez-cpu">
<pes compset="any" pesize="any">
<comment>GIS 20km (low-res) testing config</comment>
<comment>pm-cpu: IG-case testing config. using 1-to-10km (high-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>256</ntasks_atm>
<ntasks_lnd>256</ntasks_lnd>
<ntasks_rof>256</ntasks_rof>
<ntasks_ice>256</ntasks_ice>
<ntasks_ocn>256</ntasks_ocn>
<ntasks_glc>256</ntasks_glc>
<ntasks_wav>256</ntasks_wav>
<ntasks_cpl>256</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_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
<mach name="chrysalis">
<pes compset="any" pesize="any">
<comment>chrysalis: IG-case testing config. using 1-to-10km (high-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>256</ntasks_atm>
<ntasks_lnd>256</ntasks_lnd>
<ntasks_rof>256</ntasks_rof>
<ntasks_ice>256</ntasks_ice>
<ntasks_ocn>256</ntasks_ocn>
<ntasks_glc>256</ntasks_glc>
<ntasks_wav>256</ntasks_wav>
<ntasks_cpl>256</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_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%null_r%r05_g%mpas.gis4to40km_w%null_z%null_m%IcoswISC30E3r5">
<mach name="pm-cpu|muller-cpu|alvarez-cpu">
<pes compset="any" pesize="any">
<comment>pm-cpu: IG-case testing config. using 4-to-40km (med-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
Expand Down Expand Up @@ -490,26 +566,25 @@
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%null_r%r05_g%mpas.gis1to10kmR2_w%null_z%null_m%EC30to60E2r2">
<mach name="chrysalis|pm-cpu|muller-cpu|alvarez-cpu">
<mach name="chrysalis">
<pes compset="any" pesize="any">
<comment>GIS 1-to-10km (high-res) config</comment>
<MAX_MPITASKS_PER_NODE>128</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<comment>chrys: IG-case testing config. using 4-to-40km (med-res) GIS init. cond.</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>512</ntasks_atm>
<ntasks_lnd>512</ntasks_lnd>
<ntasks_rof>512</ntasks_rof>
<ntasks_ice>512</ntasks_ice>
<ntasks_ocn>512</ntasks_ocn>
<ntasks_glc>512</ntasks_glc>
<ntasks_wav>512</ntasks_wav>
<ntasks_cpl>512</ntasks_cpl>
<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>
<ntasks_wav>128</ntasks_wav>
<ntasks_cpl>128</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand All @@ -528,6 +603,7 @@
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
Expand Down
4 changes: 2 additions & 2 deletions components/mpas-albany-landice/bld/namelist_files/namelist_defaults_mali.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<config_time_integration>'forward_euler'</config_time_integration>
<config_rk_order>2</config_rk_order>
<config_rk3_stages>3</config_rk3_stages>
<config_adaptive_timestep>.false.</config_adaptive_timestep>
<config_adaptive_timestep>.true.</config_adaptive_timestep>
<config_min_adaptive_timestep>3600.0</config_min_adaptive_timestep>
<config_max_adaptive_timestep>3.15e9</config_max_adaptive_timestep>
<config_adaptive_timestep_CFL_fraction>0.25</config_adaptive_timestep_CFL_fraction>
Expand All @@ -143,7 +143,7 @@
<config_adaptive_timestep_include_DCFL>.false.</config_adaptive_timestep_include_DCFL>
<config_adaptive_timestep_include_calving>.true.</config_adaptive_timestep_include_calving>
<config_adaptive_timestep_include_face_melting>.true.</config_adaptive_timestep_include_face_melting>
<config_adaptive_timestep_force_interval>'1000-00-00_00:00:00'</config_adaptive_timestep_force_interval>
<config_adaptive_timestep_force_interval>'0000-00-01_00:00:00'</config_adaptive_timestep_force_interval>

<!-- time_management -->
<config_do_restart>.false.</config_do_restart>
Expand Down
3 changes: 0 additions & 3 deletions components/mpas-albany-landice/cime_config/testdefs/testmods_dirs/mali/gis20km/user_nl_mali
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...testmods_dirs/mali/gis20km/shell_commands → ...stmods_dirs/mali/landiceIG/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
./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
Expand Down
2 changes: 2 additions & 0 deletions ...onents/mpas-albany-landice/cime_config/testdefs/testmods_dirs/mali/landiceIG/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config_am_globalstats_enable = .false.
config_am_regionalstats_enable = .false.
Loading