Merge pull request #36 from CESM-Development/cheyenne_updates

Update some pelayouts on cheyenne.
CESM-Development · Oct 2, 2017 · 0b3902e · 0b3902e
2 parents 43e77ec + 21aea7d
commit 0b3902e
Showing 1 changed file with 39 additions and 38 deletions.
diff --git a/config_pes.xml b/config_pes.xml
@@ -111,38 +111,6 @@
           <rootpe_cpl>0</rootpe_cpl>
         </rootpe>
       </pes>
-      <pes pesize="M" compset="CAM.+CLM.+CICE.+POP.+WW3.+">
-        <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">
@@ -1217,13 +1185,13 @@
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
     <mach name="cheyenne">
       <pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+WW3">
-	<comment>about 5ypd expected</comment>
+	<comment>about 6.5ypd expected</comment>
 	<ntasks>
 	  <ntasks_atm>-16</ntasks_atm>
-	  <ntasks_lnd>-12</ntasks_lnd>
-	  <ntasks_rof>-12</ntasks_rof>
-	  <ntasks_ice>-3</ntasks_ice>
-	  <ntasks_ocn>-3</ntasks_ocn>
+	  <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>
@@ -1242,7 +1210,7 @@
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
 	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>-12</rootpe_ice>
+	  <rootpe_ice>-13</rootpe_ice>
 	  <rootpe_ocn>-16</rootpe_ocn>
 	  <rootpe_glc>0</rootpe_glc>
 	  <rootpe_wav>-15</rootpe_wav>
@@ -1283,6 +1251,39 @@
 	</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>