Merge branch 'azamat/cetus/fix-test-timeouts' (PR #1414)

Update Cetus test PEs * Increase PEs from 4x1 to 64x16 for A-compset tests to fix wall-clock timeouts. * MPAS-O tests run out-of-memory with 64x16 PEs. This lets them run with 64x1 PEs. * Small change to reduce debugging output from RTM to acme.log. [BFB]
ESMCI · May 4, 2017 · e6b31d2 · e6b31d2
2 parents 7b92d18 + 81ebb52
commit e6b31d2
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
@@ -6132,10 +6132,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>

diff --git a/src/drivers/mct/cime_config/config_pes.xml b/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>