From f394d1ada07b248ccd81f08e82a9fa9927bb7a69 Mon Sep 17 00:00:00 2001
From: Chris Fischer <fischer@ucar.edu>
Date: Mon, 29 Jul 2024 16:55:20 -0600
Subject: [PATCH 1/7] Update for cesm3_0_beta02

---
 ChangeLog | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 244cb5e05..63e9f3682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+==============================================================
+Tag name: cesm3_0_beta02
+Originator(s): CSEG
+Date: 29 July 2024
+One-line Summary: CAM answer changes and other updates in preparation for science freeze.
+
+
+components/cam          https://github.com/ESCOMP/CAM/cam6_4_016                              
+components/cice         https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_12            
+cime                    https://github.com/ESMCI/cime/tree/cime6.1.0                          
+share                   https://github.com/ESCOMP/CESM_share/tree/share1.1.2                  
+ccs_config              https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.1    
+components/cmeps        https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.6                       
+components/cdeps        https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.43                      
+components/cism         https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002          
+components/clm          https://github.com/ESCOMP/ctsm/tree/ctsm5.2.009                       
+components/fms          https://github.com/ESCOMP/FMS_interface/tree/fi_240516                
+components/mizuroute    https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3     
+components/mom          https://github.com/ESCOMP/MOM_interface/mi_240705                     
+components/mosart       https://github.com/ESCOMP/mosart/tree/mosart1_1_02                    
+components/rtm          https://github.com/ESCOMP/rtm/tree/rtm1_0_80                          
+components/ww3          https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2                    
+libraries/parallelio    https://github.com/NCAR/ParallilIO/tree/pio2_6_2                      
+
+
+Answer Changes introduced with this tag when compared to cesm0_0_beta01:
+CLM
+    clm45cam4LndTuningModeZDustSoilErod, clm50cam5LndTuningModeZDustSoilErod test mods
+    Hillslope hydrology changes: Changes answer ONLY for hillslope tests
+GLC 
+    mosart runoff
+CMEPS 
+    Revert some of the answer changes that came in with cmeps0.14.71
+    Remove negative runoff
+RTM
+    Correct fluxes by area
+CAM
+    Modify RRTMGP interface for MT configurations.  Answers also change
+    for LT and cam6 tests using RRTMGP.
+    Aerosol wet removal bug fixes
+    GW moving mountains
+    Changes older log-gamma function for an F2008 intrinsic, only in
+    some WACCMX configurations.
+    HB mods + dycore mods, answer changes for all SE and CLUBB runs.
+
+
+
+Problems identified after tag creation:
+  -Several MEMCOMP test failed because cpl-mem.log files weren't generate.  
+   This is an issue with cime not creating the log file when the runs are too short.
+  -Some compset need to be updated or removed from testing.
+  -Some CICE tests need to have the test mods updated.
+  -PET_PM tests fail with MOM.
+  -Some CAM tests are missing land surface data.
+  -Some compsets were removed, but the tests were not removed.
+
+
 ==============================================================
 Tag name: cesm3_0_alpha02b
 Originator(s): CSEG

From 1d7e7a63fd6b4cc0136b3c23dc5b674d046342ef Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Wed, 7 Aug 2024 10:53:21 -0600
Subject: [PATCH 2/7] Update compsets to use MARBL

---
 cime_config/config_compsets.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 984cf2863..dc06c77c4 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -40,43 +40,43 @@
 
   <compset>
     <alias>B1850C_LSC</alias>
-    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_LSC</alias>
-    <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>B1850C_MSC</alias>
-    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MSC</alias>
-    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <!-- the following are provided to allow a bit of continuity and should be removed in a later tag -->
   <compset>
     <alias>BLT1850</alias>
-    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BLTHIST</alias>
-    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BMT1850</alias>
-    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BMTHIST</alias>
-    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
 

