Skip to content

Commit

Permalink
Merge pull request #1287 from ESMCI/agsalin/merge-from-acme-03292017
Browse files Browse the repository at this point in the history 
Merge changes from acme 03292017

Pull back ACME repo changes of CIME since last subtree split (late January?) up to March 29 back into CIME master.

Test suite: scripts_regression_tests on penn pass
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1271

User interface changes?:

Code review: PLEASE!
  • Loading branch information
@jgfouca
jgfouca authored Apr 4, 2017
2 parents dda631e + 9e10abe commit fbf1b0c
Show file tree
Hide file tree
Showing 34 changed files with 1,221 additions and 243 deletions.
1 change: 0 additions & 1 deletion config/acme/allactive/config_pes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0"?>

<config_pes version="2.0">

<config_pes>
Expand Down
243 changes: 230 additions & 13 deletions config/acme/allactive/config_pesall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@
</pes>
</mach>
</grid>

<grid name="a%ne30np4">
<mach name="melvin">
<pes compset="any" pesize="any">
Expand Down Expand Up @@ -4034,14 +4033,16 @@
</mach>
<mach name="anvil">
<pes compset="any" pesize="S">
<comment>40nodes-36ppn</comment>
<comment>ne30_ne30 grid on 45 nodes 32 ppn pure-MPI</comment>
<PES_PER_NODE>32</PES_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>1350</ntasks_atm>
<ntasks_lnd>72</ntasks_lnd>
<ntasks_rof>72</ntasks_rof>
<ntasks_ice>72</ntasks_ice>
<ntasks_ocn>72</ntasks_ocn>
<ntasks_cpl>72</ntasks_cpl>
<ntasks_lnd>64</ntasks_lnd>
<ntasks_rof>64</ntasks_rof>
<ntasks_ice>64</ntasks_ice>
<ntasks_ocn>64</ntasks_ocn>
<ntasks_cpl>64</ntasks_cpl>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</ntasks>
Expand All @@ -4057,11 +4058,11 @@
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>1350</rootpe_lnd>
<rootpe_rof>1350</rootpe_rof>
<rootpe_ice>1350</rootpe_ice>
<rootpe_ocn>1350</rootpe_ocn>
<rootpe_cpl>1350</rootpe_cpl>
<rootpe_lnd>1376</rootpe_lnd>
<rootpe_rof>1376</rootpe_rof>
<rootpe_ice>1376</rootpe_ice>
<rootpe_ocn>1376</rootpe_ocn>
<rootpe_cpl>1376</rootpe_cpl>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
Expand Down Expand Up @@ -4099,6 +4100,39 @@
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
<pes compset="any" pesize="L">
<comment>115 nodes x 6 MPI x 6 OMP</comment>
<ntasks>
<ntasks_atm>675</ntasks_atm>
<ntasks_lnd>12</ntasks_lnd>
<ntasks_rof>12</ntasks_rof>
<ntasks_ice>12</ntasks_ice>
<ntasks_ocn>12</ntasks_ocn>
<ntasks_cpl>12</ntasks_cpl>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</ntasks>
<nthrds>
<nthrds_atm>6</nthrds_atm>
<nthrds_lnd>6</nthrds_lnd>
<nthrds_rof>6</nthrds_rof>
<nthrds_ice>6</nthrds_ice>
<nthrds_ocn>6</nthrds_ocn>
<nthrds_cpl>6</nthrds_cpl>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>675</rootpe_lnd>
<rootpe_rof>675</rootpe_rof>
<rootpe_ice>675</rootpe_ice>
<rootpe_ocn>675</rootpe_ocn>
<rootpe_cpl>675</rootpe_cpl>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
</mach>
</grid>
<grid name="any">
Expand Down Expand Up @@ -5472,7 +5506,7 @@
</grid>
<grid name="any">
<mach name="edison">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="S">
<comment>none</comment>
<ntasks>
<ntasks_atm>960</ntasks_atm>
Expand Down Expand Up @@ -5507,6 +5541,80 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4">
<mach name="edison">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
<comment>"PMC - 173 node version gets 6 SYPD. This will be the default and M size"</comment>
<ntasks>
<ntasks_atm>2700</ntasks_atm>
<ntasks_lnd>312</ntasks_lnd>
<ntasks_rof>312</ntasks_rof>
<ntasks_ice>2400</ntasks_ice>
<ntasks_ocn>1440</ntasks_ocn>
<ntasks_glc>312</ntasks_glc>
<ntasks_wav>2400</ntasks_wav>
<ntasks_cpl>2400</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>2400</rootpe_lnd>
<rootpe_rof>2400</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>2712</rootpe_ocn>
<rootpe_glc>2400</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4">
<mach name="edison">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="L">
<comment>"PMC - 375 node version gets 10.7 SYPD"</comment>
<ntasks>
<ntasks_atm>5400</ntasks_atm>
<ntasks_lnd>600</ntasks_lnd>
<ntasks_rof>600</ntasks_rof>
<ntasks_ice>4800</ntasks_ice>
<ntasks_ocn>3600</ntasks_ocn>
<ntasks_glc>600</ntasks_glc>
<ntasks_wav>4800</ntasks_wav>
<ntasks_cpl>4800</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>4800</rootpe_lnd>
<rootpe_rof>4800</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>5400</rootpe_ocn>
<rootpe_glc>4800</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="any">
<mach name="cori-haswell">
<pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
Expand Down Expand Up @@ -5951,4 +6059,113 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%oEC60to30.*_r%r05_m%oEC60to30.*_g%null_w%null">
<mach name="anvil">
<pes compset=".*CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="S">
<comment> -compset A_WCYCL* -res ne30_oEC* on 32 nodes pure-MPI </comment>
<PES_PER_NODE>32</PES_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>675</ntasks_atm>
<ntasks_lnd>64</ntasks_lnd>
<ntasks_rof>64</ntasks_rof>
<ntasks_ice>640</ntasks_ice>
<ntasks_ocn>320</ntasks_ocn>
<ntasks_cpl>640</ntasks_cpl>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</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>640</rootpe_lnd>
<rootpe_rof>640</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>704</rootpe_ocn>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
<pes compset=".*CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
<comment> -compset A_WCYCL* -res ne30_oEC* on 59 nodes pure-MPI </comment>
<PES_PER_NODE>32</PES_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>1350</ntasks_atm>
<ntasks_lnd>352</ntasks_lnd>
<ntasks_rof>352</ntasks_rof>
<ntasks_ice>1024</ntasks_ice>
<ntasks_ocn>512</ntasks_ocn>
<ntasks_cpl>1024</ntasks_cpl>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</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>1024</rootpe_lnd>
<rootpe_rof>1024</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>1376</rootpe_ocn>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
<pes compset=".*CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="L">
<comment> -compset A_WCYCL* -res ne30_oEC* on 115 nodes pure-MPI </comment>
<PES_PER_NODE>32</PES_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>2700</ntasks_atm>
<ntasks_lnd>320</ntasks_lnd>
<ntasks_rof>320</ntasks_rof>
<ntasks_ice>1536</ntasks_ice>
<ntasks_ocn>960</ntasks_ocn>
<ntasks_cpl>2400</ntasks_cpl>
<ntasks_glc>1</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
</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>2400</rootpe_lnd>
<rootpe_rof>2400</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>2720</rootpe_ocn>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
</rootpe>
</pes>
</mach>
</grid>
</config_pes>
30 changes: 16 additions & 14 deletions config/acme/config_archive.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<components>
<components version="2.0">

