Merge branch 'jonbob/machines/update-edison-B-layouts' into next (PR #…

…1488)

Update edison pe-layouts for A_WCYCL compsets

This PR updates the edison M and L pe-layouts for A_WCYCL compsets and
ne30_oEC60to30 grids, to match the improved layouts described in Issue #1387.
It also adds a S pe-layout for the same configuration that gets just over
2 sypd on 39 nodes.

Tested with:
-compset A_WCYCL1850S -mach edison -res ne30np4_oEC60to30v3_ICG -pecount S
-compset A_WCYCL1850S -mach edison -res ne30np4_oEC60to30v3_ICG -pecount M
-compset A_WCYCL1850S -mach edison -res ne30np4_oEC60to30v3_ICG -pecount L

[BFB]

cime/config/acme/allactive/config_pesall.xml

@@ -5614,19 +5614,19 @@
       </pes>
     </mach>
   </grid>
-  <grid name="any">
+  <grid name="a%ne30np4">
     <mach name="edison">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="S">
-        <comment>none</comment>
+      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
+        <comment>"143 node version gets 6 SYPD. This will be the default and M size"</comment>
         <ntasks>
-          <ntasks_atm>960</ntasks_atm>
-          <ntasks_lnd>960</ntasks_lnd>
-          <ntasks_rof>960</ntasks_rof>
-          <ntasks_ice>960</ntasks_ice>
-          <ntasks_ocn>960</ntasks_ocn>
-          <ntasks_glc>960</ntasks_glc>
-          <ntasks_wav>960</ntasks_wav>
-          <ntasks_cpl>960</ntasks_cpl>
+          <ntasks_atm>2700</ntasks_atm>
+          <ntasks_lnd>312</ntasks_lnd>
+          <ntasks_rof>312</ntasks_rof>
+          <ntasks_ice>2400</ntasks_ice>
+          <ntasks_ocn>720</ntasks_ocn>
+          <ntasks_glc>312</ntasks_glc>
+          <ntasks_wav>2400</ntasks_wav>
+          <ntasks_cpl>2400</ntasks_cpl>
         </ntasks>
         <nthrds>
           <nthrds_atm>1</nthrds_atm>
@@ -5640,11 +5640,11 @@
         </nthrds>
         <rootpe>
           <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
+          <rootpe_lnd>2400</rootpe_lnd>
+          <rootpe_rof>2400</rootpe_rof>
           <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
+          <rootpe_ocn>2712</rootpe_ocn>
+          <rootpe_glc>2400</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>
           <rootpe_cpl>0</rootpe_cpl>
         </rootpe>
@@ -5653,17 +5653,17 @@
   </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>
+      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="S">
+        <comment>"39 node version gets 2.1 SYPD."</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_atm>675</ntasks_atm>
+          <ntasks_lnd>56</ntasks_lnd>
+          <ntasks_rof>56</ntasks_rof>
+          <ntasks_ice>640</ntasks_ice>
+          <ntasks_ocn>240</ntasks_ocn>
+          <ntasks_glc>56</ntasks_glc>
+          <ntasks_wav>56</ntasks_wav>
+          <ntasks_cpl>640</ntasks_cpl>
         </ntasks>
         <nthrds>
           <nthrds_atm>1</nthrds_atm>
@@ -5677,11 +5677,11 @@
         </nthrds>
         <rootpe>
           <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>2400</rootpe_lnd>
-          <rootpe_rof>2400</rootpe_rof>
+          <rootpe_lnd>640</rootpe_lnd>
+          <rootpe_rof>640</rootpe_rof>
           <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>2712</rootpe_ocn>
-          <rootpe_glc>2400</rootpe_glc>
+          <rootpe_ocn>696</rootpe_ocn>
+          <rootpe_glc>640</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>
           <rootpe_cpl>0</rootpe_cpl>
         </rootpe>
@@ -5691,13 +5691,13 @@
   <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>
+        <comment>"265 node version gets 10.4 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_ice>3200</ntasks_ice>
+          <ntasks_ocn>960</ntasks_ocn>
           <ntasks_glc>600</ntasks_glc>
           <ntasks_wav>4800</ntasks_wav>
           <ntasks_cpl>4800</ntasks_cpl>