From df46bbe5b9424e4b89b8f4176ac1a5c32a0dbdcc Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Wed, 7 Aug 2024 11:15:37 -0600
Subject: [PATCH 3/7] Remove POP and cheyenne layouts

Also changed existing MOM6 layouts to explicitly look for non-MARBL
configuration
---
 cime_config/config_pes.xml | 986 +------------------------------------
 1 file changed, 4 insertions(+), 982 deletions(-)

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 3a6a62446..7a53e6c3d 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -42,7 +42,7 @@
 
   <grid name="a%ne30np4.pg3_l%ne30np4.pg3_oi%tx2_3v2">
     <mach name="derecho">
-      <pes pesize="XL" compset="CAM.*%LT.*MOM6">
+      <pes pesize="XL" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>20 ypd/ 7100 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>5400</ntasks_atm>
@@ -75,7 +75,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
-      <pes pesize="L" compset="CAM.*%LT.*MOM6">
+      <pes pesize="L" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>13.9 ypd/ 5300 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>2700</ntasks_atm>
@@ -108,7 +108,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
-      <pes pesize="M" compset="CAM.*%LT.*MOM6">
+      <pes pesize="M" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>10 ypd/ 5100 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>1920</ntasks_atm>
@@ -141,7 +141,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
-      <pes pesize="S" compset="CAM.*%LT.*MOM6">
+      <pes pesize="S" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>2.9 ypd/ 4185 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>448</ntasks_atm>
@@ -177,984 +177,6 @@
     </mach>
   </grid>
 