<comp_archive_spec compname="cam" compclass="atm">
<rest_file_extension>\.[ri]\..*</rest_file_extension>
Expand Down Expand Up @@ -168,19 +168,6 @@
</rpointer>
</comp_archive_spec>

<comp_archive_spec compname="dart" compclass="esp">
<rest_file_extension>inflate_restart.*</rest_file_extension>
<hist_file_extension>True_State.*</hist_file_extension>
<hist_file_extension>Prior_Diag.*</hist_file_extension>
<hist_file_extension>Posterior_Diag.*</hist_file_extension>
<hist_file_extension>obs_seq.*</hist_file_extension>
<rest_history_varname>unset</rest_history_varname>
<rpointer>
<rpointer_file>rpointer.unset</rpointer_file>
<rpointer_content >unset</rpointer_content>
</rpointer>
</comp_archive_spec>

<comp_archive_spec compname="cpl" compclass="cpl">
<rest_file_extension>\.r\..*</rest_file_extension>
<hist_file_extension>\.h.*.nc$</hist_file_extension>
Expand All @@ -191,5 +178,20 @@
</rpointer>
</comp_archive_spec>

<comp_archive_spec compclass="esp" compname="dart">
<rest_file_extension>inflate_restart.*</rest_file_extension>
<hist_file_extension>\.True_State.*</hist_file_extension>
<hist_file_extension>\.Prior_Diag.*</hist_file_extension>
<hist_file_extension>\.Posterior_Diag.*</hist_file_extension>
<hist_file_extension>\..+\.posterior*</hist_file_extension>
<hist_file_extension>\..+\.prior*</hist_file_extension>
<hist_file_extension>\..+$_obs_seq.*</hist_file_extension>
<rest_history_varname>unset</rest_history_varname>
<rpointer>
<rpointer_file>rpointer.unset</rpointer_file>
<rpointer_content>unset</rpointer_content>
</rpointer>
</comp_archive_spec>

</components>

Loading

0 comments on commit fbf1b0c

Please sign in to comment.