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 support for low-resolution Greenland tests #6445

Merged
merged 9 commits into from
Jul 10, 2024
Merged

Update support for low-resolution Greenland tests #6445

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6108997
Upate Greenland 20 km SMS and ERS tests.
stephenprice May 10, 2024
e3f20af
Add default layout for BG case w/ GIS 20km
stephenprice May 10, 2024
bdaf63e
Update GIS 20km IG tests & add BG test
stephenprice May 24, 2024
6cc88e6
Merge branch 'E3SM-Project:master' into stephenprice/glc/update-gis20…
stephenprice May 24, 2024
08e9fa1
Merge branch 'master' into stephenprice/glc/update-gis20km-tests
stephenprice Jul 1, 2024
73a2e4d
Merge branch 'E3SM-Project:master' into stephenprice/glc/update-gis20…
stephenprice Jul 1, 2024
f9feb58
Add default layout for low-res BG config with GIS 20km
stephenprice Jul 1, 2024
c87ca0b
Remove redundant files from elm test dirs (now in mali test dirs).
stephenprice Jul 2, 2024
23c37c5
Add stub glc (.+SGLC) descriptor to two new PE layouts
stephenprice Jul 9, 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
56 changes: 47 additions & 9 deletions cime_config/allactive/config_pesall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%IcoswISC30E3r5_r%r05_.+">
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="T">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="T">
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes pure-MPI, ~1.5 sypd </comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
Expand All @@ -1232,7 +1232,7 @@
<ntasks_lnd>-4</ntasks_lnd>
</ntasks>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="S">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 20 nodes pure-MPI, ~7.25 sypd </comment>
<ntasks>
<ntasks_atm>1024</ntasks_atm>
Expand All @@ -1251,7 +1251,7 @@
<rootpe_lnd>640</rootpe_lnd>
</rootpe>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="M">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 54 nodes pure-MPI, ~17.5 sypd </comment>
<ntasks>
<ntasks_atm>2752</ntasks_atm>
Expand All @@ -1270,7 +1270,7 @@
<rootpe_lnd>2048</rootpe_lnd>
</rootpe>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="L">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
<comment> --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 105 nodes pure-MPI, ~27.7 sypd </comment>
<ntasks>
<ntasks_atm>5440</ntasks_atm>
Expand All @@ -1291,7 +1291,7 @@
</pes>
</mach>
<mach name="gcp12">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
<comment> gcp12 --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes </comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
Expand All @@ -1304,7 +1304,7 @@
</pes>
</mach>
<mach name="pm-cpu|muller-cpu">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="any">
<comment> pm-cpu --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes</comment>
<ntasks>
<ntasks_atm>-4</ntasks_atm>
Expand All @@ -1319,7 +1319,7 @@
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%IcosXISC30E3r7_r%r05_.+">
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="S">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 20 nodes pure-MPI, ~7.25 sypd </comment>
<ntasks>
<ntasks_atm>1024</ntasks_atm>
Expand All @@ -1338,7 +1338,7 @@
<rootpe_lnd>640</rootpe_lnd>
</rootpe>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="M">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 54 nodes pure-MPI, ~17.5 sypd </comment>
<ntasks>
<ntasks_atm>2752</ntasks_atm>
Expand All @@ -1357,7 +1357,7 @@
<rootpe_lnd>2048</rootpe_lnd>
</rootpe>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="L">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 105 nodes pure-MPI, ~27.7 sypd </comment>
<ntasks>
<ntasks_atm>5440</ntasks_atm>
Expand Down Expand Up @@ -2346,4 +2346,42 @@
</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|alvarez">
<pes compset="1850_EAM%CMIP6_ELM%SPBC_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>
<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>256</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>
</grid>
</config_pes>
2 changes: 1 addition & 1 deletion cime_config/config_archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
</test_file_names>
</comp_archive_spec>

<comp_archive_spec compname="mali" compclass="glc" exclude_testing="true">
<comp_archive_spec compname="mali" compclass="glc">
<rest_file_extension>rst</rest_file_extension>
<hist_file_extension>hist</hist_file_extension>
<rest_history_varname>unset</rest_history_varname>
Expand Down
1 change: 1 addition & 0 deletions cime_config/config_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@
<value component="mpaso" >$COMP_ROOT_DIR_OCN/cime_config/testdefs/testmods_dirs</value>
<value component="mpassi" >$COMP_ROOT_DIR_ICE/cime_config/testdefs/testmods_dirs</value>
<value component="ww3" >$COMP_ROOT_DIR_WAV/cime_config/testdefs/testmods_dirs</value>
<value component="mali" >$COMP_ROOT_DIR_GLC/cime_config/testdefs/testmods_dirs</value>
</values>
<group>case_last</group>
<file>env_case.xml</file>
Expand Down
0 ...stmods_dirs/elm/gis20kmERS/shell_commands → ...ods_dirs/allactive/gis20km/shell_commands
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions cime_config/testmods_dirs/allactive/gis20km/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config_am_globalstats_enable = .false.
Copy link
Contributor

Choose a reason for hiding this comment

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

@stephenprice , was this necessary to get the tests to run? It seems like it would be nice to have globalStats enabled in the tests unless there is problem doing so.

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 agree. This is a short-term workaround to get the mali hist files recognized by the testing framework. If the .am files are included in the outputs, the testing framework does the comparison on those rather than the full hist. files. This is some quirk with the current testing infrastructure, which seems to have very limited support for including / accounting for MPAS component outputs. I've been communicating with @jasonb5 about this and this was one of the suggested workarounds to allow MALI hist files to be included in the SMS comparison tests, for now.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, thanks, that's fine then. For these short tests, if the full output files are being compared, it's not that important that the globalStats files exist.

5 changes: 3 additions & 2 deletions cime_config/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@

"e3sm_landice_developer" : {
"tests" : (
"SMS.ne30pg2_r05_EC30to60E2r2_gis20.IGELM_MLI.elm-gis20kmSMS",
"ERS.ne30pg2_r05_EC30to60E2r2_gis20.IGELM_MLI.elm-gis20kmERS",
"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",
)
},

Expand Down
5 changes: 2 additions & 3 deletions ...stmods_dirs/elm/gis20kmSMS/shell_commands → .../testmods_dirs/elm/gis20km/shell_commands
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you mean to delete this file, as well as the user_nl_mali file in the same directory? The PR description indicates these tests were moved from the ELM dir to the MALI dir, so are these copies in the ELM dir needed at all anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. Yes, I think that is what I intended to do here. Let me look at that and re-test to confirm that everything still works when I make that change. Assuming it does, I'll push that correction. Thanks.

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 removed this, re-tested, and the 20km SMS tests still work correctly, so I will push this update in a minute. Thanks again for catching that.

Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
./xmlchange STOP_OPTION=ndays
./xmlchange STOP_N=2
./xmlchange STOP_N=1
./xmlchange REST_OPTION=ndays
./xmlchange REST_N=2
./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

1 change: 1 addition & 0 deletions components/elm/cime_config/testdefs/testmods_dirs/elm/gis20km/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config_am_globalstats_enable = .false.
10 changes: 10 additions & 0 deletions ...onents/mpas-albany-landice/cime_config/testdefs/testmods_dirs/mali/gis20km/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
1 change: 1 addition & 0 deletions components/mpas-albany-landice/cime_config/testdefs/testmods_dirs/mali/gis20km/user_nl_mali
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
config_am_globalstats_enable = .false.