Skip to content

Commit

Permalink
Merge branch 'master' into jgfouca/cime/update_to_cime_5.3.0.29
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfdeakin-sandia
mfdeakin-sandia committed Aug 15, 2017
2 parents 1f5b0c9 + 2f5c100 commit cb01538
Show file tree
Hide file tree
Showing 97 changed files with 8,267 additions and 7,373 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
path = components/clm/src/external_models/mpp
url = [email protected]:ACME-Climate/mpp.git
branch = alm/develop
[submodule "sbetr"]
path = components/clm/src/external_models/sbetr
url = [email protected]:ACME-Climate/sbetr.git
295 changes: 158 additions & 137 deletions cime/config/acme/allactive/config_pesall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2702,7 +2702,7 @@
<grid name="any">
<mach name="mira">
<pes compset="any" pesize="any">
<comment>none</comment>
<comment>default and minimal 512-node partition</comment>
<ntasks>
<ntasks_atm>2048</ntasks_atm>
<ntasks_lnd>2048</ntasks_lnd>
Expand Down Expand Up @@ -2735,11 +2735,9 @@
</rootpe>
</pes>
</mach>
</grid>
<grid name="any">
<mach name="cetus">
<pes compset="any" pesize="any">
<comment>none</comment>
<comment>default 64x16 PEs for acme_developer tests</comment>
<ntasks>
<ntasks_atm>64</ntasks_atm>
<ntasks_lnd>64</ntasks_lnd>
Expand Down Expand Up @@ -2772,6 +2770,74 @@
</rootpe>
</pes>
</mach>
<mach name="mira|cetus">
<pes compset=".+SATM.+SLND.+SICE.+SOCN.+SROF.+MPASLIALB.+SWAV" pesize="any">
<comment>-compset MPASLIALB</comment>
<ntasks>
<ntasks_atm>1</ntasks_atm>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_rof>1</ntasks_rof>
<ntasks_ice>1</ntasks_ice>
<ntasks_ocn>1</ntasks_ocn>
<ntasks_glc>64</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_cpl>64</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>16</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>16</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>
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1024</ntasks_atm>
<ntasks_lnd>1024</ntasks_lnd>
<ntasks_rof>1024</ntasks_rof>
<ntasks_ice>1024</ntasks_ice>
<ntasks_ocn>1024</ntasks_ocn>
<ntasks_glc>1024</ntasks_glc>
<ntasks_wav>1024</ntasks_wav>
<ntasks_cpl>1024</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%4x5">
<mach name="cetus|mira">
Expand Down Expand Up @@ -3807,10 +3873,6 @@
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
<mach name="cetus|mira">
<pes compset="DATM.+CLM" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -4180,41 +4242,6 @@
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%ne30np4">
<mach name="mira">
<pes compset="any" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>2048</ntasks_atm>
<ntasks_lnd>2048</ntasks_lnd>
<ntasks_rof>2048</ntasks_rof>
<ntasks_ice>2048</ntasks_ice>
<ntasks_ocn>2048</ntasks_ocn>
<ntasks_glc>2048</ntasks_glc>
<ntasks_wav>2048</ntasks_wav>
<ntasks_cpl>2048</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>16</nthrds_atm>
<nthrds_lnd>16</nthrds_lnd>
<nthrds_rof>16</nthrds_rof>
<nthrds_ice>16</nthrds_ice>
<nthrds_ocn>16</nthrds_ocn>
<nthrds_glc>16</nthrds_glc>
<nthrds_wav>16</nthrds_wav>
<nthrds_cpl>16</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="anvil">
<pes compset="any" pesize="S">
<comment>ne30_ne30 grid on 45 nodes 32 ppn pure-MPI</comment>
Expand Down Expand Up @@ -4391,10 +4418,6 @@
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
<mach name="cetus|mira">
<pes compset="A" pesize="any">
<comment>none</comment>
<ntasks>
Expand Down Expand Up @@ -5949,43 +5972,6 @@
</pes>
</mach>
</grid>
<grid name="any">
<mach name="mira|cetus">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1024</ntasks_atm>
<ntasks_lnd>1024</ntasks_lnd>
<ntasks_rof>1024</ntasks_rof>
<ntasks_ice>1024</ntasks_ice>
<ntasks_ocn>1024</ntasks_ocn>
<ntasks_glc>1024</ntasks_glc>
<ntasks_wav>1024</ntasks_wav>
<ntasks_cpl>1024</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="any">
<mach name="blues">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
Expand Down Expand Up @@ -6171,39 +6157,111 @@
</pes>
</mach>
</grid>
<grid name="a%ne120np4_l%ne120np4_oi%ne120np4_r%r05_m%gx1v6_g%null_w%null">
<mach name="mira|cetus">
<pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" pesize="any">
<comment>none</comment>
<grid name="a%ne120np4_l%ne120np4_oi%ne120np4_r%r05.*">
<mach name="mira">
<pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV.*" pesize="S">
<comment>ne120 F-compset on 512 nodes</comment>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<PES_PER_NODE>8</PES_PER_NODE>
<ntasks>
<ntasks_atm>3600</ntasks_atm>
<ntasks_cpl>2048</ntasks_cpl>
<ntasks_lnd>2048</ntasks_lnd>
<ntasks_rof>2048</ntasks_rof>
<ntasks_ice>2048</ntasks_ice>
<ntasks_ocn>2048</ntasks_ocn>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</ntasks>
<nthrds>
<nthrds_atm>8</nthrds_atm>
<nthrds_cpl>8</nthrds_cpl>
<nthrds_lnd>8</nthrds_lnd>
<nthrds_rof>8</nthrds_rof>
<nthrds_ice>8</nthrds_ice>
<nthrds_ocn>8</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_lnd>2048</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>
</pes>
<pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV.*" pesize="M">
<comment>ne120 F-compset on 1024 nodes</comment>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<PES_PER_NODE>8</PES_PER_NODE>
<ntasks>
<ntasks_atm>7200</ntasks_atm>
<ntasks_lnd>992</ntasks_lnd>
<ntasks_cpl>7200</ntasks_cpl>
<ntasks_lnd>7200</ntasks_lnd>
<ntasks_rof>992</ntasks_rof>
<ntasks_ice>992</ntasks_ice>
<ntasks_ocn>992</ntasks_ocn>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_cpl>992</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>16</nthrds_atm>
<nthrds_lnd>16</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_atm>6</nthrds_atm>
<nthrds_cpl>6</nthrds_cpl>
<nthrds_lnd>6</nthrds_lnd>
<nthrds_rof>6</nthrds_rof>
<nthrds_ice>6</nthrds_ice>
<nthrds_ocn>6</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>7200</rootpe_lnd>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>7200</rootpe_rof>
<rootpe_ice>7200</rootpe_ice>
<rootpe_ocn>7200</rootpe_ocn>
<rootpe_glc>7200</rootpe_glc>
<rootpe_wav>7200</rootpe_wav>
<rootpe_cpl>7200</rootpe_cpl>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
<pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV.*" pesize="L">
<comment>ne120 F-compset on 2048 nodes</comment>
<MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
<PES_PER_NODE>8</PES_PER_NODE>
<ntasks>
<ntasks_atm>14400</ntasks_atm>
<ntasks_cpl>14400</ntasks_cpl>
<ntasks_lnd>14400</ntasks_lnd>
<ntasks_rof>1984</ntasks_rof>
<ntasks_ice>1984</ntasks_ice>
<ntasks_ocn>1984</ntasks_ocn>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</ntasks>
<nthrds>
<nthrds_atm>8</nthrds_atm>
<nthrds_cpl>8</nthrds_cpl>
<nthrds_lnd>8</nthrds_lnd>
<nthrds_rof>8</nthrds_rof>
<nthrds_ice>8</nthrds_ice>
<nthrds_ocn>8</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>14400</rootpe_rof>
<rootpe_ice>14400</rootpe_ice>
<rootpe_ocn>14400</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
</mach>
Expand Down Expand Up @@ -6245,43 +6303,6 @@
</pes>
</mach>
</grid>
<grid name="any">
<mach name="mira|cetus">
<pes compset=".+SATM.+SLND.+SICE.+SOCN.+SROF.+MPASLIALB.+SWAV" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>1</ntasks_atm>
<ntasks_lnd>1</ntasks_lnd>
<ntasks_rof>1</ntasks_rof>
<ntasks_ice>1</ntasks_ice>
<ntasks_ocn>1</ntasks_ocn>
<ntasks_glc>64</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_cpl>64</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>16</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>16</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%T62_l%T62_oi%oQU120_r%rx1.+">
<mach name="cetus">
<pes compset=".*MPAS.*" pesize="any">
Expand Down
Loading

0 comments on commit cb01538

Please sign in to comment.