-  <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1">
-    <mach name="any">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-4</ntasks_atm>
-	  <ntasks_lnd>-2</ntasks_lnd>
-	  <ntasks_rof>-2</ntasks_rof>
-	  <ntasks_ice>-2</ntasks_ice>
-	  <ntasks_ocn>-2</ntasks_ocn>
-	  <ntasks_glc>-1</ntasks_glc>
-	  <ntasks_wav>-1</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>-2</rootpe_ice>
-	  <rootpe_ocn>-4</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="derecho">
-      <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+">
-	<comment></comment>
-	<ntasks>
-	  <ntasks_atm>-8</ntasks_atm>
-	  <ntasks_lnd>-3</ntasks_lnd>
-	  <ntasks_rof>-3</ntasks_rof>
-	  <ntasks_ice>-5</ntasks_ice>
-	  <ntasks_ocn>-8</ntasks_ocn>
-	  <ntasks_glc>64</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
-	  <ntasks_cpl>-8</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>-3</rootpe_ice>
-	  <rootpe_ocn>-8</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>64</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne30np4.+l%ne30np4.+oi%gx1" >
-    <mach name="any">
-      <pes pesize="any" compset="any">
-	<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>-8</ntasks_ocn>
-	  <ntasks_glc>-8</ntasks_glc>
-	  <ntasks_wav>-8</ntasks_wav>
-	  <ntasks_cpl>-8</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%ne240p4.+l%ne240np4.+oi%tx0.1v2">
-    <mach name="any">
-      <pes pesize="any" compset="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>-10</ntasks_wav>
-	  <ntasks_cpl>-16</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%tx0.66" >
-    <mach name="cheyenne">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-16</ntasks_atm>
-	  <ntasks_lnd>-13</ntasks_lnd>
-	  <ntasks_rof>-13</ntasks_rof>
-	  <ntasks_ice>-2</ntasks_ice>
-	  <ntasks_ocn>-4</ntasks_ocn>
-	  <ntasks_glc>-16</ntasks_glc>
-	  <ntasks_wav>-1</ntasks_wav>
-	  <ntasks_cpl>-16</ntasks_cpl>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>1</nthrds_atm>
-	  <nthrds_lnd>1</nthrds_lnd>
-	  <nthrds_ice>1</nthrds_ice>
-	  <nthrds_rof>1</nthrds_rof>
-	  <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_ice>-13</rootpe_ice>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ocn>-16</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>-15</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne30np4.+l%ne30np4.+oi%tx2_3v2" >
-    <mach name="cheyenne">
-      <pes pesize="any" compset="CAM.*%LT.+CLM.+CICE.+MOM6.+WW3">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1800</ntasks_atm>
-          <ntasks_lnd>720</ntasks_lnd>
-          <ntasks_rof>720</ntasks_rof>
-          <ntasks_ice>1080</ntasks_ice>
-          <ntasks_ocn>324</ntasks_ocn>
-          <ntasks_glc>36</ntasks_glc>
-          <ntasks_wav>36</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>0</rootpe_lnd>
-          <rootpe_rof>0</rootpe_rof>
-          <rootpe_ice>720</rootpe_ice>
-          <rootpe_ocn>1800</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>1</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%ne120np4.+l%ne120np4.+oi%tx0.1v2">
-    <mach name='any'>
-      <pes pesize="any" compset="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>160</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%ne120np4.+l%ne120np4.+oi%tx0.1v2">
-    <mach name="stampede|titan" >
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>1440</ntasks_atm>
-	  <ntasks_lnd>1440</ntasks_lnd>
-	  <ntasks_rof>1440</ntasks_rof>
-	  <ntasks_ice>512</ntasks_ice>
-	  <ntasks_ocn>2048</ntasks_ocn>
-	  <ntasks_glc>1440</ntasks_glc>
-	  <ntasks_wav>160</ntasks_wav>
-	  <ntasks_cpl>1440</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%1.9x2.5.+l%1.9x2.5.+oi%gx1">
-    <mach name="hera|sierra" >
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>48</ntasks_atm>
-	  <ntasks_lnd>8</ntasks_lnd>
-	  <ntasks_rof>8</ntasks_rof>
-	  <ntasks_ice>40</ntasks_ice>
-	  <ntasks_ocn>32</ntasks_ocn>
-	  <ntasks_cpl>48</ntasks_cpl>
-	  <ntasks_glc>48</ntasks_glc>
-	  <ntasks_wav>48</ntasks_wav>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>1</nthrds_atm>
-	  <nthrds_lnd>1</nthrds_lnd>
-	  <nthrds_ice>1</nthrds_ice>
-	  <nthrds_ocn>1</nthrds_ocn>
-	  <nthrds_cpl>1</nthrds_cpl>
-	  <nthrds_glc>1</nthrds_glc>
-	  <nthrds_wav>1</nthrds_wav>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_ice>8</rootpe_ice>
-	  <rootpe_ocn>48</rootpe_ocn>
-	  <rootpe_cpl>0</rootpe_cpl>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%1.9x2.5_l%1.9x2.5_oi%gx1">
-    <mach name="stampede|titan" >
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>160</ntasks_atm>
-	  <ntasks_lnd>80</ntasks_lnd>
-	  <ntasks_rof>80</ntasks_rof>
-	  <ntasks_ice>80</ntasks_ice>
-	  <ntasks_cpl>160</ntasks_cpl>
-	  <ntasks_glc>160</ntasks_glc>
-	  <ntasks_wav>160</ntasks_wav>
-	  <ntasks_ocn>240</ntasks_ocn>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>2</nthrds_atm>
-	  <nthrds_lnd>2</nthrds_lnd>
-	  <nthrds_rof>2</nthrds_rof>
-	  <nthrds_ice>2</nthrds_ice>
-	  <nthrds_cpl>2</nthrds_cpl>
-	  <nthrds_glc>2</nthrds_glc>
-	  <nthrds_wav>2</nthrds_wav>
-	  <nthrds_ocn>1</nthrds_ocn>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>80</rootpe_ice>
-	  <rootpe_cpl>0</rootpe_cpl>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_ocn>160</rootpe_ocn>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1">
-    <mach name="pleiades-wes">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>96</ntasks_atm>
-	  <ntasks_lnd>48</ntasks_lnd>
-	  <ntasks_rof>48</ntasks_rof>
-	  <ntasks_ice>48</ntasks_ice>
-	  <ntasks_ocn>12</ntasks_ocn>
-	  <ntasks_cpl>96</ntasks_cpl>
-	  <ntasks_glc>96</ntasks_glc>
-	  <ntasks_wav>96</ntasks_wav>
-	</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_cpl>1</nthrds_cpl>
-	  <nthrds_glc>1</nthrds_glc>
-	  <nthrds_wav>1</nthrds_wav>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>48</rootpe_lnd>
-	  <rootpe_rof>48</rootpe_rof>
-	  <rootpe_ice>0</rootpe_ice>
-	  <rootpe_ocn>96</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="pleiades-has">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>192</ntasks_atm>
-	  <ntasks_lnd>72</ntasks_lnd>
-	  <ntasks_rof>72</ntasks_rof>
-	  <ntasks_ice>120</ntasks_ice>
-	  <ntasks_ocn>24</ntasks_ocn>
-	  <ntasks_glc>192</ntasks_glc>
-	  <ntasks_wav>160</ntasks_wav>
-	  <ntasks_cpl>192</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>120</rootpe_lnd>
-	  <rootpe_rof>120</rootpe_rof>
-	  <rootpe_ice>0</rootpe_ice>
-	  <rootpe_ocn>192</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="pleiades-san">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>256</ntasks_atm>
-	  <ntasks_lnd>64</ntasks_lnd>
-	  <ntasks_rof>64</ntasks_rof>
-	  <ntasks_ice>192</ntasks_ice>
-	  <ntasks_ocn>16</ntasks_ocn>
-	  <ntasks_glc>256</ntasks_glc>
-	  <ntasks_wav>160</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>192</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>0</rootpe_ice>
-	  <rootpe_ocn>256</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="pleiades-ivy">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>240</ntasks_atm>
-	  <ntasks_lnd>40</ntasks_lnd>
-	  <ntasks_rof>40</ntasks_rof>
-	  <ntasks_ice>200</ntasks_ice>
-	  <ntasks_ocn>20</ntasks_ocn>
-	  <ntasks_glc>240</ntasks_glc>
-	  <ntasks_wav>160</ntasks_wav>
-	  <ntasks_cpl>240</ntasks_cpl>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>1</nthrds_atm>
-	  <nthrds_lnd>1</nthrds_lnd>
-	  <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>240</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>0</rootpe_ice>
-	  <rootpe_ocn>240</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="hobart" >
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>120</ntasks_atm>
-	  <ntasks_lnd>48</ntasks_lnd>
-	  <ntasks_rof>48</ntasks_rof>
-	  <ntasks_ice>72</ntasks_ice>
-	  <ntasks_ocn>24</ntasks_ocn>
-	  <ntasks_cpl>120</ntasks_cpl>
-	  <ntasks_glc>1</ntasks_glc>
-	  <ntasks_wav>1</ntasks_wav>
-	</ntasks>
-	<nthrds>
-	  <nthrds_atm>1</nthrds_atm>
-	  <nthrds_lnd>1</nthrds_lnd>
-	  <nthrds_ice>1</nthrds_ice>
-	  <nthrds_ocn>1</nthrds_ocn>
-	  <nthrds_cpl>1</nthrds_cpl>
-	  <nthrds_glc>1</nthrds_glc>
-	  <nthrds_rof>1</nthrds_rof>
-	  <nthrds_wav>1</nthrds_wav>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_ice>48</rootpe_ice>
-	  <rootpe_ocn>120</rootpe_ocn>
-	  <rootpe_cpl>0</rootpe_cpl>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_wav>0</rootpe_wav>
-	</rootpe>
-      </pes>
-    </mach>
-  </grid>
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
-    <mach name='any'>
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>-8</ntasks_atm>
-	  <ntasks_lnd>-4</ntasks_lnd>
-	  <ntasks_rof>-4</ntasks_rof>
-	  <ntasks_ice>-4</ntasks_ice>
-	  <ntasks_ocn>-1</ntasks_ocn>
-	  <ntasks_glc>-8</ntasks_glc>
-	  <ntasks_wav>-2</ntasks_wav>
-	  <ntasks_cpl>-8</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>-4</rootpe_ice>
-	  <rootpe_ocn>-8</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.+l%T31.+oi%gx3">
-    <mach name="cheyenne">
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>60</ntasks_atm>
-	  <ntasks_lnd>40</ntasks_lnd>
-	  <ntasks_rof>40</ntasks_rof>
-	  <ntasks_ice>20</ntasks_ice>
-	  <ntasks_ocn>12</ntasks_ocn>
-	  <ntasks_glc>60</ntasks_glc>
-	  <ntasks_wav>60</ntasks_wav>
-	  <ntasks_cpl>60</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>40</rootpe_ice>
-	  <rootpe_ocn>60</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%tx0.66v1_r%r05_g%gris4_w%null_z%null_m%tx0.66v1">
-    <mach name="cheyenne">
-      <pes pesize="any" compset="any">
-	<!-- B1850MOM gets about 7.9 ypd -->
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>576</ntasks_atm>
-	  <ntasks_lnd>288</ntasks_lnd>
-	  <ntasks_rof>288</ntasks_rof>
-	  <ntasks_ice>288</ntasks_ice>
-	  <ntasks_ocn>180</ntasks_ocn>
-	  <ntasks_glc>36</ntasks_glc>
-	  <ntasks_wav>36</ntasks_wav>
-	  <ntasks_cpl>576</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>288</rootpe_ice>
-	  <rootpe_ocn>576</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-      <pes pesize="L" compset="any">
-	<!-- B1850MOM gets about 18 ypd -->
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>1800</ntasks_atm>
-	  <ntasks_lnd>900</ntasks_lnd>
-	  <ntasks_rof>900</ntasks_rof>
-	  <ntasks_ice>900</ntasks_ice>
-	  <ntasks_ocn>720</ntasks_ocn>
-	  <ntasks_glc>36</ntasks_glc>
-	  <ntasks_wav>36</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>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>900</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.9x1.25.+l%0.9x1.25.+oi%gx1" >
-    <mach name="cheyenne">
-      <pes pesize="any" compset="CAM.*\d_.*CLM.+CICE.+POP.+WW3">
-	<comment>about 6.5ypd expected</comment>
-	<ntasks>
-	  <ntasks_atm>-16</ntasks_atm>
-	  <ntasks_lnd>-13</ntasks_lnd>
-	  <ntasks_rof>-13</ntasks_rof>
-	  <ntasks_ice>-2</ntasks_ice>
-	  <ntasks_ocn>-4</ntasks_ocn>
-	  <ntasks_glc>-16</ntasks_glc>
-	  <ntasks_wav>-1</ntasks_wav>
-	  <ntasks_cpl>-16</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>-13</rootpe_ice>
-	  <rootpe_ocn>-16</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>-15</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-      <pes pesize="any" compset="CAM60%WC.+CLM.+CICE.+POP.+WW3">
-	<comment></comment>
-	<ntasks>
-	  <ntasks_atm>1152</ntasks_atm>
-	  <ntasks_lnd>864</ntasks_lnd>
-	  <ntasks_rof>864</ntasks_rof>
-	  <ntasks_ice>252</ntasks_ice>
-	  <ntasks_ocn>36</ntasks_ocn>
-	  <ntasks_glc>1152</ntasks_glc>
-	  <ntasks_wav>36</ntasks_wav>
-	  <ntasks_cpl>1152</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>3</nthrds_cpl>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>864</rootpe_ice>
-	  <rootpe_ocn>1152</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>1116</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-
-      <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+SWAV">
-	<comment>about 8 ypd expected</comment>
-	<ntasks>
-	  <ntasks_atm>-20</ntasks_atm>
-	  <ntasks_lnd>-17</ntasks_lnd>
-	  <ntasks_rof>-17</ntasks_rof>
-	  <ntasks_ice>-3</ntasks_ice>
-	  <ntasks_ocn>-4</ntasks_ocn>
-	  <ntasks_glc>-20</ntasks_glc>
-	  <ntasks_wav>1</ntasks_wav>
-	  <ntasks_cpl>-20</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>-17</rootpe_ice>
-	  <rootpe_ocn>-20</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-      <pes pesize="L" compset="CAM.+CLM.+CICE.+POP.+WW3.+">
-	<comment>about 15ypd expected</comment>
-	<ntasks>
-	  <ntasks_atm>1728</ntasks_atm>
-	  <ntasks_lnd>1440</ntasks_lnd>
-	  <ntasks_rof>1440</ntasks_rof>
-	  <ntasks_ice>252</ntasks_ice>
-	  <ntasks_ocn>432</ntasks_ocn>
-	  <ntasks_glc>1728</ntasks_glc>
-	  <ntasks_wav>36</ntasks_wav>
-	  <ntasks_cpl>1728</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>1440</rootpe_ice>
-	  <rootpe_ocn>1728</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>1692</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-      <pes pesize="X1" compset="CAM.+CLM.+CICE.+POP.+WW3.+">
-	<comment>about 25ypd expected</comment>
-	<ntasks>
-	  <ntasks_atm>-32</ntasks_atm>
-	  <ntasks_lnd>-24</ntasks_lnd>
-	  <ntasks_rof>-24</ntasks_rof>
-	  <ntasks_ice>-8</ntasks_ice>
-	  <ntasks_ocn>256</ntasks_ocn>
-	  <ntasks_glc>-32</ntasks_glc>
-	  <ntasks_wav>32</ntasks_wav>
-	  <ntasks_cpl>-32</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>3</nthrds_cpl>
-	</nthrds>
-	<rootpe>
-	  <rootpe_atm>0</rootpe_atm>
-	  <rootpe_lnd>0</rootpe_lnd>
-	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>-24</rootpe_ice>
-	  <rootpe_ocn>-32</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>1408</rootpe_wav>
-	  <rootpe_cpl>0</rootpe_cpl>
-	</rootpe>
-      </pes>
-    </mach>
-    <mach name="stampede2-skx">
-      <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+WW3">
-	<comment>about 6.5ypd expected</comment>
-	<ntasks>
-	  <ntasks_atm>-10</ntasks_atm>
-	  <ntasks_lnd>-8</ntasks_lnd>
-	  <ntasks_rof>-8</ntasks_rof>
-	  <ntasks_ice>-2</ntasks_ice>
-	  <ntasks_ocn>-2</ntasks_ocn>
-	  <ntasks_glc>-10</ntasks_glc>
-	  <ntasks_wav>-1</ntasks_wav>
-	  <ntasks_cpl>-10</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>-8</rootpe_ice>
-	  <rootpe_ocn>-10</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>-12</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="stampede|titan" >
-      <pes pesize="any" compset="any">
-	<comment>none</comment>
-	<ntasks>
-	  <ntasks_atm>384</ntasks_atm>
-	  <ntasks_lnd>64</ntasks_lnd>
-	  <ntasks_rof>64</ntasks_rof>
-	  <ntasks_ice>320</ntasks_ice>
-	  <ntasks_ocn>32</ntasks_ocn>
-	  <ntasks_glc>384</ntasks_glc>
-	  <ntasks_wav>160</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.47x0.63.+l%0.47x0.63.+oi%tx0.1v2">
-    <mach name='any'>
-      <pes pesize="any" compset="any">
-	<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>160</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>
-
-
   <!-- J compset (all active except data atmosphere)
        Laid out as follows:
        |LND|ICE|ATM|OCN|

