Merge branch 'bishtgautam/scripts/ne16-edison-test-fix' into next (PR #…

…462)

Corrects processor layout on Edison for ne16 grid

Makes the processor layout for each component on Edison be
a multiple of 24 for ne16 grid.

Fixes #461
[BFB]

cime/machines-acme/config_pes.xml

@@ -310,6 +310,17 @@
     <PES_LEVEL>1m</PES_LEVEL>
 </pes>
 
+<pes GRID="a%ne16np4" MACH="edison">
+    <NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
+    <NTASKS_LND>48</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
+    <NTASKS_ICE>48</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
+    <NTASKS_ROF>48</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
+    <NTASKS_OCN>48</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
+    <NTASKS_GLC>48</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
+    <NTASKS_WAV>48</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
+    <NTASKS_CPL>48</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
+</pes>
+
 <pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="edison">
      <NTASKS_ATM>960</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
      <NTASKS_LND>48</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>