Skip to content

Commit

Permalink
Merge pull request #1891 from jedwards4b/rename_pes_per_node
Browse files Browse the repository at this point in the history
rename PES_PER_NODE to MAX_MPITASKS_PER_NODE

Some people found the name PES_PER_NODE less than fully descriptive
Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #1885

User interface changes?:

Update gh-pages html (Y/N)?: Y

Code review:
  • Loading branch information
jgfouca authored Sep 14, 2017
2 parents eb59169 + 8b80dd7 commit 5ba192b
Show file tree
Hide file tree
Showing 24 changed files with 147 additions and 147 deletions.
8 changes: 4 additions & 4 deletions config/acme/allactive/config_pesall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4181,7 +4181,7 @@
<mach name="anvil">
<pes compset="any" pesize="S">
<comment>ne30_ne30 grid on 45 nodes 32 ppn pure-MPI</comment>
<PES_PER_NODE>32</PES_PER_NODE>
<MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>1350</ntasks_atm>
Expand Down Expand Up @@ -6317,7 +6317,7 @@
<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_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>675</ntasks_atm>
Expand Down Expand Up @@ -6352,7 +6352,7 @@
</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_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>1350</ntasks_atm>
Expand Down Expand Up @@ -6387,7 +6387,7 @@
</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_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>32</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>2700</ntasks_atm>
Expand Down
4 changes: 2 additions & 2 deletions config/acme/machines/config_batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<arg flag="--cwd" name="CASEROOT"/>
<arg flag="-A" name="PROJECT"/>
<arg flag="-t" name="JOB_WALLCLOCK_TIME"/>
<arg flag="-n" name=" $TOTALPES/$PES_PER_NODE"/>
<arg flag="-n" name=" $TOTALPES/$MAX_MPITASKS_PER_NODE"/>
<arg flag="-q" name="JOB_QUEUE"/>
<arg flag="--mode script"/>
</submit_args>
Expand All @@ -65,7 +65,7 @@
<submit_args>
<arg flag="-A" name="PROJECT"/>
<arg flag="-t" name="JOB_WALLCLOCK_TIME"/>
<arg flag="-n" name=" $TOTALPES/$PES_PER_NODE"/>
<arg flag="-n" name=" $TOTALPES/$MAX_MPITASKS_PER_NODE"/>
<arg flag="-q" name="JOB_QUEUE"/>
<arg flag="--mode script"/>
</submit_args>
Expand Down
Loading

0 comments on commit 5ba192b

Please sign in to comment.