From 1346022923efe72ba96a79dde656e561ec025f9f Mon Sep 17 00:00:00 2001
From: Chris Fischer <fischer@ucar.edu>
Date: Thu, 7 Dec 2017 15:32:13 -0700
Subject: [PATCH] Fixes for multi-instance tests on cheyenne

---
 config_pes.xml                                        | 2 +-
 testlist_allactive.xml                                | 9 ++++++++-
 testmods_dirs/allactive/defaultiomi/include_user_mods | 1 +
 testmods_dirs/allactive/defaultiomi/shell_commands    | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 testmods_dirs/allactive/defaultiomi/include_user_mods
 create mode 100644 testmods_dirs/allactive/defaultiomi/shell_commands

diff --git a/config_pes.xml b/config_pes.xml
index b14b053..f28fbb5 100644
--- a/config_pes.xml
+++ b/config_pes.xml
@@ -78,7 +78,7 @@
   </grid>
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1" >
     <mach name="cheyenne">
-      <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+WW3.+">
+      <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+">
 	<comment>about 12ypd expected</comment>
         <ntasks>
           <ntasks_atm>288</ntasks_atm>
diff --git a/testlist_allactive.xml b/testlist_allactive.xml
index c581a08..e05353b 100644
--- a/testlist_allactive.xml
+++ b/testlist_allactive.xml
@@ -35,6 +35,13 @@
   <test name="NCK" grid="f19_g17" compset="B1850Ws" testmods="allactive/defaultio">
     <machines>
       <machine name="edison" compiler="intel" category="prebeta"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 02:00 </option>
+    </options>
+  </test>
+  <test name="NCK" grid="f19_g17" compset="B1850Ws" testmods="allactive/defaultiomi">
+    <machines>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
     </machines>
     <options>
@@ -205,7 +212,7 @@
       <option name="comment">Needs to be B1850GWs rather than B1850G because WW3 currently does not support multi-instance</option>
     </options>
   </test>
-  <test name="PET_PM" grid="f19_g17" compset="B1850" testmods="allactive/defaultio">
+  <test name="PET_PM" grid="f19_g17" compset="B1850" testmods="allactive/defaultiomi">
     <machines>
       <machine name="cheyenne" compiler="gnu" category="prealpha"/>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
diff --git a/testmods_dirs/allactive/defaultiomi/include_user_mods b/testmods_dirs/allactive/defaultiomi/include_user_mods
new file mode 100644
index 0000000..6d28687
--- /dev/null
+++ b/testmods_dirs/allactive/defaultiomi/include_user_mods
@@ -0,0 +1 @@
+../defaultio
diff --git a/testmods_dirs/allactive/defaultiomi/shell_commands b/testmods_dirs/allactive/defaultiomi/shell_commands
new file mode 100644
index 0000000..e9dc252
--- /dev/null
+++ b/testmods_dirs/allactive/defaultiomi/shell_commands
@@ -0,0 +1 @@
+./xmlchange NTASKS_OCN=-4