Skip to content

Add decomp_init testlist and some extra PE layouts for some grids #3315

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
merged 8 commits into from
Jul 9, 2025
Merged

Add decomp_init testlist and some extra PE layouts for some grids #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
64ec968
Add XS, S, M, L, and XL pe layouts for ne120
ekluzek Jul 8, 2025
83a627c
Make new derecho ne120 layouts concurrent with DATM on one node
ekluzek Jul 9, 2025
dd4a93e
Add pelayouts of various sizes for mpasa15
ekluzek Jul 9, 2025
b3d9bf1
Add tests for the new testlist decomp_init
ekluzek Jul 9, 2025
f4d5295
Make ROF same frequency as ATM which is needed for higher resolutions…
ekluzek Jul 9, 2025
ed4f426
Add failing test to expected fails
ekluzek Jul 9, 2025
e93ebff
Turn off a bunch of things to make it run faster
ekluzek Jul 9, 2025
e303ea2
Add some additional timers around decomp level activity
ekluzek Jun 26, 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
311 changes: 309 additions & 2 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@
<grid name="l%ne120">
<mach name="any">
<pes pesize="any" compset="any">
<comment>none</comment>
<comment>default ne120 layout for any machine</comment>
<ntasks>
<ntasks_atm>-16</ntasks_atm>
<ntasks_lnd>-16</ntasks_lnd>
Expand Down Expand Up @@ -1148,6 +1148,196 @@
</rootpe>
</pes>
</mach>
</grid>
<!-- eXtra-Large pesize for derecho ~125 pts/task -->
<grid name="l%ne120">
<mach name="derecho">
<pes pesize="XL" compset="any">
<comment>eXtra-Large Derecho ne120 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-44</ntasks_lnd>
<ntasks_rof>-44</ntasks_rof>
<ntasks_ice>-44</ntasks_ice>
<ntasks_ocn>-44</ntasks_ocn>
<ntasks_glc>-44</ntasks_glc>
<ntasks_wav>-44</ntasks_wav>
<ntasks_cpl>-44</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- Large pesize for derecho ~250 pts/task -->
<grid name="l%ne120">
<mach name="derecho">
<pes pesize="L" compset="any">
<comment>Large Derecho ne120 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-22</ntasks_lnd>
<ntasks_rof>-22</ntasks_rof>
<ntasks_ice>-22</ntasks_ice>
<ntasks_ocn>-22</ntasks_ocn>
<ntasks_glc>-22</ntasks_glc>
<ntasks_wav>-22</ntasks_wav>
<ntasks_cpl>-22</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- Medium pesize for derecho ~500 pts/task -->
<grid name="l%ne120">
<mach name="derecho">
<pes pesize="M" compset="any">
<comment>Medium Derecho ne120 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-11</ntasks_lnd>
<ntasks_rof>-11</ntasks_rof>
<ntasks_ice>-11</ntasks_ice>
<ntasks_ocn>-11</ntasks_ocn>
<ntasks_glc>-11</ntasks_glc>
<ntasks_wav>-11</ntasks_wav>
<ntasks_cpl>-11</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- Small pesize for derecho ~1000 pts/task -->
<grid name="l%ne120">
<mach name="derecho">
<pes pesize="S" compset="any">
<comment>Small Derecho ne120 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-6</ntasks_lnd>
<ntasks_rof>-6</ntasks_rof>
<ntasks_ice>-6</ntasks_ice>
<ntasks_ocn>-6</ntasks_ocn>
<ntasks_glc>-6</ntasks_glc>
<ntasks_wav>-6</ntasks_wav>
<ntasks_cpl>-6</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- eXtra-Small pesize for derecho ~2000 pts/task -->
<grid name="l%ne120">
<mach name="derecho">
<pes pesize="XS" compset="any">
<comment>eXtra-Small Derecho ne120 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-3</ntasks_lnd>
<ntasks_rof>-3</ntasks_rof>
<ntasks_ice>-3</ntasks_ice>
<ntasks_ocn>-3</ntasks_ocn>
<ntasks_glc>-3</ntasks_glc>
<ntasks_wav>-3</ntasks_wav>
<ntasks_cpl>-3</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%ne240">
<mach name="any">
Expand Down Expand Up @@ -1751,7 +1941,7 @@
<grid name="l%mpasa15">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<comment>Derecho mpasa15 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-36</ntasks_lnd>
Expand Down Expand Up @@ -1786,6 +1976,123 @@
</pes>
</mach>
</grid>
<!-- Large pesize for derecho ~250 pts/task -->
<grid name="l%mpasa15">
<mach name="derecho">
<pes pesize="L" compset="any">
<comment>Large Derecho mpasa15 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-72</ntasks_lnd>
<ntasks_rof>-72</ntasks_rof>
<ntasks_ice>-72</ntasks_ice>
<ntasks_ocn>-72</ntasks_ocn>
<ntasks_glc>-72</ntasks_glc>
<ntasks_wav>-72</ntasks_wav>
<ntasks_cpl>-72</ntasks_cpl>
<ntasks_lnd>-72</ntasks_lnd>
</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- Small pesize for derecho ~1000 pts/task -->
<grid name="l%mpasa15">
<mach name="derecho">
<pes pesize="S" compset="any">
<comment>Small Derecho mpasa15 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-18</ntasks_lnd>
<ntasks_rof>-18</ntasks_rof>
<ntasks_ice>-18</ntasks_ice>
<ntasks_ocn>-18</ntasks_ocn>
<ntasks_glc>-18</ntasks_glc>
<ntasks_wav>-18</ntasks_wav>
<ntasks_cpl>-18</ntasks_cpl>
<ntasks_lnd>-18</ntasks_lnd>
</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<!-- eXtra-Small pesize for derecho ~2000 pts/task -->
<grid name="l%mpasa15">
<mach name="derecho">
<pes pesize="XS" compset="any">
<comment>eXtra-Small Derecho mpasa15 layout</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-9</ntasks_lnd>
<ntasks_rof>-9</ntasks_rof>
<ntasks_ice>-9</ntasks_ice>
<ntasks_ocn>-9</ntasks_ocn>
<ntasks_glc>-9</ntasks_glc>
<ntasks_wav>-9</ntasks_wav>
<ntasks_cpl>-9</ntasks_cpl>
<ntasks_lnd>-9</ntasks_lnd>
</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>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%0.125nldas2">
<mach name="any">
<pes pesize="any" compset="any">
Expand Down
9 changes: 9 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,13 @@
</phase>
</test>

<!-- decomp_init test list-->

<test name="SMS_Ln1_PL.mpasa15_mpasa15.I2000Clm45Sp.derecho_intel.clm-run_self_tests">
<phase name="RUN">
<status>FAIL</status>
<issue>#3316</issue>
</phase>
</test>

</expectedFails>
Loading