From 21b71e2b0ecfc0aba53fc2351d76c975de4ce2da Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Wed, 7 Aug 2024 11:16:42 -0600
Subject: [PATCH 4/7] Add M and L layouts for MOM6+MARBL

still running some timing experiments to see what layout fits S and XL on
derecho
---
 cime_config/config_pes.xml | 68 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 7a53e6c3d..ef4856454 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -108,8 +108,41 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
+      <pes pesize="L" compset="CAM.*%LT.*MOM6%[^_]*MARBL-BIO">
+	<comment>13.9 ypd/ 8000 pe-hrs/simyr expected</comment>
+	<ntasks>
+	  <ntasks_atm>2700</ntasks_atm>
+	  <ntasks_lnd>896</ntasks_lnd>
+	  <ntasks_rof>32</ntasks_rof>
+	  <ntasks_ice>1772</ntasks_ice>
+	  <ntasks_ocn>1908</ntasks_ocn>
+	  <ntasks_glc>32</ntasks_glc>
+	  <ntasks_wav>32</ntasks_wav>
+	  <ntasks_cpl>2700</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>896</rootpe_rof>
+	  <rootpe_ice>928</rootpe_ice>
+	  <rootpe_ocn>2700</rootpe_ocn>
+	  <rootpe_glc>896</rootpe_glc>
+	  <rootpe_wav>896</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
       <pes pesize="M" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
