From 6002bc738ef07013742cf5d5302f6394f7125717 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Fri, 14 Apr 2017 22:15:09 +0000
Subject: [PATCH 1/3] Update Cetus test PEs

---
 .../drivers/mct/cime_config/config_pes.xml    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/cime/src/drivers/mct/cime_config/config_pes.xml b/cime/src/drivers/mct/cime_config/config_pes.xml
index f1fa86ae5fd9..ad332b3ff030 100644
--- a/cime/src/drivers/mct/cime_config/config_pes.xml
+++ b/cime/src/drivers/mct/cime_config/config_pes.xml
@@ -166,5 +166,45 @@
     </mach>
   </grid>
 
+  <grid name="any">
+    <mach name="cetus">
+      <pes pesize="any" compset="any">
+        <comment>PE layout for tests</comment>
+        <ntasks>
+          <ntasks_atm>64</ntasks_atm>
+          <ntasks_rof>64</ntasks_rof>
+          <ntasks_ocn>64</ntasks_ocn>
+          <ntasks_ice>64</ntasks_ice>
+          <ntasks_cpl>64</ntasks_cpl>
+          <ntasks_lnd>64</ntasks_lnd>
+          <ntasks_glc>64</ntasks_glc>
+          <ntasks_wav>64</ntasks_wav>
+          <ntasks_esp>64</ntasks_esp>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>16</nthrds_atm>
+          <nthrds_lnd>16</nthrds_lnd>
+          <nthrds_rof>16</nthrds_rof>
+          <nthrds_ice>16</nthrds_ice>
+          <nthrds_ocn>16</nthrds_ocn>
+          <nthrds_glc>16</nthrds_glc>
+          <nthrds_wav>16</nthrds_wav>
+          <nthrds_esp>16</nthrds_esp>
+          <nthrds_cpl>16</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>0</rootpe_ocn>
+          <rootpe_cpl>0</rootpe_cpl>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_glc>0</rootpe_glc>
+          <rootpe_wav>0</rootpe_wav>
+          <rootpe_esp>0</rootpe_esp>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
 </config_pes>
 

From 47ac07432e3498c344be259df9c03f1503e17964 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Tue, 18 Apr 2017 15:29:33 +0000
Subject: [PATCH 2/3] Adjust to match PEs for MPAS tests

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

diff --git a/cime/config/acme/allactive/config_pesall.xml b/cime/config/acme/allactive/config_pesall.xml
index 13ca84f06399..fbc0ec328f34 100644
--- a/cime/config/acme/allactive/config_pesall.xml
+++ b/cime/config/acme/allactive/config_pesall.xml
@@ -5984,10 +5984,10 @@
       </pes>
     </mach>
   </grid>
-  <grid name="a%T62_l%T62_oi%oQU120_r%rx1.+_g%null_w%null">
+  <grid name="a%T62_l%T62_oi%oQU120_r%rx1.+">
     <mach name="cetus">
-      <pes compset=".*DATM.+SLND_MPASCICE_MPASO_DROF.+SGLC_SWAV" pesize="any">
-        <comment>T62_oQU120.CMPASO-NYF on 16 nodes pure-MPI</comment>
+      <pes compset=".*MPAS.*" pesize="any">
+        <comment>T62_oQU120 grid for MPAS tests on 16 nodes pure-MPI</comment>
         <ntasks>
           <ntasks_atm>64</ntasks_atm>
           <ntasks_lnd>64</ntasks_lnd>

From b197302163ca668d19dd1e8f03945bd13b6ee3a3 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Tue, 18 Apr 2017 15:34:47 +0000
Subject: [PATCH 3/3] Reduce debug messages from RTM

---
 components/mosart/src/riverroute/RtmMod.F90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mosart/src/riverroute/RtmMod.F90 b/components/mosart/src/riverroute/RtmMod.F90
index 7b0d1d311429..e2ea98cd6106 100644
--- a/components/mosart/src/riverroute/RtmMod.F90
+++ b/components/mosart/src/riverroute/RtmMod.F90
@@ -186,7 +186,7 @@ subroutine Rtmini(rtm_active,flood_active)
     character(len=256):: locfn                ! local file name
     character(len=16384) :: rList             ! list of fields for SM multiply
     integer           :: unitn                ! unit for namelist file
-    integer,parameter :: dbug = 3             ! 0 = none, 1=normal, 2=much, 3=max
+    integer,parameter :: dbug = 1             ! 0 = none, 1=normal, 2=much, 3=max
     logical :: lexist                         ! File exists
     character(len= 7) :: runtyp(4)            ! run type
     integer ,allocatable :: gindex(:)         ! global index