From f3473de3e04283cd32e2c3c7a6873cc18d9497cf Mon Sep 17 00:00:00 2001
From: Erich L Foster <elfost@sandia.gov>
Date: Thu, 20 Apr 2017 13:37:06 -0600
Subject: [PATCH] Removed deprecated config_pes.xml*

Both cime/config/acme/allactive/config_pes.xml and
cime/config/acme/allacitve/config_pes.xml.cime2 are deprecated in favor of
cime/config/acme/allactive/config_pesall.xml and so these files have been
removed.

[BFB]

Fixes #1434
---
 config/acme/allactive/config_pes.xml       | 2299 --------------------
 config/acme/allactive/config_pes.xml.cime2 | 1439 ------------
 2 files changed, 3738 deletions(-)
 delete mode 100644 config/acme/allactive/config_pes.xml
 delete mode 100644 config/acme/allactive/config_pes.xml.cime2

diff --git a/config/acme/allactive/config_pes.xml b/config/acme/allactive/config_pes.xml
deleted file mode 100644
index d64ba8c9ac6b..000000000000
--- a/config/acme/allactive/config_pes.xml
+++ /dev/null
@@ -1,2299 +0,0 @@
-<?xml version="1.0"?>
-<!--config_pes version="2.0"--->
-
-<config_pes>
-  <grid name="any">
-    <mach name="any">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>-4</ntasks_atm>
-          <ntasks_lnd>-4</ntasks_lnd>
-          <ntasks_rof>-4</ntasks_rof>
-          <ntasks_ice>-4</ntasks_ice>
-          <ntasks_ocn>-4</ntasks_ocn>
-          <ntasks_glc>-4</ntasks_glc>
-          <ntasks_wav>-4</ntasks_wav>
-          <ntasks_cpl>-4</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="any">
-    <mach name="edison">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>960</ntasks_atm>
-          <ntasks_lnd>960</ntasks_lnd>
-          <ntasks_rof>960</ntasks_rof>
-          <ntasks_ice>960</ntasks_ice>
-          <ntasks_ocn>960</ntasks_ocn>
-          <ntasks_glc>960</ntasks_glc>
-          <ntasks_wav>960</ntasks_wav>
-          <ntasks_cpl>960</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="any">
-    <mach name="cori-haswell">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1024</ntasks_atm>
-          <ntasks_lnd>1024</ntasks_lnd>
-          <ntasks_rof>1024</ntasks_rof>
-          <ntasks_ice>1024</ntasks_ice>
-          <ntasks_ocn>1024</ntasks_ocn>
-          <ntasks_glc>1024</ntasks_glc>
-          <ntasks_wav>1024</ntasks_wav>
-          <ntasks_cpl>1024</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="any">
-    <mach name="mira|cetus">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1024</ntasks_atm>
-          <ntasks_lnd>1024</ntasks_lnd>
-          <ntasks_rof>1024</ntasks_rof>
-          <ntasks_ice>1024</ntasks_ice>
-          <ntasks_ocn>1024</ntasks_ocn>
-          <ntasks_glc>1024</ntasks_glc>
-          <ntasks_wav>1024</ntasks_wav>
-          <ntasks_cpl>1024</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="any">
-    <mach name="any">
-      <pes compset="DATM.+SLND.+MPASCICE.+MPASO.+DROF.+MPASLI.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>64</ntasks_atm>
-          <ntasks_lnd>64</ntasks_lnd>
-          <ntasks_rof>64</ntasks_rof>
-          <ntasks_ice>64</ntasks_ice>
-          <ntasks_ocn>64</ntasks_ocn>
-          <ntasks_glc>64</ntasks_glc>
-          <ntasks_wav>64</ntasks_wav>
-          <ntasks_cpl>64</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1">
-    <mach name="cori-haswell">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-16</ntasks_atm>
-	  <ntasks_lnd>-9</ntasks_lnd>
-	  <ntasks_rof>-9</ntasks_rof>
-	  <ntasks_ice>-7</ntasks_ice>
-	  <ntasks_ocn>-1</ntasks_ocn>
-	  <ntasks_glc>-1</ntasks_glc>
-	  <ntasks_wav>-1</ntasks_wav>
-	  <ntasks_cpl>-16</ntasks_cpl>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>8</nthrds_atm>
-	  <nthrds_lnd>8</nthrds_lnd>
-	  <nthrds_rof>8</nthrds_rof>
-	  <nthrds_ice>8</nthrds_ice>
-	  <nthrds_ocn>8</nthrds_ocn>
-	  <nthrds_glc>8</nthrds_glc>
-	  <nthrds_wav>8</nthrds_wav>
-	  <nthrds_cpl>8</nthrds_cpl>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>-9</rootpe_ice>
-	  <rootpe_ocn>-16</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="any">
-    <mach name="anvil">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>128</ntasks_atm>
-          <ntasks_lnd>128</ntasks_lnd>
-          <ntasks_rof>128</ntasks_rof>
-          <ntasks_ice>128</ntasks_ice>
-          <ntasks_ocn>128</ntasks_ocn>
-          <ntasks_glc>128</ntasks_glc>
-          <ntasks_wav>128</ntasks_wav>
-          <ntasks_cpl>128</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="any">
-    <mach name="blues">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1024</ntasks_atm>
-          <ntasks_lnd>1024</ntasks_lnd>
-          <ntasks_rof>1024</ntasks_rof>
-          <ntasks_ice>1024</ntasks_ice>
-          <ntasks_ocn>1024</ntasks_ocn>
-          <ntasks_glc>1024</ntasks_glc>
-          <ntasks_wav>1024</ntasks_wav>
-          <ntasks_cpl>1024</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne30np4_l%ne30np4_oi%oEC60to30_r%r05_m%oEC60to30_g%null_w%null">
-    <mach name="titan">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>675</ntasks_atm>
-          <ntasks_lnd>168</ntasks_lnd>
-          <ntasks_rof>168</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>512</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>512</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>512</rootpe_lnd>
-          <rootpe_rof>512</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>680</rootpe_ocn>
-          <rootpe_glc>512</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne30np4_l%ne30np4_oi%oEC60to30_r%r05_m%oEC60to30_g%null_w%null">
-    <mach name="redsky">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>256</ntasks_atm>
-          <ntasks_lnd>256</ntasks_lnd>
-          <ntasks_rof>256</ntasks_rof>
-          <ntasks_ice>256</ntasks_ice>
-          <ntasks_ocn>256</ntasks_ocn>
-          <ntasks_glc>256</ntasks_glc>
-          <ntasks_wav>256</ntasks_wav>
-          <ntasks_cpl>256</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%ne120np4_oi%oRRS15to5_r%r0.+_m%oRRS15to5_g%null_w%null">
-    <mach name="titan|edison|cori-haswell">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>9600</ntasks_atm>
-          <ntasks_lnd>9600</ntasks_lnd>
-          <ntasks_rof>9600</ntasks_rof>
-          <ntasks_ice>9600</ntasks_ice>
-          <ntasks_ocn>9600</ntasks_ocn>
-          <ntasks_glc>9600</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>9600</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%ne120np4_oi%oRRS18to6_r%r0.+_m%oRRS18to6_g%null_w%null">
-    <mach name="titan|edison|cori-haswell">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>9600</ntasks_atm>
-          <ntasks_lnd>9600</ntasks_lnd>
-          <ntasks_rof>9600</ntasks_rof>
-          <ntasks_ice>9600</ntasks_ice>
-          <ntasks_ocn>9600</ntasks_ocn>
-          <ntasks_glc>9600</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>9600</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%ne120np4_oi%oRRS15to5_r%r0.+_m%oRRS15to5_g%null_w%null">
-    <mach name="mira">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>7200</ntasks_atm>
-          <ntasks_lnd>256</ntasks_lnd>
-          <ntasks_rof>256</ntasks_rof>
-          <ntasks_ice>6688</ntasks_ice>
-          <ntasks_ocn>992</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>7200</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>256</rootpe_rof>
-          <rootpe_ice>512</rootpe_ice>
-          <rootpe_ocn>7200</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%ne120np4_oi%oRRS18to6_r%r0.+_m%oRRS18to6_g%null_w%null">
-    <mach name="mira">
-      <pes compset="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>7200</ntasks_atm>
-          <ntasks_lnd>256</ntasks_lnd>
-          <ntasks_rof>256</ntasks_rof>
-          <ntasks_ice>6688</ntasks_ice>
-          <ntasks_ocn>992</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>7200</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>256</rootpe_rof>
-          <rootpe_ice>512</rootpe_ice>
-          <rootpe_ocn>7200</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%ne120np4_oi%ne120np4_r%r05_m%gx1v6_g%null_w%null">
-    <mach name="mira|cetus">
-      <pes compset=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>7200</ntasks_atm>
-          <ntasks_lnd>992</ntasks_lnd>
-          <ntasks_rof>992</ntasks_rof>
-          <ntasks_ice>992</ntasks_ice>
-          <ntasks_ocn>992</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>992</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>7200</rootpe_lnd>
-          <rootpe_rof>7200</rootpe_rof>
-          <rootpe_ice>7200</rootpe_ice>
-          <rootpe_ocn>7200</rootpe_ocn>
-          <rootpe_glc>7200</rootpe_glc>
-          <rootpe_wav>7200</rootpe_wav>
-          <rootpe_cpl>7200</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4">
-    <mach name="titan|stampede|bluewaters">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>3200</ntasks_atm>
-          <ntasks_lnd>1600</ntasks_lnd>
-          <ntasks_rof>3200</ntasks_rof>
-          <ntasks_ice>1600</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>3200</ntasks_glc>
-          <ntasks_wav>3200</ntasks_wav>
-          <ntasks_cpl>3200</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>2</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>1600</rootpe_ice>
-          <rootpe_ocn>3200</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
-    <mach name="titan|stampede|bluewaters">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>2000</ntasks_atm>
-          <ntasks_lnd>960</ntasks_lnd>
-          <ntasks_rof>2000</ntasks_rof>
-          <ntasks_ice>1040</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>2000</ntasks_wav>
-          <ntasks_cpl>960</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>960</rootpe_ice>
-          <rootpe_ocn>2000</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="edison">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>960</ntasks_atm>
-          <ntasks_lnd>48</ntasks_lnd>
-          <ntasks_rof>960</ntasks_rof>
-          <ntasks_ice>912</ntasks_ice>
-          <ntasks_ocn>48</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>960</ntasks_wav>
-          <ntasks_cpl>960</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>48</rootpe_ice>
-          <rootpe_ocn>960</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%gx3">
-    <mach name="any">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>16</ntasks_atm>
-          <ntasks_lnd>16</ntasks_lnd>
-          <ntasks_rof>16</ntasks_rof>
-          <ntasks_ice>16</ntasks_ice>
-          <ntasks_ocn>16</ntasks_ocn>
-          <ntasks_glc>16</ntasks_glc>
-          <ntasks_wav>16</ntasks_wav>
-          <ntasks_cpl>16</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>2</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%gx3">
-    <mach name="any">
-      <pes compset="any" pesize="T">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>8</ntasks_atm>
-          <ntasks_lnd>8</ntasks_lnd>
-          <ntasks_rof>8</ntasks_rof>
-          <ntasks_ice>5</ntasks_ice>
-          <ntasks_ocn>4</ntasks_ocn>
-          <ntasks_glc>8</ntasks_glc>
-          <ntasks_wav>8</ntasks_wav>
-          <ntasks_cpl>8</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%gx1|a%1.9x2.5.+oi%gx1">
-    <mach name="any">
-      <pes compset="DATM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1</ntasks_atm>
-          <ntasks_lnd>1</ntasks_lnd>
-          <ntasks_rof>1</ntasks_rof>
-          <ntasks_ice>32</ntasks_ice>
-          <ntasks_ocn>96</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>32</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>16</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>32</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%gx1">
-    <mach name="any">
-      <pes compset="DATM.+CICE.+POP" pesize="L">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1</ntasks_atm>
-          <ntasks_lnd>1</ntasks_lnd>
-          <ntasks_rof>1</ntasks_rof>
-          <ntasks_ice>80</ntasks_ice>
-          <ntasks_ocn>192</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-          <ntasks_cpl>80</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>80</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="DATM.+DICE.+POP" pesize="S">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>8</ntasks_atm>
-          <ntasks_lnd>8</ntasks_lnd>
-          <ntasks_rof>8</ntasks_rof>
-          <ntasks_ice>8</ntasks_ice>
-          <ntasks_ocn>480</ntasks_ocn>
-          <ntasks_glc>8</ntasks_glc>
-          <ntasks_wav>8</ntasks_wav>
-          <ntasks_cpl>32</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>8</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>16</rootpe_ice>
-          <rootpe_ocn>32</rootpe_ocn>
-          <rootpe_glc>24</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="DATM.+CICE.+POP" pesize="S">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>16</ntasks_atm>
-          <ntasks_lnd>8</ntasks_lnd>
-          <ntasks_rof>16</ntasks_rof>
-          <ntasks_ice>480</ntasks_ice>
-          <ntasks_ocn>480</ntasks_ocn>
-          <ntasks_glc>8</ntasks_glc>
-          <ntasks_wav>16</ntasks_wav>
-          <ntasks_cpl>32</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>16</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>32</rootpe_ice>
-          <rootpe_ocn>32</rootpe_ocn>
-          <rootpe_glc>24</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="DATM.+DICE.+POP" pesize="M">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>48</ntasks_atm>
-          <ntasks_lnd>48</ntasks_lnd>
-          <ntasks_rof>48</ntasks_rof>
-          <ntasks_ice>48</ntasks_ice>
-          <ntasks_ocn>1024</ntasks_ocn>
-          <ntasks_glc>48</ntasks_glc>
-          <ntasks_wav>48</ntasks_wav>
-          <ntasks_cpl>48</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>48</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>192</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>96</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>144</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="DATM.+CICE.+POP" pesize="M">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>48</ntasks_atm>
-          <ntasks_lnd>48</ntasks_lnd>
-          <ntasks_rof>48</ntasks_rof>
-          <ntasks_ice>1024</ntasks_ice>
-          <ntasks_ocn>1024</ntasks_ocn>
-          <ntasks_glc>48</ntasks_glc>
-          <ntasks_wav>48</ntasks_wav>
-          <ntasks_cpl>48</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>48</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>96</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>144</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62.+oi%tx0.1v2">
-    <mach name="edison|eos">
-      <pes compset="DATM.+CICE.+POP" pesize="M">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>48</ntasks_atm>
-          <ntasks_lnd>48</ntasks_lnd>
-          <ntasks_rof>48</ntasks_rof>
-          <ntasks_ice>960</ntasks_ice>
-          <ntasks_ocn>960</ntasks_ocn>
-          <ntasks_glc>48</ntasks_glc>
-          <ntasks_wav>48</ntasks_wav>
-          <ntasks_cpl>48</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>2</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>48</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>96</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>144</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%4x5.+oi%gx3">
-    <mach name="any">
-      <pes compset="any" pesize="T">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>8</ntasks_atm>
-          <ntasks_lnd>8</ntasks_lnd>
-          <ntasks_rof>8</ntasks_rof>
-          <ntasks_ice>5</ntasks_ice>
-          <ntasks_ocn>4</ntasks_ocn>
-          <ntasks_glc>8</ntasks_glc>
-          <ntasks_wav>8</ntasks_wav>
-          <ntasks_cpl>8</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T31.+oi%gx3">
-    <mach name="any">
-      <pes compset="any" pesize="T">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>8</ntasks_atm>
-          <ntasks_lnd>8</ntasks_lnd>
-          <ntasks_rof>8</ntasks_rof>
-          <ntasks_ice>5</ntasks_ice>
-          <ntasks_ocn>4</ntasks_ocn>
-          <ntasks_glc>8</ntasks_glc>
-          <ntasks_wav>8</ntasks_wav>
-          <ntasks_cpl>8</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%1.9x2.5_l%1.9x2.5_oi%gx1">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>160</ntasks_atm>
-          <ntasks_lnd>160</ntasks_lnd>
-          <ntasks_rof>160</ntasks_rof>
-          <ntasks_ice>160</ntasks_ice>
-          <ntasks_ocn>240</ntasks_ocn>
-          <ntasks_glc>160</ntasks_glc>
-          <ntasks_wav>160</ntasks_wav>
-          <ntasks_cpl>160</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>160</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%1.9x2.5_l%1.9x2.5_oi%gx1">
-    <mach name="any">
-      <pes compset="any" pesize="T">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>32</ntasks_atm>
-          <ntasks_lnd>32</ntasks_lnd>
-          <ntasks_rof>32</ntasks_rof>
-          <ntasks_ice>32</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>32</ntasks_glc>
-          <ntasks_wav>32</ntasks_wav>
-          <ntasks_cpl>32</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%1.9x2.5_l%1.9x2.5_oi%1.9x2.5">
-    <mach name="any">
-      <pes compset="any" pesize="T">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>64</ntasks_atm>
-          <ntasks_lnd>32</ntasks_lnd>
-          <ntasks_rof>64</ntasks_rof>
-          <ntasks_ice>32</ntasks_ice>
-          <ntasks_ocn>64</ntasks_ocn>
-          <ntasks_glc>64</ntasks_glc>
-          <ntasks_wav>64</ntasks_wav>
-          <ntasks_cpl>64</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>2</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>32</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="any">
-      <pes compset="any" pesize="T">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>32</ntasks_atm>
-          <ntasks_lnd>32</ntasks_lnd>
-          <ntasks_rof>32</ntasks_rof>
-          <ntasks_ice>32</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>32</ntasks_glc>
-          <ntasks_wav>32</ntasks_wav>
-          <ntasks_cpl>32</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="titan|stampede">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>384</ntasks_atm>
-          <ntasks_lnd>64</ntasks_lnd>
-          <ntasks_rof>384</ntasks_rof>
-          <ntasks_ice>320</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>384</ntasks_glc>
-          <ntasks_wav>384</ntasks_wav>
-          <ntasks_cpl>64</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>64</rootpe_ice>
-          <rootpe_ocn>384</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="hopper">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>768</ntasks_atm>
-          <ntasks_lnd>128</ntasks_lnd>
-          <ntasks_rof>768</ntasks_rof>
-          <ntasks_ice>640</ntasks_ice>
-          <ntasks_ocn>60</ntasks_ocn>
-          <ntasks_glc>768</ntasks_glc>
-          <ntasks_wav>768</ntasks_wav>
-          <ntasks_cpl>128</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>3</nthrds_atm>
-          <nthrds_lnd>3</nthrds_lnd>
-          <nthrds_rof>3</nthrds_rof>
-          <nthrds_ice>3</nthrds_ice>
-          <nthrds_ocn>3</nthrds_ocn>
-          <nthrds_glc>3</nthrds_glc>
-          <nthrds_wav>3</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>128</rootpe_ice>
-          <rootpe_ocn>768</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T62_l%T62_oi%gx1">
-    <mach name="titan|stampede">
-      <pes compset="DATM.+CICE.+POP|DATM.+DICE.+POP|DATM.+CICE.+DOCN" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>128</ntasks_atm>
-          <ntasks_lnd>128</ntasks_lnd>
-          <ntasks_rof>128</ntasks_rof>
-          <ntasks_ice>128</ntasks_ice>
-          <ntasks_ocn>128</ntasks_ocn>
-          <ntasks_glc>128</ntasks_glc>
-          <ntasks_wav>128</ntasks_wav>
-          <ntasks_cpl>128</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>2</nthrds_atm>
-          <nthrds_lnd>2</nthrds_lnd>
-          <nthrds_rof>2</nthrds_rof>
-          <nthrds_ice>2</nthrds_ice>
-          <nthrds_ocn>2</nthrds_ocn>
-          <nthrds_glc>2</nthrds_glc>
-          <nthrds_wav>2</nthrds_wav>
-          <nthrds_cpl>2</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="mira|cetus">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1525</ntasks_atm>
-          <ntasks_lnd>71</ntasks_lnd>
-          <ntasks_rof>71</ntasks_rof>
-          <ntasks_ice>1454</ntasks_ice>
-          <ntasks_ocn>256</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1525</ntasks_wav>
-          <ntasks_cpl>1525</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>16</nthrds_rof>
-          <nthrds_ice>16</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>16</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>71</rootpe_ice>
-          <rootpe_ocn>1525</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="cetus">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1525</ntasks_atm>
-          <ntasks_lnd>71</ntasks_lnd>
-          <ntasks_rof>71</ntasks_rof>
-          <ntasks_ice>1454</ntasks_ice>
-          <ntasks_ocn>256</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1525</ntasks_wav>
-          <ntasks_cpl>1525</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>16</nthrds_rof>
-          <nthrds_ice>16</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>16</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>71</rootpe_ice>
-          <rootpe_ocn>1525</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
-    <mach name='cori-haswell'>
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-16</ntasks_atm>
-	  <ntasks_lnd>-9</ntasks_lnd>
-	  <ntasks_rof>-9</ntasks_rof>
-	  <ntasks_ice>-7</ntasks_ice>
-	  <ntasks_ocn>-1</ntasks_ocn>
-	  <ntasks_glc>-1</ntasks_glc>
-	  <ntasks_wav>-1</ntasks_wav>
-	  <ntasks_cpl>-16</ntasks_cpl>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>8</nthrds_atm>
-	  <nthrds_lnd>8</nthrds_lnd>
-	  <nthrds_rof>8</nthrds_rof>
-	  <nthrds_ice>8</nthrds_ice>
-	  <nthrds_ocn>8</nthrds_ocn>
-	  <nthrds_glc>8</nthrds_glc>
-	  <nthrds_wav>8</nthrds_wav>
-	  <nthrds_cpl>8</nthrds_cpl>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>-9</rootpe_ice>
-	  <rootpe_ocn>-16</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%gx1">
-    <mach name="cetus|mira">
-      <pes compset="DATM.+CLM" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>512</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>512</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>512</ntasks_ocn>
-          <ntasks_glc>512</ntasks_glc>
-          <ntasks_wav>512</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </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_cpl>16</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25">
-    <mach name="mira|cetus">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1525</ntasks_atm>
-          <ntasks_lnd>71</ntasks_lnd>
-          <ntasks_rof>71</ntasks_rof>
-          <ntasks_ice>1454</ntasks_ice>
-          <ntasks_ocn>256</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1525</ntasks_wav>
-          <ntasks_cpl>1525</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>16</nthrds_rof>
-          <nthrds_ice>16</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>16</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>71</rootpe_ice>
-          <rootpe_ocn>1525</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25">
-    <mach name="cetus">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1525</ntasks_atm>
-          <ntasks_lnd>71</ntasks_lnd>
-          <ntasks_rof>71</ntasks_rof>
-          <ntasks_ice>1454</ntasks_ice>
-          <ntasks_ocn>256</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1525</ntasks_wav>
-          <ntasks_cpl>1525</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>16</nthrds_rof>
-          <nthrds_ice>16</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>16</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>71</rootpe_ice>
-          <rootpe_ocn>1525</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%gx1">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>496</ntasks_atm>
-          <ntasks_lnd>176</ntasks_lnd>
-          <ntasks_rof>496</ntasks_rof>
-          <ntasks_ice>320</ntasks_ice>
-          <ntasks_ocn>16</ntasks_ocn>
-          <ntasks_glc>496</ntasks_glc>
-          <ntasks_wav>496</ntasks_wav>
-          <ntasks_cpl>160</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>320</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>496</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%gx1">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>512</ntasks_atm>
-          <ntasks_lnd>192</ntasks_lnd>
-          <ntasks_rof>512</ntasks_rof>
-          <ntasks_ice>320</ntasks_ice>
-          <ntasks_ocn>64</ntasks_ocn>
-          <ntasks_glc>512</ntasks_glc>
-          <ntasks_wav>512</ntasks_wav>
-          <ntasks_cpl>512</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>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>320</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>512</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="S">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>480</ntasks_atm>
-          <ntasks_lnd>416</ntasks_lnd>
-          <ntasks_rof>480</ntasks_rof>
-          <ntasks_ice>480</ntasks_ice>
-          <ntasks_ocn>480</ntasks_ocn>
-          <ntasks_glc>480</ntasks_glc>
-          <ntasks_wav>480</ntasks_wav>
-          <ntasks_cpl>480</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="M">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1024</ntasks_atm>
-          <ntasks_lnd>416</ntasks_lnd>
-          <ntasks_rof>1024</ntasks_rof>
-          <ntasks_ice>1024</ntasks_ice>
-          <ntasks_ocn>1024</ntasks_ocn>
-          <ntasks_glc>1024</ntasks_glc>
-          <ntasks_wav>1024</ntasks_wav>
-          <ntasks_cpl>1024</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="L">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>480</ntasks_atm>
-          <ntasks_lnd>416</ntasks_lnd>
-          <ntasks_rof>480</ntasks_rof>
-          <ntasks_ice>480</ntasks_ice>
-          <ntasks_ocn>1232</ntasks_ocn>
-          <ntasks_glc>480</ntasks_glc>
-          <ntasks_wav>480</ntasks_wav>
-          <ntasks_cpl>432</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>480</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="X1">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1024</ntasks_atm>
-          <ntasks_lnd>416</ntasks_lnd>
-          <ntasks_rof>1024</ntasks_rof>
-          <ntasks_ice>1024</ntasks_ice>
-          <ntasks_ocn>2356</ntasks_ocn>
-          <ntasks_glc>1024</ntasks_glc>
-          <ntasks_wav>1024</ntasks_wav>
-          <ntasks_cpl>432</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>1024</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="X2">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1664</ntasks_atm>
-          <ntasks_lnd>416</ntasks_lnd>
-          <ntasks_rof>1664</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
-          <ntasks_ocn>3476</ntasks_ocn>
-          <ntasks_glc>1664</ntasks_glc>
-          <ntasks_wav>1664</ntasks_wav>
-          <ntasks_cpl>432</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>1800</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.23x0.31_l%0.23x0.31_oi%gx1">
-    <mach name="any">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>496</ntasks_atm>
-          <ntasks_lnd>336</ntasks_lnd>
-          <ntasks_rof>496</ntasks_rof>
-          <ntasks_ice>160</ntasks_ice>
-          <ntasks_ocn>16</ntasks_ocn>
-          <ntasks_glc>496</ntasks_glc>
-          <ntasks_wav>496</ntasks_wav>
-          <ntasks_cpl>160</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>160</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>496</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
-    <mach name="mira|cetus">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1916</ntasks_atm>
-          <ntasks_lnd>120</ntasks_lnd>
-          <ntasks_rof>120</ntasks_rof>
-          <ntasks_ice>1796</ntasks_ice>
-          <ntasks_ocn>132</ntasks_ocn>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1916</ntasks_wav>
-          <ntasks_cpl>1916</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>16</nthrds_atm>
-          <nthrds_lnd>16</nthrds_lnd>
-          <nthrds_rof>16</nthrds_rof>
-          <nthrds_ice>16</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>16</nthrds_wav>
-          <nthrds_cpl>16</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>120</rootpe_ice>
-          <rootpe_ocn>1916</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne240np4_l%0.23x0.31_oi%gx1">
-    <mach name="any">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>2560</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>2560</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>512</ntasks_ocn>
-          <ntasks_glc>2560</ntasks_glc>
-          <ntasks_wav>2560</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>1536</rootpe_atm>
-          <rootpe_lnd>512</rootpe_lnd>
-          <rootpe_rof>1536</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>1536</rootpe_glc>
-          <rootpe_wav>1536</rootpe_wav>
-          <rootpe_cpl>1023</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne240np4_l%0.23x0.31_oi%gx1">
-    <mach name="edison|eos">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>9600</ntasks_atm>
-          <ntasks_lnd>960</ntasks_lnd>
-          <ntasks_rof>960</ntasks_rof>
-          <ntasks_ice>960</ntasks_ice>
-          <ntasks_ocn>960</ntasks_ocn>
-          <ntasks_glc>960</ntasks_glc>
-          <ntasks_wav>9600</ntasks_wav>
-          <ntasks_cpl>960</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>4</nthrds_atm>
-          <nthrds_lnd>4</nthrds_lnd>
-          <nthrds_rof>4</nthrds_rof>
-          <nthrds_ice>4</nthrds_ice>
-          <nthrds_ocn>4</nthrds_ocn>
-          <nthrds_glc>4</nthrds_glc>
-          <nthrds_wav>4</nthrds_wav>
-          <nthrds_cpl>4</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>5800</rootpe_rof>
-          <rootpe_ice>960</rootpe_ice>
-          <rootpe_ocn>1920</rootpe_ocn>
-          <rootpe_glc>4840</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>3880</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne240np4_l%0.23x0.31_oi%tx0.1v2">
-    <mach name="any">
-      <pes compset="any" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>2048</ntasks_atm>
-          <ntasks_lnd>112</ntasks_lnd>
-          <ntasks_rof>2048</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
-          <ntasks_ocn>4028</ntasks_ocn>
-          <ntasks_glc>2048</ntasks_glc>
-          <ntasks_wav>2048</ntasks_wav>
-          <ntasks_cpl>2048</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>2048</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>2160</rootpe_ice>
-          <rootpe_ocn>3960</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T341_l%T341_oi%T341">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM4.+CICE.+DOCN%DOM" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>512</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>512</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>512</ntasks_ocn>
-          <ntasks_glc>512</ntasks_glc>
-          <ntasks_wav>512</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>6</nthrds_atm>
-          <nthrds_lnd>6</nthrds_lnd>
-          <nthrds_rof>6</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>6</nthrds_glc>
-          <nthrds_wav>6</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.23x0.31_l%0.23x0.31_oi%tx0.1v2">
-    <mach name="hopper|janus">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>2048</ntasks_atm>
-          <ntasks_lnd>112</ntasks_lnd>
-          <ntasks_rof>2048</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
-          <ntasks_ocn>4028</ntasks_ocn>
-          <ntasks_glc>2048</ntasks_glc>
-          <ntasks_wav>2048</ntasks_wav>
-          <ntasks_cpl>1800</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>2048</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>2160</rootpe_ice>
-          <rootpe_ocn>3960</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.23x0.31_l%0.23x0.31_oi%tx0.1v2">
-    <mach name="titan|stampede">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1824</ntasks_atm>
-          <ntasks_lnd>112</ntasks_lnd>
-          <ntasks_rof>1824</ntasks_rof>
-          <ntasks_ice>1600</ntasks_ice>
-          <ntasks_ocn>3600</ntasks_ocn>
-          <ntasks_glc>1824</ntasks_glc>
-          <ntasks_wav>1824</ntasks_wav>
-          <ntasks_cpl>1600</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>1824</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>1936</rootpe_ice>
-          <rootpe_ocn>3536</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T341_l%T341_oi%tx0.1v2">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>512</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>512</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
-          <ntasks_ocn>2048</ntasks_ocn>
-          <ntasks_glc>512</ntasks_glc>
-          <ntasks_wav>512</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>6</nthrds_atm>
-          <nthrds_lnd>6</nthrds_lnd>
-          <nthrds_rof>6</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>6</nthrds_glc>
-          <nthrds_wav>6</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>512</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>512</rootpe_ice>
-          <rootpe_ocn>2312</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%T341_l%0.23x0.31_oi%tx0.1v2">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>512</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>512</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
-          <ntasks_ocn>2048</ntasks_ocn>
-          <ntasks_glc>512</ntasks_glc>
-          <ntasks_wav>512</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>6</nthrds_atm>
-          <nthrds_lnd>6</nthrds_lnd>
-          <nthrds_rof>6</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>6</nthrds_glc>
-          <nthrds_wav>6</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>512</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>512</rootpe_ice>
-          <rootpe_ocn>2312</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%0.23x0.31_oi%tx0.1v2">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM.+CICE.+POP" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1440</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>1440</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>2048</ntasks_ocn>
-          <ntasks_glc>1440</ntasks_glc>
-          <ntasks_wav>1440</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>1440</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%0.9x1.25_oi%gx1v6">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM4.+CICE.+DOCN%DOM" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>3600</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>3600</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>512</ntasks_ocn>
-          <ntasks_glc>3600</ntasks_glc>
-          <ntasks_wav>3600</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4_l%0.23x0.31_oi%tx0.1v2">
-    <mach name="hopper|titan|stampede|janus">
-      <pes compset="CAM.+CLM4.+CICE.+DOCN%DOM" pesize="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>14400</ntasks_atm>
-          <ntasks_lnd>512</ntasks_lnd>
-          <ntasks_rof>14400</ntasks_rof>
-          <ntasks_ice>512</ntasks_ice>
-          <ntasks_ocn>512</ntasks_ocn>
-          <ntasks_glc>14400</ntasks_glc>
-          <ntasks_wav>14400</ntasks_wav>
-          <ntasks_cpl>512</ntasks_cpl>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>0</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-</config_pes>
diff --git a/config/acme/allactive/config_pes.xml.cime2 b/config/acme/allactive/config_pes.xml.cime2
deleted file mode 100644
index ecb6dfd95fe5..000000000000
--- a/config/acme/allactive/config_pes.xml.cime2
+++ /dev/null
@@ -1,1439 +0,0 @@
-<?xml version="1.0"?>
-
-<pesinfo>
-
-<!--
-
-  ==============================================================
-  Notes about the interpretation of attributes in this file (by
-  ConfigCase.pm : set_pes)
-  ==============================================================
-
-  GRID: the value of the attribute can match either the beginning or
-  end of the grid specification
-
-  CCSM_LCOMPSET: the value of the attribute can match ANYWHERE in the
-  long compset name (similar to GEN_COMPSET_MATCH in
-  config_compsets.xml). Note, though, that this uses regular
-  expressions, so you can match B compsets using CCSM_LCOMPSET="^B". 
-
-  TEST: Matches on testname + test options (PET_PT_D) 
-  The test name can be either specified as a text string, or with
-  a regular expression.  If one wants to allow a specific test, 
-  input the test name as a string. 
-  If one wants to DISALLOW the pe layout for a specific test use 
-  the following regex, which will be passed along to 
-  ConfigCase->set_pes: TEST="^(?:(?!PATTERN).)*$", and replace
-  PATTERN with the desired test name. 
-
-  All other attributes: the value of the attribute must match the
-  beginning of the variable.
-
-  ==============================================================
-  Matching compsets
-  ==============================================================
-
-  Compsets should be matched using their long name (using
-  CCSM_LCOMPSET), NOT their short name. This allows for the use of
-  compsets that do not have a short name.
-  
--->
-
-<!-- -----------------------------------------------------------------------------
- tasks/thread setup - default
- ----------------------------------------------------------------------------- -->
-
-<pes>
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_WAV>$NTASKS_ATM</NTASKS_WAV> <NTHRDS_WAV>$NTHRDS_ATM</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_ATM</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes MACH="lawrencium-lr2|lawrencium-lr3">
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>netcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<!-- Default settings for dead atm or CLM with DATM use one full node -->
-<pes CCSM_LCOMPSET="XATM|DATM.+CLM" >
-    <NTASKS_ATM>$MAX_TASKS_PER_NODE</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>2cm</PES_LEVEL>
-</pes>
-
-<!-- Default settings for edison, one full node using SMT -->
-<pes MACH="edison">
-  <NTASKS_ATM>12</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM><NINST_ATM>1</NINST_ATM>
-</pes>
-
-<!-- Default settings for eos, one full node using SMT -->
-<pes MACH="eos">
-  <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM><NINST_ATM>1</NINST_ATM>
-</pes>
-
-
-
-<!-- Default settings based on grids -->
-
-<pes GRID="a%ne16np4">
-  <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM><NINST_ATM>1</NINST_ATM>
-</pes>
-
-<pes GRID="a%ne240np4">
-    <NTASKS_ATM>2048</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-
-
-<pes GRID="a%ne120np4">
-    <NTASKS_ATM>1024</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne120np4" MACH="titan|stampede|bluewaters|edison|eos|corip1">
-    <NTASKS_ATM>4800</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>24</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne120np4" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="titan|stampede|bluewaters">
-    <NTASKS_ATM>3200</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>1600</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>1600</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>1600</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>32</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$NTASKS_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4">
-    <NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4" MACH="melvin">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-</pes>
-
-<pes GRID="a%ne30np4" MACH="edison">
-    <NTASKS_ATM>960</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>24</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4" MACH="eos">
-    <NTASKS_ATM>960</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>32</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4" MACH="blues" CCSM_LCOMPSET="XATM|DATM.+CLM" >
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <PES_LEVEL>2cm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4" MACH="titan|stampede|bluewaters">
-    <NTASKS_ATM>1280</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4" MACH="hopper">
-    <NTASKS_ATM>1200</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4_l%ne30np4_oi%gx1v6" MACH="hopper">
-    <NTASKS_ATM>1200</NTASKS_ATM><NTHRDS_ATM>2</NTHRDS_ATM><ROOTPE_ATM>0</ROOTPE_ATM><NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>600</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>600</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>600</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>120</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>1200</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>1320</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4_l%ne30np4_oi%gx1v6" MACH="titan|stampede|bluewaters">
-    <NTASKS_ATM>2000</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>960</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>1040</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>960</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>32</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>2000</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>960</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>32</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4_l%ne30np4_oi%oEC60to30_r%r05_m%oEC60to30_g%null_w%null" MACH="redsky">
-    <NTASKS_ATM>256</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-    <PES_LEVEL>0</PES_LEVEL>
-</pes>
-
-<pes PECOUNT="T" >
-    <NTASKS_ATM>4</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>0p</PES_LEVEL>
-</pes>
-
-<pes PECOUNT="T" MACH="redsky|skybridge">
-    <NTASKS_ATM>128</NTASKS_ATM>         <NTHRDS_ATM>4</NTHRDS_ATM>           <ROOTPE_ATM>0</ROOTPE_ATM>           <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE>           <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN>           <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_WAV>$NTASKS_ATM</NTASKS_WAV> <NTHRDS_WAV>$NTHRDS_ATM</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_ATM</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-
-<pes MACH="anlworkstation">
-    <PIO_TYPENAME>netcdf</PIO_TYPENAME>
-</pes>
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID for one grid (not a pair of grids)
- ------------------------------------------------------------------------------->
-
-<pes GRID="a%T31">
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T31" MACH="edison">
-    <NTASKS_ATM>12</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-</pes>
-
-<pes GRID="a%T31" MACH="eos">
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-</pes>
-
-<pes GRID="a%T31" PECOUNT="T">
-    <NTASKS_ATM>4</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%4x5">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%4x5" PECOUNT="T">
-    <NTASKS_ATM>2</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62" MACH="edison">
-    <NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62" MACH="eos">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62" PECOUNT="T">
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T85" MACH="hopper|titan|stampede|janus">
-    <NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T85" PECOUNT="T">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T85" PECOUNT="T" MACH="edison|eos">
-    <NTASKS_ATM>24</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%1.9x2.5">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%1.9x2.5" MACH="edison|eos">
-    <NTASKS_ATM>96</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-</pes>
-
-<pes GRID="a%1.9x2.5" PECOUNT="T">
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%1.9x2.5" PECOUNT="T" MACH="edison|eos">
-    <NTASKS_ATM>24</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25" MACH="edison|eos">
-    <NTASKS_ATM>192</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25" PECOUNT="T">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25" PECOUNT="T" MACH="edison|eos">
-    <NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%360x720cru" >
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%360x720cru" MACH="edison">
-    <NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>48</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>48</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_ROF>48</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_OCN>48</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_GLC>48</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_WAV>48</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-    <NTASKS_CPL>48</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%360x720cru" MACH="redsky">
-    <NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>128</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>128</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_ROF>128</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_OCN>128</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_GLC>128</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_WAV>128</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-    <NTASKS_CPL>128</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-</pes>
-
-<pes GRID="a%ne16np4" MACH="edison">
-    <NTASKS_ATM>48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>48</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>48</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_ROF>48</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_OCN>48</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_GLC>48</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_WAV>48</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-    <NTASKS_CPL>48</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-</pes>
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="edison">
-     <NTASKS_ATM>960</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-     <NTASKS_LND>48</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>
-     <NTASKS_ICE>912</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE>48</ROOTPE_ICE>
-     <NTASKS_OCN>48</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN>960</ROOTPE_OCN>
-     <NTASKS_CPL>960</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-     <NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-     <PES_LEVEL>4rcmp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63">
-    <NTASKS_ATM>256</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63" PECOUNT="T">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.23x0.31">
-    <NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.23x0.31" PECOUNT="T">
-    <NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rp</PES_LEVEL>
-</pes>
-
-
-<pes GRID="a%ar9v">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1rc</PES_LEVEL>
-</pes>
-
-<pes GRID="a%wr50a">
-    <NTASKS_ATM>25</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ar9v1|a%ar9v3">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="ar9v2|ar9v4">
-    <NTASKS_ATM>40</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%wr50a_l%wr50a_l%ar9v">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>64</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>64</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>64</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>64</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>64</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes OS="BGP">
-    <PIO_TYPENAME>pnetcdf</PIO_TYPENAME>
-    <PIO_NUMTASKS>-8</PIO_NUMTASKS>
-</pes>
-
-<pes OS="BGQ">
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID independent, compset independent
- ------------------------------------------------------------------------------->
-
-
-<!-- Assure that we get the minimum required 512 nodes to run on mira  --->
-<pes MACH="mira" >
-<NTASKS_ATM>2048</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>2048</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>2048</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-<NTASKS_ROF>2048</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-<NTASKS_OCN>2048</NTASKS_OCN> <NTHRDS_OCN>16</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-<NTASKS_GLC>2048</NTASKS_GLC> <NTHRDS_GLC>16</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>2048</NTASKS_WAV> <NTHRDS_WAV>16</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>2048</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-<PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>64</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<!-- Assure that we get the minimum required 128 nodes to run on cetus  --->
-<pes MACH="cetus" >
-<NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-<NTASKS_ROF>512</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-<NTASKS_OCN>512</NTASKS_OCN> <NTHRDS_OCN>16</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-<NTASKS_GLC>512</NTASKS_GLC> <NTHRDS_GLC>16</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>512</NTASKS_WAV> <NTHRDS_WAV>16</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes MACH="cetus|mira" GRID="a%4x5">
-<NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>8</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>8</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-<NTASKS_ROF>8</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-<NTASKS_OCN>8</NTASKS_OCN> <NTHRDS_OCN>16</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-<NTASKS_GLC>8</NTASKS_GLC> <NTHRDS_GLC>16</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>8</NTASKS_WAV> <NTHRDS_WAV>16</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>8</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID: T62 atm grid
- ------------------------------------------------------------------------------->
-
-<pes GRID="a%T62.+oi%gx3">
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%gx3" PECOUNT="T">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>8</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>5</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>8</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>8</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>4</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%gx1|a%1.9x2.5.+oi%gx1" CCSM_LCOMPSET="DATM.+CICE.+POP"  >
-    <NTASKS_ATM> 1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND> 1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>16</ROOTPE_LND>
-    <NTASKS_ICE>32</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_OCN>96</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>32</ROOTPE_OCN>
-    <NTASKS_CPL>32</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC> 1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <PES_LEVEL>2rc</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%gx1" CCSM_LCOMPSET="DATM.+CICE.+POP" PECOUNT="L" >
-    <NTASKS_ATM>  1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>  1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE> 80</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_OCN>192</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN>80</ROOTPE_OCN>
-    <NTASKS_CPL> 80</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>  1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+DICE.+POP" PECOUNT="S" >
-    <NTASKS_ATM>  8</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>  8</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 8</ROOTPE_LND>
-    <NTASKS_ICE>  8</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>16</ROOTPE_ICE>
-    <NTASKS_GLC>  8</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>24</ROOTPE_GLC>
-    <NTASKS_CPL> 32</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_OCN>480</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>32</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+CICE.+DOCN" PECOUNT="S">
-    <NTASKS_ATM>  8</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>  8</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 8</ROOTPE_LND>
-    <NTASKS_OCN>  8</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>16</ROOTPE_OCN>
-    <NTASKS_GLC>  8</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>24</ROOTPE_GLC>
-    <NTASKS_CPL> 32</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_ICE>480</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>32</ROOTPE_ICE>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+CICE.+POP" PECOUNT="S" >
-    <NTASKS_ATM> 16</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>  8</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 16</ROOTPE_LND>
-    <NTASKS_GLC>  8</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 24</ROOTPE_GLC>
-    <NTASKS_CPL> 32</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_ICE>480</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE> 32</ROOTPE_ICE>
-    <NTASKS_OCN>480</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN> 32</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+DICE.+POP" PECOUNT="M" >
-    <NTASKS_ATM>  48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>  48</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 48</ROOTPE_LND>
-    <NTASKS_GLC>  48</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 96</ROOTPE_GLC>
-    <NTASKS_CPL>  48</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>144</ROOTPE_CPL>
-    <NTASKS_ICE>  48</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>192</ROOTPE_ICE>
-    <NTASKS_OCN>1024</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>  0</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+CICE.+DOCN" PECOUNT="M" >
-    <NTASKS_ATM>  48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>  48</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 48</ROOTPE_LND>
-    <NTASKS_GLC>  48</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 96</ROOTPE_GLC>
-    <NTASKS_CPL>  48</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>144</ROOTPE_CPL>
-    <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_OCN>  48</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>192</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+CICE.+POP" PECOUNT="M" >
-    <NTASKS_ATM>  48</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>  48</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 48</ROOTPE_LND>
-    <NTASKS_GLC>  48</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 96</ROOTPE_GLC>
-    <NTASKS_CPL>  48</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>144</ROOTPE_CPL>
-    <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_OCN>1024</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>  0</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62.+oi%tx0.1v2" CCSM_LCOMPSET="DATM.+CICE.+POP" PECOUNT="M" MACH="edison|eos">
-    <NTASKS_ATM>  48</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>  48</NTASKS_LND> <NTHRDS_LND>2</NTHRDS_LND> <ROOTPE_LND> 48</ROOTPE_LND>
-    <NTASKS_GLC>  48</NTASKS_GLC> <NTHRDS_GLC>2</NTHRDS_GLC> <ROOTPE_GLC> 96</ROOTPE_GLC>
-    <NTASKS_CPL>  48</NTASKS_CPL> <NTHRDS_CPL>2</NTHRDS_CPL> <ROOTPE_CPL>144</ROOTPE_CPL>
-    <NTASKS_ICE>960</NTASKS_ICE> <NTHRDS_ICE>2</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_OCN>960</NTASKS_OCN> <NTHRDS_OCN>2</NTHRDS_OCN> <ROOTPE_OCN>  0</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62" CCSM_LCOMPSET="POP2%ECO" MACH="edison">
-    <NTASKS_ATM>96</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID: low-res atm grid
- ----------------------------------------------------------------------------- -->
-
-<pes GRID="a%4x5.+oi%4x5" PECOUNT="T">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>8</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>6</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>8</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>8</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>8</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%4x5.+oi%gx3" PECOUNT="T">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>8</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>5</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>8</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>8</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>4</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T31.+oi%gx3" PECOUNT="T">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>8</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>5</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>8</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>8</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>4</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID: medium res atm grid
- ------------------------------------------------------------------------------->
-
-<pes GRID="a%1.9x2.5_l%1.9x2.5_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="hopper|titan|stampede|janus" >
-    <NTASKS_ATM>160</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>160</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>
-    <NTASKS_ICE>160</NTASKS_ICE> <NTHRDS_ICE>2</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_CPL>160</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>160</NTASKS_GLC> <NTHRDS_GLC>2</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <NTASKS_OCN>240</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>160</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%1.9x2.5_l%1.9x2.5_oi%gx1" PECOUNT="T">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>32</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>32</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>32</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>32</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>32</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%1.9x2.5_l%1.9x2.5_oi%1.9x2.5" PECOUNT="T" >
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>32</NTASKS_LND> <NTHRDS_LND>2</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>32</NTASKS_ICE> <NTHRDS_ICE>2</NTHRDS_ICE> <ROOTPE_ICE>32</ROOTPE_ICE>
-    <NTASKS_OCN>64</NTASKS_OCN> <NTHRDS_OCN>2</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>64</NTASKS_CPL> <NTHRDS_CPL>2</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>64</NTASKS_GLC> <NTHRDS_GLC>2</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" PECOUNT="T">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>32</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>32</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>32</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>32</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>32</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>2rp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="titan|stampede">
-    <NTASKS_ATM>384</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND> 64</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>
-    <NTASKS_ICE>320</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE> 64</ROOTPE_ICE>
-    <NTASKS_OCN> 32</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN>384</ROOTPE_OCN>
-    <NTASKS_CPL> 64</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>384</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="hopper">
-    <NTASKS_ATM>768</NTASKS_ATM> <NTHRDS_ATM>3</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>128</NTASKS_LND> <NTHRDS_LND>3</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>
-    <NTASKS_ICE>640</NTASKS_ICE> <NTHRDS_ICE>3</NTHRDS_ICE> <ROOTPE_ICE>128</ROOTPE_ICE>
-    <NTASKS_OCN> 60</NTASKS_OCN> <NTHRDS_OCN>3</NTHRDS_OCN> <ROOTPE_OCN>768</ROOTPE_OCN>
-    <NTASKS_CPL>128</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>768</NTASKS_GLC> <NTHRDS_GLC>3</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%T62_l%T62_oi%gx1" CCSM_LCOMPSET="DATM.+CICE.+POP|DATM.+DICE.+POP|DATM.+CICE.+DOCN" MACH="titan|stampede">
-    <NTASKS_ATM>128</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>128</NTASKS_LND> <NTHRDS_LND>2</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>
-    <NTASKS_ICE>128</NTASKS_ICE> <NTHRDS_ICE>2</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_OCN>128</NTASKS_OCN> <NTHRDS_OCN>2</NTHRDS_OCN> <ROOTPE_OCN>  0</ROOTPE_OCN>
-    <NTASKS_CPL>128</NTASKS_CPL> <NTHRDS_CPL>2</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>128</NTASKS_GLC> <NTHRDS_GLC>2</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="WRF.+CLM.+DICE.+DOCN" >
-    <NTASKS_ATM>120</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND> 96</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE> 12</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>96</ROOTPE_ICE>
-    <NTASKS_OCN> 12</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>108</ROOTPE_OCN>
-    <NTASKS_CPL> 96</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>  1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>1c</PES_LEVEL>
-</pes>
-
-<pes GRID="wr50a_ar9v" CCSM_LCOMPSET="^X">
-    <NTASKS_ATM>25</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>25</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>32</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>32</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>64</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC> 1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>2rc</PES_LEVEL>
-</pes>
-
-<pes GRID="wr50a_ar9v" CCSM_LCOMPSET="^RB|^RJ">
-    <NTASKS_ATM>256</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>  1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>256</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>256</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>256</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>  1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>2rc</PES_LEVEL>
-</pes>
-
-<pes GRID="wr50a_ar9v" CCSM_LCOMPSET="^RL|^RK">
-    <NTASKS_ATM>256</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>  1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE> 16</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN> 16</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>256</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>  1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>2rc</PES_LEVEL>
-</pes>
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID: hi-res atm grid
- ------------------------------------------------------------------------------->
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" MACH="mira|cetus" >
-<NTASKS_ATM>1525</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>71</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-<NTASKS_ICE>1454</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE> 71</ROOTPE_ICE>
-<NTASKS_ROF>71</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF> 0</ROOTPE_ROF>
-<NTASKS_OCN>256</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>1525</ROOTPE_OCN>
-<NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>$NTASKS_ATM</NTASKS_WAV> <NTHRDS_WAV>$NTHRDS_ATM</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_ATM</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%gx1" CCSM_LCOMPSET="DATM.+CLM"  MACH="cetus|mira" >
-<NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-<NTASKS_ROF>512</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-<NTASKS_OCN>512</NTASKS_OCN> <NTHRDS_OCN>16</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-<NTASKS_GLC>512</NTASKS_GLC> <NTHRDS_GLC>16</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>512</NTASKS_WAV> <NTHRDS_WAV>16</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25" MACH="mira|cetus" >
-<NTASKS_ATM>1525</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>71</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-<NTASKS_ICE>1454</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE> 71</ROOTPE_ICE>
-<NTASKS_ROF>71</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF> 0</ROOTPE_ROF>
-<NTASKS_OCN>256</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>1525</ROOTPE_OCN>
-<NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>$NTASKS_ATM</NTASKS_WAV> <NTHRDS_WAV>$NTHRDS_ATM</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_ATM</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP">
-    <NTASKS_ATM>496</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>176</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>320</ROOTPE_LND>
-    <NTASKS_ICE>320</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_CPL>160</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>496</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <NTASKS_OCN> 16</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>496</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="hopper|titan|stampede|janus">
-    <NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>192</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND>320</ROOTPE_LND>
-    <NTASKS_ICE>320</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>512</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <NTASKS_OCN> 64</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>512</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" PECOUNT="S">
-    <NTASKS_ATM>480</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>416</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>480</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_CPL>480</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>480</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_OCN>480</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" PECOUNT="M">
-    <NTASKS_ATM>1024</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND> 416</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_CPL>1024</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>1024</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_OCN>1024</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" PECOUNT="L">
-    <NTASKS_ATM> 480</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND> 416</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>  0</ROOTPE_LND>
-    <NTASKS_ICE> 480</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_CPL> 432</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC> 480</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <NTASKS_OCN>1232</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>480</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" PECOUNT="X1">
-    <NTASKS_ATM>1024</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND> 416</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>   0</ROOTPE_LND>
-    <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>   0</ROOTPE_ICE>
-    <NTASKS_CPL> 432</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>1024</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>2356</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>1024</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" PECOUNT="X2">
-    <NTASKS_ATM>1664</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND> 416</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>   0</ROOTPE_LND>
-    <NTASKS_ICE>1800</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>   0</ROOTPE_ICE>
-    <NTASKS_CPL> 432</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>1664</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>3476</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>1800</ROOTPE_OCN>
-    <PES_LEVEL>3rcp</PES_LEVEL>
-</pes>
-
-
-
-<pes GRID="a%0.23x0.31_l%0.23x0.31_oi%gx1" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP">
-    <NTASKS_ATM>496</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-    <NTASKS_LND>336</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>160</ROOTPE_LND>
-    <NTASKS_ICE>160</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-    <NTASKS_CPL>160</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-    <NTASKS_GLC>496</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>  0</ROOTPE_GLC>
-    <NTASKS_OCN> 16</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>496</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - GRID: cube sphere atm grid
- ------------------------------------------------------------------------------->
-
-<pes GRID="a%ne30np4_l%ne30np4_oi%ne30np4" MACH="mira|cetus" >
-<NTASKS_ATM>2048</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>2048</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>2048</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-<NTASKS_ROF>2048</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-<NTASKS_OCN>2048</NTASKS_OCN> <NTHRDS_OCN>16</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-<NTASKS_GLC>2048</NTASKS_GLC> <NTHRDS_GLC>16</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-<NTASKS_WAV>2048</NTASKS_WAV> <NTHRDS_WAV>16</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-<NTASKS_CPL>2048</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne30np4_l%ne30np4_oi%gx1v6" MACH="mira|cetus" >
-<NTASKS_ATM>1916</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>120</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>1796</NTASKS_ICE> <NTHRDS_ICE>16</NTHRDS_ICE> <ROOTPE_ICE> 120</ROOTPE_ICE>
-<NTASKS_ROF>120</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF> 0</ROOTPE_ROF>
-<NTASKS_OCN>132</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>1916</ROOTPE_OCN>
-<NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>1916</NTASKS_WAV> <NTHRDS_WAV>$NTHRDS_ATM</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_ATM</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>1916</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne240np4_l%0.23x0.31_oi%gx1">
-    <NTASKS_ATM>2560</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>1536</ROOTPE_ATM>
-    <NTASKS_LND> 512</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 512</ROOTPE_LND>
-    <NTASKS_ICE> 512</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>   0</ROOTPE_ICE>
-    <NTASKS_OCN> 512</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>   0</ROOTPE_OCN>
-    <NTASKS_CPL> 512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>1023</ROOTPE_CPL>
-    <NTASKS_GLC>2560</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>1536</ROOTPE_GLC>
-    <PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne240np4_l%0.23x0.31_oi%gx1" MACH="edison|eos">
-    <NTASKS_ATM>9600</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND> 960</NTASKS_LND> <NTHRDS_LND>4</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE> 960</NTASKS_ICE> <NTHRDS_ICE>4</NTHRDS_ICE> <ROOTPE_ICE>960</ROOTPE_ICE>
-    <NTASKS_OCN> 960</NTASKS_OCN> <NTHRDS_OCN>4</NTHRDS_OCN> <ROOTPE_OCN>1920</ROOTPE_OCN>
-    <NTASKS_CPL> 960</NTASKS_CPL> <NTHRDS_CPL>4</NTHRDS_CPL> <ROOTPE_CPL>3880</ROOTPE_CPL>
-    <NTASKS_GLC> 960</NTASKS_GLC> <NTHRDS_GLC>4</NTHRDS_GLC> <ROOTPE_GLC>4840</ROOTPE_GLC>
-    <NTASKS_ROF> 960</NTASKS_ROF> <NTHRDS_ROF>4</NTHRDS_ROF> <ROOTPE_ROF>5800</ROOTPE_ROF>
-    <PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne240np4_l%0.23x0.31_oi%tx0.1v2">
-    <NTASKS_ATM>2048</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND> 112</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>2048</ROOTPE_LND>
-    <NTASKS_ICE>1800</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>2160</ROOTPE_ICE>
-    <NTASKS_CPL>2048</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>2048</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>4028</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>3960</ROOTPE_OCN>
-    <PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-
-<!-- Resolution/machine specific PE layouts -->
-
-<pes GRID="a%T341_l%T341_oi%T341" CCSM_LCOMPSET="CAM.+CLM4.+CICE.+DOCN%DOM" MACH="hopper|titan|stampede|janus">
-    <NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>6</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>6</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>512</NTASKS_GLC> <NTHRDS_GLC>6</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_OCN>512</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <PES_LEVEL>2rm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%0.23x0.31_l%0.23x0.31_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="hopper|janus" >
-    <NTASKS_ATM>2048</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND> 112</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>2048</ROOTPE_LND>
-    <NTASKS_ICE>1800</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>2160</ROOTPE_ICE>
-    <NTASKS_CPL>1800</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>2048</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>4028</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>3960</ROOTPE_OCN>
-    <PES_LEVEL>4rcmp</PES_LEVEL>
-</pes>
-
-<!-- WJS (3/28/12): This is based on the PE layout for hopper/kraken/franklin/janus,
-     above, but that uses a partial node for the ocean on titan|stampede (which has 16
-     pes/node). The layout here uses the closest number of valid ocean PEs, and scales
-     other components similarly. -->
-<pes GRID="a%0.23x0.31_l%0.23x0.31_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="titan|stampede" >
-    <NTASKS_ATM>1824</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND> 112</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>1824</ROOTPE_LND>
-    <NTASKS_ICE>1600</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>1936</ROOTPE_ICE>
-    <NTASKS_CPL>1600</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>1824</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>3600</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>3536</ROOTPE_OCN>
-    <PES_LEVEL>4rcmp</PES_LEVEL>
-</pes>
-
-<!-- WJS (3/28/12): This PE layout uses a partial node for ice on titan (which has 16
-     pes/node); however, I haven't changed the layout because this doesn't seem to be a
-     valid resolution, so I can't test any changes -->
-<pes GRID="a%T341_l%T341_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="hopper|titan|stampede|janus" >
-    <NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>6</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>6</NTHRDS_LND> <ROOTPE_LND>   512</ROOTPE_LND>
-    <NTASKS_ICE>1800</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  512</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>512</NTASKS_GLC> <NTHRDS_GLC>6</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>2048</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN> 2312</ROOTPE_OCN>
-    <PES_LEVEL>4rcmp</PES_LEVEL>
-</pes>
-
-<!-- WJS (3/28/12): This PE layout uses a partial node for ice on titan|stampede (which has 16
-     pes/node); however, I haven't changed the layout because I am unable to test this
-     resolution (the scripts match 0.23x0.31_oi%tx0.1v2 rather than T341_l%0.23x0.31_oi%tx0.1v2) -->
-<pes GRID="a%T341_l%0.23x0.31_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP" MACH="hopper|titan|stampede|janus" >
-    <NTASKS_ATM>512</NTASKS_ATM> <NTHRDS_ATM>6</NTHRDS_ATM> <ROOTPE_ATM>   0</ROOTPE_ATM>
-    <NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>6</NTHRDS_LND> <ROOTPE_LND>   512</ROOTPE_LND>
-    <NTASKS_ICE>1800</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>  512</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>   0</ROOTPE_CPL>
-    <NTASKS_GLC>512</NTASKS_GLC> <NTHRDS_GLC>6</NTHRDS_GLC> <ROOTPE_GLC>   0</ROOTPE_GLC>
-    <NTASKS_OCN>2048</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN> 2312</ROOTPE_OCN>
-    <PES_LEVEL>4rcmp</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne120np4_l%0.23x0.31_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM.+CICE.+POP"  MACH="hopper|titan|stampede|janus">
-    <NTASKS_ATM>1440</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>1440</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>2048</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN> 1440</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne120np4_l%0.9x1.25_oi%gx1v6" CCSM_LCOMPSET="CAM.+CLM4.+CICE.+DOCN%DOM" MACH="hopper|titan|stampede|janus">
-    <NTASKS_ATM>3600</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>3600</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>512</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes GRID="a%ne120np4_l%0.23x0.31_oi%tx0.1v2" CCSM_LCOMPSET="CAM.+CLM4.+CICE.+DOCN%DOM" MACH="hopper|titan|stampede|janus">
-    <NTASKS_ATM>14400</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 0</ROOTPE_ATM>
-    <NTASKS_LND>512</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE> 0</ROOTPE_ICE>
-    <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL> 0</ROOTPE_CPL>
-    <NTASKS_GLC>14400</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC> 0</ROOTPE_GLC>
-    <NTASKS_OCN>512</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN> 0</ROOTPE_OCN>
-    <PES_LEVEL>3rcm</PES_LEVEL>
-</pes>
-
-<pes>
-    <NTASKS_ROF>$NTASKS_LND</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_LND</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_LND</ROOTPE_ROF>
-</pes>
-
-
-
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - independent of atmosphere grid, dependent on GLC grid
- ------------------------------------------------------------------------------->
- 
-<pes CCSM_LCOMPSET="DLND.+CISM2P" CISM_GRID="gland5">
-    <NTASKS_ATM>192</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>192</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>192</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>192</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>192</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>192</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-</pes>
-
-<pes CCSM_LCOMPSET="DLND.+_CISM2P" CISM_GRID="gland10">
-    <NTASKS_ATM>96</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>96</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>96</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>96</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>96</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>96</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-</pes>
-
-<pes CCSM_LCOMPSET="DLND.+_CISM2P" CISM_GRID="gland20">
-    <NTASKS_ATM>32</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>32</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>32</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>32</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>32</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>32</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-</pes>
-
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup - final overrides
- ------------------------------------------------------------------------------->
-
-<!-- TG compset... this needs to be near the end of config_pes.xml so
-     that it overrides settings based on (e.g.) resolution -->
-<pes CCSM_LCOMPSET="DLND.+CISM1|DLND.+CISM2S">
-    <NTASKS_ATM>1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ICE>1</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>1</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>1</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <PES_LEVEL>1c</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="_CISM1|_CISM2S" >
-    <NTASKS_GLC>1</NTASKS_GLC>  <ROOTPE_GLC>$ROOTPE_CPL</ROOTPE_GLC>
-</pes>
-
-<!-- Threading is broken for CLUBB.  Only use 1 thread with CLUBB
-     compsets.  -->
-<pes CCSM_LCOMPSET="CLB">
-    <NTHRDS_ATM>1</NTHRDS_ATM>
-    <NTHRDS_LND>1</NTHRDS_LND>
-    <NTHRDS_ROF>1</NTHRDS_ROF>
-    <NTHRDS_ICE>1</NTHRDS_ICE>
-    <NTHRDS_OCN>1</NTHRDS_OCN>
-    <NTHRDS_CPL>1</NTHRDS_CPL>
-    <NTHRDS_GLC>1</NTHRDS_GLC>
-</pes>
-
-<!-- Moby is not thread-safe, so using the "darwin" ocean tracer module
-     option requires using a single ocean thread -->
-<pes CCSM_LCOMPSET="POP2%DAR">
-    <NTHRDS_OCN>1</NTHRDS_OCN>
-</pes>
-
-<!-- Threading I compsets generally leads to worse performance, so
-     force a single thread for I compsets -->
-<pes CCSM_LCOMPSET="DATM.+CLM">
-    <NTHRDS_ATM>1</NTHRDS_ATM>
-    <NTHRDS_LND>1</NTHRDS_LND>
-    <NTHRDS_ROF>1</NTHRDS_ROF>
-    <NTHRDS_ICE>1</NTHRDS_ICE>
-    <NTHRDS_OCN>1</NTHRDS_OCN>
-    <NTHRDS_CPL>1</NTHRDS_CPL>
-    <NTHRDS_GLC>1</NTHRDS_GLC>
-</pes>
-
-
-<!--- fully concurrent for testing --->
-<pes PECOUNT="FC" >
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 8</ROOTPE_ATM>
-    <NTASKS_LND>2</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ROF>2</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF> 2</ROOTPE_ROF>
-    <NTASKS_ICE>4</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE> 4</ROOTPE_ICE>
-    <NTASKS_OCN>8</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>24</ROOTPE_OCN>
-    <NTASKS_GLC>4</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>20</ROOTPE_GLC>
-    <NTASKS_CPL>4</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>16</ROOTPE_CPL>
-    <PES_LEVEL>1p</PES_LEVEL>
-</pes>
-
-<pes PECOUNT="FC" MACH="edison" >
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 8</ROOTPE_ATM>
-    <NTASKS_LND>4</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ROF>4</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>12 </ROOTPE_ROF>
-    <NTASKS_ICE>8</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>16</ROOTPE_ICE>
-    <NTASKS_OCN>8</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>24</ROOTPE_OCN>
-    <NTASKS_GLC>4</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>32</ROOTPE_GLC>
-    <NTASKS_CPL>8</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>36</ROOTPE_CPL>
-    <NTASKS_WAV>4</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>44</ROOTPE_WAV>
-    <PES_LEVEL>1p</PES_LEVEL>
-</pes>
-
-<pes PECOUNT="FC" MACH="eos" >
-    <NTASKS_ATM>4</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM> 4</ROOTPE_ATM>
-    <NTASKS_LND>4</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND> 0</ROOTPE_LND>
-    <NTASKS_ROF>4</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF> 8 </ROOTPE_ROF>
-    <NTASKS_ICE>4</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>12</ROOTPE_ICE>
-    <NTASKS_OCN>4</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>16</ROOTPE_OCN>
-    <NTASKS_GLC>4</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>20</ROOTPE_GLC>
-    <NTASKS_CPL>4</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>24</ROOTPE_CPL>
-    <NTASKS_WAV>4</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>28</ROOTPE_WAV>
-    <PES_LEVEL>1p</PES_LEVEL>
-</pes>
-
-<!-- -----------------------------------------------------------------------------
-  tasks/thread setup - GRID independent, compset dependent
- ----------------------------------------------------------------------------- -->
-
-<pes CCSM_LCOMPSET="XATM">
-    <NTASKS_ATM>16</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1c</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="XATM" PECOUNT="T">
-    <NTASKS_ATM>4</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1c</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="SATM">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1c</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="SATM" PECOUNT="T">
-    <NTASKS_ATM>2</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1c</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="DATM.+DLND.+DICE.+DOCN%DOM.+DROF" PECOUNT="T">
-    <NTASKS_ATM>2</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>2cp</PES_LEVEL>
-</pes>
-
-
-<pes CCSM_LCOMPSET="DATM.+DLND.+DICE.+DOCN%DOM.+DROF" MACH="hopper|janus" PECOUNT="T">
-    <NTASKS_ATM>6</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>2cmp</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="DATM.+DLND.+DICE.+DOCN%DOM.+DROF" MACH="titan|stampede" PECOUNT="T">
-    <NTASKS_ATM>8</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>2cmp</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="DATM.+DLND.+DICE.+DOCN%DOM.+DROF" >
-    <NTASKS_ATM>$MAX_TASKS_PER_NODE</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>2cmp</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="DATM.+DLND.+DICE.+DOCN%DOM.+DROF" PECOUNT="T">
-    <NTASKS_ATM>$MAX_TASKS_PER_NODE</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>2cmp</PES_LEVEL>
-</pes>
-
-<!-- We use less number of tasks for the acme dev tests (this allows us to fit
-     all tests in the cetus queue, i.e., < 1024 node hrs) --->
-<pes MACH="cetus" TEST="^.+$">
-<NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>16</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-<NTASKS_LND>64</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-<NTASKS_ICE>64</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE>  <ROOTPE_ICE>0</ROOTPE_ICE>
-<NTASKS_ROF>64</NTASKS_ROF> <NTHRDS_ROF>16</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-<NTASKS_OCN>64</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN>  <ROOTPE_OCN>0</ROOTPE_OCN>
-<NTASKS_GLC>64</NTASKS_GLC> <NTHRDS_GLC>16</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-<NTASKS_WAV>64</NTASKS_WAV> <NTHRDS_WAV>16</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-<NTASKS_CPL>64</NTASKS_CPL> <NTHRDS_CPL>16</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-<PES_LEVEL>1m</PES_LEVEL>
-</pes>
-
-<!-- -----------------------------------------------------------------------------
-  tasks/thread setup - special case - GRID for CLM single-point regional grids
-  These ONLY can be used for I compsets CCSM_LCOMPSET=DATM.+CLM
- ----------------------------------------------------------------------------- -->
-
-<pes GRID="a%CLM_USRDAT" >
-    <NTASKS_ATM>1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%1x1_" >
-    <NTASKS_ATM>1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ROF>1</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_ICE>1</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>1</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>1</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>1</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_WAV>1</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes GRID="a%5x5_" >
-    <NTASKS_ATM>5</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET=".+DATM.+SLND.+DICE.+MPASO.+DROF.+MPASLI.+SWAV">
-    <NTASKS_ATM>64</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>64</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ROF>64</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_ICE>64</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>64</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>64</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>8</NTASKS_GLC>  <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_WAV>64</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<!-- Task/thread setups for watercycle cases -->
-
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" MACH="edison">
-     <NTASKS_ATM>960</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-     <NTASKS_LND>960</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-     <NTASKS_ICE>960</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-     <NTASKS_OCN>960</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-     <NTASKS_ROF>960</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-     <NTASKS_GLC>960</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-     <NTASKS_WAV>960</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-     <NTASKS_CPL>960</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-     <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" MACH="corip1">
-     <NTASKS_ATM>1024</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-     <NTASKS_LND>1024</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-     <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-     <NTASKS_OCN>1024</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-     <NTASKS_ROF>1024</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-     <NTASKS_GLC>1024</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-     <NTASKS_WAV>1024</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-     <NTASKS_CPL>1024</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-     <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" MACH="titan">
-     <NTASKS_ATM>675</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>  0</ROOTPE_ATM>
-     <NTASKS_LND>168</NTASKS_LND> <NTHRDS_LND>2</NTHRDS_LND> <ROOTPE_LND>512</ROOTPE_LND>
-     <NTASKS_ICE>512</NTASKS_ICE> <NTHRDS_ICE>2</NTHRDS_ICE> <ROOTPE_ICE>  0</ROOTPE_ICE>
-     <NTASKS_OCN>512</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>680</ROOTPE_OCN>
-     <NTASKS_ROF>168</NTASKS_ROF> <NTHRDS_ROF>2</NTHRDS_ROF> <ROOTPE_ROF>512</ROOTPE_ROF>
-     <NTASKS_GLC>  1</NTASKS_GLC> <NTHRDS_GLC>2</NTHRDS_GLC> <ROOTPE_GLC>512</ROOTPE_GLC>
-     <NTASKS_WAV>512</NTASKS_WAV> <NTHRDS_WAV>2</NTHRDS_WAV> <ROOTPE_WAV>  0</ROOTPE_WAV>
-     <NTASKS_CPL>512</NTASKS_CPL> <NTHRDS_CPL>2</NTHRDS_CPL> <ROOTPE_CPL>  0</ROOTPE_CPL>
-     <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" MACH="mira|cetus">
-     <NTASKS_ATM>1024</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-     <NTASKS_LND>1024</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-     <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-     <NTASKS_OCN>1024</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-     <NTASKS_ROF>1024</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-     <NTASKS_GLC>1024</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-     <NTASKS_WAV>1024</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-     <NTASKS_CPL>1024</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-     <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" MACH="blues">
-     <NTASKS_ATM>1024</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-     <NTASKS_LND>1024</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-     <NTASKS_ICE>1024</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-     <NTASKS_OCN>1024</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-     <NTASKS_ROF>1024</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-     <NTASKS_GLC>1024</NTASKS_GLC> <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>
-     <NTASKS_WAV>1024</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-     <NTASKS_CPL>1024</NTASKS_CPL> <NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-     <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<!-- PEs for -compset A_WCYCL -res ne120_oRRS18to6 -->
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" GRID="a%ne120np4_l%ne120np4_oi%oRRS18to6_r%r0.+_m%oRRS18to6_g%null_w%null" MACH="titan|edison|corip1">
-    <NTASKS_ATM>9600</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_WAV>1</NTASKS_WAV>           <NTHRDS_WAV>1</NTHRDS_WAV>           <ROOTPE_WAV>0</ROOTPE_WAV>           <NINST_WAV>1</NINST_WAV>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" GRID="a%ne120np4_l%ne120np4_oi%oRRS18to6_r%r0.+_m%oRRS18to6_g%null_w%null" MACH="mira">
-    <NTASKS_ATM>7200</NTASKS_ATM><NTHRDS_ATM>16</NTHRDS_ATM><ROOTPE_ATM>0</ROOTPE_ATM>   <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>256</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND><ROOTPE_LND>0</ROOTPE_LND>   <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>6688</NTASKS_ICE><NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>512</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>992</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>7200</ROOTPE_OCN><NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>7200</NTASKS_CPL><NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>1</NTASKS_GLC>   <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>   <NINST_GLC>1</NINST_GLC>
-    <NTASKS_ROF>256</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>256</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_WAV>1</NTASKS_WAV>   <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>   <NINST_WAV>1</NINST_WAV>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>64</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-
-
-<!-- PEs for -compset A_WCYCL -res ne120_oRRS15to5 -->
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" GRID="a%ne120np4_l%ne120np4_oi%oRRS15to5_r%r0.+_m%oRRS15to5_g%null_w%null" MACH="titan|edison|corip1">
-    <NTASKS_ATM>9600</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM>   <ROOTPE_ATM>0</ROOTPE_ATM>      <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>$NTHRDS_ATM</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>$NTHRDS_ATM</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_WAV>1</NTASKS_WAV>           <NTHRDS_WAV>1</NTHRDS_WAV>           <ROOTPE_WAV>0</ROOTPE_WAV>           <NINST_WAV>1</NINST_WAV>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-<pes CCSM_LCOMPSET="CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.+SGLC.+SWAV" GRID="a%ne120np4_l%ne120np4_oi%oRRS15to5_r%r0.+_m%oRRS15to5_g%null_w%null" MACH="mira">
-    <NTASKS_ATM>7200</NTASKS_ATM><NTHRDS_ATM>16</NTHRDS_ATM><ROOTPE_ATM>0</ROOTPE_ATM>   <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>256</NTASKS_LND> <NTHRDS_LND>16</NTHRDS_LND><ROOTPE_LND>0</ROOTPE_LND>   <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>6688</NTASKS_ICE><NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>512</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>992</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>7200</ROOTPE_OCN><NINST_OCN>1</NINST_OCN>
-    <NTASKS_CPL>7200</NTASKS_CPL><NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>1</NTASKS_GLC>   <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>0</ROOTPE_GLC>   <NINST_GLC>1</NINST_GLC>
-    <NTASKS_ROF>256</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>256</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_WAV>1</NTASKS_WAV>   <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>   <NINST_WAV>1</NINST_WAV>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>64</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-
-<!-- PEs for -compset FC5AV1C-L -res ne120_ne120 -->
-<pes CCSM_LCOMPSET=".*CAM5.+CLM45.+CICE.+DOCN.+RTM.+SGLC.+SWAV" GRID="a%ne120np4_l%ne120np4_oi%ne120np4_r%r05_m%gx1v6_g%null_w%null" MACH="mira|cetus">
-  <NTASKS_ATM>7200</NTASKS_ATM>       <NTHRDS_ATM>16</NTHRDS_ATM><ROOTPE_ATM>0</ROOTPE_ATM>          <NINST_ATM>1</NINST_ATM>
-  <NTASKS_LND>992</NTASKS_LND>        <NTHRDS_LND>16</NTHRDS_LND><ROOTPE_LND>7200</ROOTPE_LND>       <NINST_LND>1</NINST_LND>
-  <NTASKS_ICE>$NTASKS_LND</NTASKS_ICE><NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>$ROOTPE_LND</ROOTPE_ICE><NINST_ICE>1</NINST_ICE>
-  <NTASKS_OCN>$NTASKS_LND</NTASKS_OCN><NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>$ROOTPE_LND</ROOTPE_OCN><NINST_OCN>1</NINST_OCN>
-  <NTASKS_ROF>$NTASKS_LND</NTASKS_ROF><NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_LND</ROOTPE_ROF><NINST_ROF>1</NINST_ROF>
-  <NTASKS_CPL>$NTASKS_LND</NTASKS_CPL><NTHRDS_CPL>1</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_LND</ROOTPE_CPL>
-  <NTASKS_GLC>1</NTASKS_GLC>          <NTHRDS_GLC>1</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_LND</ROOTPE_GLC><NINST_GLC>1</NINST_GLC>
-  <NTASKS_WAV>1</NTASKS_WAV>          <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_LND</ROOTPE_WAV><NINST_WAV>1</NINST_WAV>
-  <PIO_NUMTASKS>-1</PIO_NUMTASKS>     <PIO_STRIDE>64</PIO_STRIDE><PIO_TYPENAME>pnetcdf</PIO_TYPENAME><PIO_ROOT>1</PIO_ROOT>
-</pes>
-
-
-<!-- PEs for <test-name>_PT.* -->
-<pes PECOUNT="T" MACH="edison|corip1">
-    <NTASKS_ATM>240</NTASKS_ATM>         <NTHRDS_ATM>4</NTHRDS_ATM>           <ROOTPE_ATM>0</ROOTPE_ATM>           <NINST_ATM>1</NINST_ATM>
-    <NTASKS_LND>$NTASKS_ATM</NTASKS_LND> <NTHRDS_LND>$NTHRDS_ATM</NTHRDS_LND> <ROOTPE_LND>$ROOTPE_ATM</ROOTPE_LND> <NINST_LND>1</NINST_LND>
-    <NTASKS_ICE>$NTASKS_ATM</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE>           <ROOTPE_ICE>$ROOTPE_ATM</ROOTPE_ICE> <NINST_ICE>1</NINST_ICE>
-    <NTASKS_OCN>$NTASKS_ATM</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN>           <ROOTPE_OCN>$ROOTPE_ATM</ROOTPE_OCN> <NINST_OCN>1</NINST_OCN>
-    <NTASKS_ROF>$NTASKS_ATM</NTASKS_ROF> <NTHRDS_ROF>$NTHRDS_ATM</NTHRDS_ROF> <ROOTPE_ROF>$ROOTPE_ATM</ROOTPE_ROF> <NINST_ROF>1</NINST_ROF>
-    <NTASKS_CPL>$NTASKS_ATM</NTASKS_CPL> <NTHRDS_CPL>$NTHRDS_ATM</NTHRDS_CPL> <ROOTPE_CPL>$ROOTPE_ATM</ROOTPE_CPL>
-    <NTASKS_GLC>$NTASKS_ATM</NTASKS_GLC> <NTHRDS_GLC>$NTHRDS_ATM</NTHRDS_GLC> <ROOTPE_GLC>$ROOTPE_ATM</ROOTPE_GLC> <NINST_GLC>1</NINST_GLC>
-    <NTASKS_WAV>$NTASKS_ATM</NTASKS_WAV> <NTHRDS_WAV>$NTHRDS_ATM</NTHRDS_WAV> <ROOTPE_WAV>$ROOTPE_ATM</ROOTPE_WAV> <NINST_WAV>1</NINST_WAV>
-    <PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>-1</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
-</pes>
-
-
-<!-------------------------------------------------------------------------------
-  tasks/thread setup for MPASLIALB_ONLY compset on mira/cetus
- ----------------------------------------------------------------------------- -->
-<pes CCSM_LCOMPSET=".+SATM.+SLND.+SICE.+SOCN.+SROF.+MPASLIALB.+SWAV" MACH="mira|cetus">
-    <NTASKS_ATM>1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ROF>1</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_ICE>1</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>1</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>64</NTASKS_CPL><NTHRDS_CPL>16</NTHRDS_CPL><ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>64</NTASKS_GLC><NTHRDS_GLC>16</NTHRDS_GLC><ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_WAV>1</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-    <PES_LEVEL>1r</PES_LEVEL>
-</pes>
-
-<!-- Need more PEs on redsky for this test: using 64 instead of 8 -->
-<pes CCSM_LCOMPSET="MPASLIALB" MACH="redsky">
-    <NTASKS_ATM>1</NTASKS_ATM> <NTHRDS_ATM>1</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM>
-    <NTASKS_LND>1</NTASKS_LND> <NTHRDS_LND>1</NTHRDS_LND> <ROOTPE_LND>0</ROOTPE_LND>
-    <NTASKS_ROF>1</NTASKS_ROF> <NTHRDS_ROF>1</NTHRDS_ROF> <ROOTPE_ROF>0</ROOTPE_ROF>
-    <NTASKS_ICE>1</NTASKS_ICE> <NTHRDS_ICE>1</NTHRDS_ICE> <ROOTPE_ICE>0</ROOTPE_ICE>
-    <NTASKS_OCN>1</NTASKS_OCN> <NTHRDS_OCN>1</NTHRDS_OCN> <ROOTPE_OCN>0</ROOTPE_OCN>
-    <NTASKS_CPL>64</NTASKS_CPL><NTHRDS_CPL>1</NTHRDS_CPL><ROOTPE_CPL>0</ROOTPE_CPL>
-    <NTASKS_GLC>64</NTASKS_GLC><NTHRDS_GLC>1</NTHRDS_GLC><ROOTPE_GLC>0</ROOTPE_GLC>
-    <NTASKS_WAV>1</NTASKS_WAV> <NTHRDS_WAV>1</NTHRDS_WAV> <ROOTPE_WAV>0</ROOTPE_WAV>
-</pes>
-
-
-</pesinfo>