-	<comment>10 ypd/ 5100 pe-hrs/simyr expected</comment>
+	<comment>10 ypd/ 5500 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>1920</ntasks_atm>
 	  <ntasks_lnd>640</ntasks_lnd>
@@ -141,6 +174,39 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
+      <pes pesize="M" compset="CAM.*%LT.*MOM6%[^_]*MARBL-BIO">
+	<comment>10 ypd/ 7000 pe-hrs/simyr expected</comment>
+	<ntasks>
+	  <ntasks_atm>1920</ntasks_atm>
+	  <ntasks_lnd>640</ntasks_lnd>
+	  <ntasks_rof>512</ntasks_rof>
+	  <ntasks_ice>1152</ntasks_ice>
+	  <ntasks_ocn>1408</ntasks_ocn>
+	  <ntasks_glc>64</ntasks_glc>
+	  <ntasks_wav>64</ntasks_wav>
+	  <ntasks_cpl>1920</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>704</rootpe_ice>
+	  <rootpe_ocn>1920</rootpe_ocn>
+	  <rootpe_glc>1856</rootpe_glc>
+	  <rootpe_wav>1792</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
       <pes pesize="S" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>2.9 ypd/ 4185 pe-hrs/simyr expected</comment>
 	<ntasks>

From 3447f7f58c886b57b848dafeae9f75919404f902 Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Thu, 8 Aug 2024 10:25:36 -0600
Subject: [PATCH 5/7] Add S and XL layouts for MOM6+MARBL

