From ff3181ec5cc5b059d1e50db1c6d9d5b47343f32f Mon Sep 17 00:00:00 2001
From: Peter Caldwell <caldwell19@llnl.gov>
Date: Thu, 13 Jul 2017 12:47:53 -0700
Subject: [PATCH 1/4] fix bug in config_pesall.xml

---
 config/acme/allactive/config_pesall.xml | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index d27aa3435ec..301e2f268d0 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -5688,6 +5688,43 @@
       </pes>
     </mach>
   </grid>
+<grid name="a%ne30np4">
+    <mach name="edison">
+      <pes compset="CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" pesize="any">
+        <comment>"PMC - 114 node hyperthreaded F-compset gets 9.6 SYPD"</comment>
+        <ntasks>
+          <ntasks_atm>1350</ntasks_atm>
+          <ntasks_lnd>984</ntasks_lnd>
+          <ntasks_rof>984</ntasks_rof>
+          <ntasks_ice>384</ntasks_ice>
+          <ntasks_ocn>256</ntasks_ocn>
+          <ntasks_glc>1</ntasks_glc>
+          <ntasks_wav>384</ntasks_wav>
+          <ntasks_cpl>984</ntasks_cpl>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>4</nthrds_atm>
+          <nthrds_lnd>4</nthrds_lnd>
+          <nthrds_rof>4</nthrds_rof>
+          <nthrds_ice>1</nthrds_ice>
+          <nthrds_ocn>1</nthrds_ocn>
+          <nthrds_glc>1</nthrds_glc>
+          <nthrds_wav>4</nthrds_wav>
+          <nthrds_cpl>4</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>384</rootpe_lnd>
+          <rootpe_rof>384</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>0</rootpe_ocn>
+          <rootpe_glc>384</rootpe_glc>
+          <rootpe_wav>0</rootpe_wav>
+          <rootpe_cpl>384</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="a%ne30np4">
     <mach name="edison">
       <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">

From 0d4bc210586d77436086225a7cd38f3760253fc8 Mon Sep 17 00:00:00 2001
From: Peter Caldwell <caldwell19@llnl.gov>
Date: Fri, 14 Jul 2017 08:11:07 -0700
Subject: [PATCH 2/4] reduced thread count by 2x since no hyperthreading

---
 config/acme/allactive/config_pesall.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index 301e2f268d0..37e4779e0cb 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -5691,7 +5691,7 @@
 <grid name="a%ne30np4">
     <mach name="edison">
       <pes compset="CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" pesize="any">
-        <comment>"PMC - 114 node hyperthreaded F-compset gets 9.6 SYPD"</comment>
+        <comment>"PMC - 114 node F-compset gets around 8 SYPD"</comment>
         <ntasks>
           <ntasks_atm>1350</ntasks_atm>
           <ntasks_lnd>984</ntasks_lnd>
@@ -5703,14 +5703,14 @@
           <ntasks_cpl>984</ntasks_cpl>
         </ntasks>
         <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
+          <nthrds_atm>2</nthrds_atm>
+          <nthrds_lnd>2</nthrds_lnd>
+          <nthrds_rof>2</nthrds_rof>
           <nthrds_ice>1</nthrds_ice>
           <nthrds_ocn>1</nthrds_ocn>
           <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
+          <nthrds_wav>2</nthrds_wav>
+          <nthrds_cpl>2</nthrds_cpl>
         </nthrds>
         <rootpe>
           <rootpe_atm>0</rootpe_atm>

From 40a724a99081ec50577803be99e987ab4163e713 Mon Sep 17 00:00:00 2001
From: Peter Caldwell <caldwell19@llnl.gov>
Date: Fri, 14 Jul 2017 14:48:39 -0700
Subject: [PATCH 3/4] made default = 114 node w/ hyperthreading

---
 config/acme/allactive/config_pesall.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index 37e4779e0cb..71804333907 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -5691,7 +5691,9 @@
 <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 8 SYPD"</comment>
+        <comment>"PMC - 114 node F-compset gets around 6.6 SYPD"</comment>
+        <PES_PER_NODE>24</PES_PER_NODE>
+        <MAX_TASKS_PER_NODE>48</MAX_TASKS_PER_NODE>
         <ntasks>
           <ntasks_atm>1350</ntasks_atm>
           <ntasks_lnd>984</ntasks_lnd>
@@ -5703,14 +5705,14 @@
           <ntasks_cpl>984</ntasks_cpl>
         </ntasks>
         <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
+          <nthrds_atm>4</nthrds_atm>
+          <nthrds_lnd>4</nthrds_lnd>
+          <nthrds_rof>4</nthrds_rof>
           <nthrds_ice>1</nthrds_ice>
           <nthrds_ocn>1</nthrds_ocn>
           <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
+          <nthrds_wav>4</nthrds_wav>
+          <nthrds_cpl>4</nthrds_cpl>
         </nthrds>
         <rootpe>
           <rootpe_atm>0</rootpe_atm>

From a032456caafadac6e9016cdea057169ada23a8a6 Mon Sep 17 00:00:00 2001
From: Peter Caldwell <caldwell19@llnl.gov>
Date: Fri, 14 Jul 2017 15:18:52 -0700
Subject: [PATCH 4/4] fixed comment

---
 config/acme/allactive/config_pesall.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index 71804333907..6d8234ae2b2 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -5691,7 +5691,7 @@
 <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 6.6 SYPD"</comment>
+        <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>
         <ntasks>