Merge pull request #395 from jedwards4b/pelayout_updates

add some pelayouts

Author: fischer-ncar

cime_config/config_pes.xml

@@ -49,7 +49,7 @@
 	  <ntasks_lnd>5400</ntasks_lnd>
 	  <ntasks_rof>104</ntasks_rof>
 	  <ntasks_ice>5400</ntasks_ice>
-	  <ntasks_ocn>384</ntasks_ocn>
+	  <ntasks_ocn>640</ntasks_ocn>
 	  <ntasks_glc>104</ntasks_glc>
 	  <ntasks_wav>104</ntasks_wav>
 	  <ntasks_cpl>5400</ntasks_cpl>
@@ -213,16 +213,16 @@
 	</rootpe>
       </pes>
       <pes pesize="M" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
-	<comment>10 ypd/ 5500 pe-hrs/simyr expected</comment>
+	<comment>11.6 ypd/ 7100 pe-hrs/simyr expected</comment>
 	<ntasks>
-	  <ntasks_atm>1920</ntasks_atm>
-	  <ntasks_lnd>1152</ntasks_lnd>
-	  <ntasks_rof>512</ntasks_rof>
-	  <ntasks_ice>768</ntasks_ice>
-	  <ntasks_ocn>512</ntasks_ocn>
-	  <ntasks_glc>64</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
-	  <ntasks_cpl>1920</ntasks_cpl>
+	  <ntasks_atm>2700</ntasks_atm>
+	  <ntasks_lnd>2700</ntasks_lnd>
+	  <ntasks_rof>1280</ntasks_rof>
+	  <ntasks_ice>2700</ntasks_ice>
+	  <ntasks_ocn>640</ntasks_ocn>
+	  <ntasks_glc>116</ntasks_glc>
+	  <ntasks_wav>116</ntasks_wav>
+	  <ntasks_cpl>2700</ntasks_cpl>
 	</ntasks>
 	<nthrds>
 	  <nthrds_atm>1</nthrds_atm>
@@ -238,24 +238,24 @@
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
 	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>1152</rootpe_ice>
-	  <rootpe_ocn>1920</rootpe_ocn>
-	  <rootpe_glc>2496</rootpe_glc>
-	  <rootpe_wav>2432</rootpe_wav>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>2816</rootpe_ocn>
+	  <rootpe_glc>2700</rootpe_glc>
+	  <rootpe_wav>2700</rootpe_wav>
 	  <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_atm>2700</ntasks_atm>
+	  <ntasks_lnd>2700</ntasks_lnd>
+	  <ntasks_rof>1280</ntasks_rof>
+	  <ntasks_ice>2700</ntasks_ice>
 	  <ntasks_ocn>1408</ntasks_ocn>
-	  <ntasks_glc>64</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
-	  <ntasks_cpl>1920</ntasks_cpl>
+	  <ntasks_glc>116</ntasks_glc>
+	  <ntasks_wav>116</ntasks_wav>
+	  <ntasks_cpl>2700</ntasks_cpl>
 	</ntasks>
 	<nthrds>
 	  <nthrds_atm>1</nthrds_atm>
@@ -271,10 +271,10 @@
 	  <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_ice>0</rootpe_ice>
+	  <rootpe_ocn>2816</rootpe_ocn>
+	  <rootpe_glc>2700</rootpe_glc>
+	  <rootpe_wav>2700</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>