I'm having trouble getting 20 SYPD in MOM6 with MARBL enabled; 25 nodes gives
me 19.9 myears / day in the ocean but 18.16 SYPD overall. Increasing to 27
nodes or 30 nodes both slow the model down, possibly due to increased
communication or possibly due to the machine being busy? We might want to
adjust the XL layout in a future alpha tag.
---
 cime_config/config_pes.xml | 68 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index ef4856454..af98158ba 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -75,6 +75,39 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
+      <pes pesize="XL" compset="CAM.*%LT.*MOM6%[^_]*MARBL-BIO">
+	<comment>20 ypd/ 10500 pe-hrs/simyr expected</comment>
+	<ntasks>
+	  <ntasks_atm>5400</ntasks_atm>
+	  <ntasks_lnd>1792</ntasks_lnd>
+	  <ntasks_rof>1792</ntasks_rof>
+	  <ntasks_ice>3608</ntasks_ice>
+	  <ntasks_ocn>3300</ntasks_ocn>
+	  <ntasks_glc>4</ntasks_glc>
+	  <ntasks_wav>1</ntasks_wav>
+	  <ntasks_cpl>5400</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>1792</rootpe_ice>
+	  <rootpe_ocn>5404</rootpe_ocn>
+	  <rootpe_glc>5400</rootpe_glc>
+	  <rootpe_wav>5400</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
       <pes pesize="L" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>13.9 ypd/ 5300 pe-hrs/simyr expected</comment>
 	<ntasks>
