Merge pull request #37 from CESM-Development/edison_update

B1850 f09_g17 pe-layout for edison

config_pes.xml

@@ -1217,6 +1217,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
+
       <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+SWAV">
 	<comment>about 8 ypd expected</comment>
 	<ntasks>
@@ -1317,6 +1318,41 @@
 	</rootpe>
       </pes>
     </mach>
+    <mach name="edison">
+      <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+WW3">
+	<comment>about 17ypd expected</comment>
+	<ntasks>
+	  <ntasks_atm>-50</ntasks_atm>
+	  <ntasks_lnd>-30</ntasks_lnd>
+	  <ntasks_rof>-30</ntasks_rof>
+	  <ntasks_ice>-18</ntasks_ice>
+	  <ntasks_ocn>-20</ntasks_ocn>
+	  <ntasks_glc>-30</ntasks_glc>
+	  <ntasks_wav>-2</ntasks_wav>
+	  <ntasks_cpl>-50</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>4</nthrds_atm>
+	  <nthrds_lnd>4</nthrds_lnd>
+	  <nthrds_rof>4</nthrds_rof>
+	  <nthrds_ice>4</nthrds_ice>
+	  <nthrds_ocn>4</nthrds_ocn>
+	  <nthrds_glc>4</nthrds_glc>
+	  <nthrds_wav>4</nthrds_wav>
+	  <nthrds_cpl>4</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>-30</rootpe_ice>
+	  <rootpe_ocn>-50</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>-48</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
   </grid>
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
     <mach name='cori-haswell'>