From 6a81ebd1e6b3c10180cc1934d6f7229704b5cdc7 Mon Sep 17 00:00:00 2001
From: Peter Caldwell <caldwell19@llnl.gov>
Date: Mon, 11 Sep 2017 13:14:14 -0700
Subject: [PATCH 1/2] Changed all RTM->SROF in config_pesall.xml

Switching river runoff from RTM->SROF broke the ability
to choose correct default PE layouts. This commit fixes
that.

[BFB]
---
 config/acme/allactive/config_pesall.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index 9e9cf02d99b..c2a2551ca3b 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -5968,7 +5968,7 @@
   </grid>
 <grid name="a%ne30np4">
     <mach name="edison">
-      <pes compset="CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" pesize="any">
+      <pes compset="CAM5.+CLM45.+CICE.+DOCN.+SROF.+SGLC.+SWAV" pesize="any">
         <comment>"PMC - 114 node F-compset gets around 7.4 SYPD"</comment>
         <PES_PER_NODE>24</PES_PER_NODE>
         <MAX_TASKS_PER_NODE>48</MAX_TASKS_PER_NODE>
@@ -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>

From 9fe1538fc10cbb002953959b44ef77b57344618c Mon Sep 17 00:00:00 2001
From: Peter Caldwell <caldwell19@llnl.gov>
Date: Mon, 11 Sep 2017 14:01:21 -0700
Subject: [PATCH 2/2] Simplified compset for Edison F-case pesall

Instead of specifying all components, it looks like you can specify just the ones you care about. Made this change for my Edison F case and checked it worked. Didn't make this change for other cases (like Mira?). Also updated my comment specifying the timing of the Edison F case.
---
 config/acme/allactive/config_pesall.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index c2a2551ca3b..9494927c7d4 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -5968,8 +5968,8 @@
   </grid>
 <grid name="a%ne30np4">
     <mach name="edison">
-      <pes compset="CAM5.+CLM45.+CICE.+DOCN.+SROF.+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>