@@ -208,7 +241,7 @@
 	</rootpe>
       </pes>
       <pes pesize="S" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
-	<comment>2.9 ypd/ 4185 pe-hrs/simyr expected</comment>
+	<comment>2.9 ypd/ 4300 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>448</ntasks_atm>
 	  <ntasks_lnd>208</ntasks_lnd>
@@ -240,6 +273,39 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
+      <pes pesize="S" compset="CAM.*%LT.*MOM6%[^_]*MARBL-BIO">
+	<comment>2.9 ypd/ 6400 pe-hrs/simyr expected</comment>
+	<ntasks>
+	  <ntasks_atm>448</ntasks_atm>
+	  <ntasks_lnd>208</ntasks_lnd>
+	  <ntasks_rof>16</ntasks_rof>
+	  <ntasks_ice>224</ntasks_ice>
+	  <ntasks_ocn>320</ntasks_ocn>
+	  <ntasks_glc>16</ntasks_glc>
+	  <ntasks_wav>16</ntasks_wav>
+	  <ntasks_cpl>448</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>224</rootpe_ice>
+	  <rootpe_ocn>448</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
     </mach>
   </grid>
 

From 627db2d14948f78361a01bf57a57039f7e46a09a Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Thu, 8 Aug 2024 13:39:03 -0600
Subject: [PATCH 6/7] Revert compset definitions, add BLT1850_MARBL

