Merge branch 'PeterCaldwell/pes/fix_RTM_pesall' (PR #1775)

Switch RTM to SROF wherever it occurs in config_pesall.xml.

Default PE layouts are determined in $CODE_ROOT/cime/config/acme/allactive/config_pesall.xml based on the requested grid,
machine, compset, etc. Layouts for F compsets on some machines specify every component used, and therefore quit working
when 'RTM' was replaced by 'SROF' in PR #1705.

It would probably be more robust to replace these complex compset specifications with just the components needed to
specify an F case: "CAM.+CLM.+DOCN.". This change made for Edison case, but didn't make it in the ~5 other cases.

[BFB]

* PeterCaldwell/pes/fix_RTM_pesall:
  Simplified compset for Edison F-case pesall
  Changed all RTM->SROF in config_pesall.xml

config/acme/allactive/config_pesall.xml

@@ -5968,8 +5968,8 @@
   </grid>
 <grid name="a%ne30np4">
     <mach name="edison">
-      <pes compset="CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" pesize="any">
-        <comment>"PMC - 114 node F-compset gets around 7.4 SYPD"</comment>
+      <pes compset="CAM.+CLM.+DOCN." pesize="any">
+        <comment>"PMC - 114 node F-compset gets around 10.5 SYPD"</comment>
         <PES_PER_NODE>24</PES_PER_NODE>
         <MAX_TASKS_PER_NODE>48</MAX_TASKS_PER_NODE>
         <ntasks>
@@ -6486,7 +6486,7 @@
   </grid>
   <grid name="a%ne120np4_l%ne120np4_oi%ne120np4_r%r05.*">
     <mach name="mira">
-      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV.*" pesize="S">
+      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+SROF.+SGLC.+SWAV.*" pesize="S">
         <comment>ne120 F-compset on 512 nodes</comment>
         <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
         <PES_PER_NODE>8</PES_PER_NODE>
@@ -6521,7 +6521,7 @@
           <rootpe_wav>0</rootpe_wav>
         </rootpe>
       </pes>
-      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV.*" pesize="M">
+      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+SROF.+SGLC.+SWAV.*" pesize="M">
         <comment>ne120 F-compset on 1024 nodes</comment>
         <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
         <PES_PER_NODE>8</PES_PER_NODE>
@@ -6556,7 +6556,7 @@
           <rootpe_wav>0</rootpe_wav>
         </rootpe>
       </pes>
-      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV.*" pesize="L">
+      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+SROF.+SGLC.+SWAV.*" pesize="L">
         <comment>ne120 F-compset on 2048 nodes</comment>
         <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
         <PES_PER_NODE>8</PES_PER_NODE>