Until we decide to turn MARBL on by default, the compsets should not change.
However, I created a temporary BLT1850_MARBL compset to make it easier to run
with MARBL while we do final testing (also, I added an ERI test for that
compset so we aren't surprised by anything when we update the compset
definitions)
---
 cime_config/config_compsets.xml    | 19 ++++++++++++-------
 cime_config/testlist_allactive.xml |  8 ++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index dc06c77c4..32c729167 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -40,43 +40,48 @@
 
   <compset>
     <alias>B1850C_LSC</alias>
-    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_LSC</alias>
-    <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>B1850C_MSC</alias>
-    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MSC</alias>
-    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <!-- the following are provided to allow a bit of continuity and should be removed in a later tag -->
   <compset>
     <alias>BLT1850</alias>
+    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+  </compset>
+
+  <compset>
+    <alias>BLT1850_MARBL</alias>
     <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BLTHIST</alias>
-    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BMT1850</alias>
-    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
     <alias>BMTHIST</alias>
-    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
 
diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
index fd4aedc90..be127d560 100644
--- a/cime_config/testlist_allactive.xml
+++ b/cime_config/testlist_allactive.xml
@@ -133,4 +133,12 @@
       <option name="wallclock">  00:30:00 </option>
     </options>
   </test>
+  <test name="ERI" grid="ne30pg3_t232" compset="BLT1850_MARBL" testmods="allactive/defaultio">
+    <machines>
+      <machine name="derecho" compiler="intel" category="prealpha"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 01:00:00 </option>
+    </options>
+  </test>
 </testlist>

From 34552ee59c68dffceec8863030996571ed08b398 Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Fri, 9 Aug 2024 09:39:59 -0600
Subject: [PATCH 7/7] Remove user_nl_pop from defaultio

---
 cime_config/testmods_dirs/allactive/defaultio/user_nl_pop | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 cime_config/testmods_dirs/allactive/defaultio/user_nl_pop

diff --git a/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop b/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop
deleted file mode 100644
index 017383558..000000000
--- a/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop
+++ /dev/null
@@ -1,6 +0,0 @@
-& tavg_nml
-    ltavg_ignore_extra_streams = .true.
-    n_tavg_streams = 1
-    tavg_freq_opt = 'nday'
-    tavg_file_freq_opt = 'nday'
-/