Modified processor layout for TL319_tnx1v4 grids to be consistent wit…

…h or without iHAMOCC enabled.

cime_config/config_pes.xml

@@ -246,9 +246,9 @@
         <comment>none</comment>
         <ntasks>
           <ntasks_atm>128</ntasks_atm>
-          <ntasks_rof>16</ntasks_rof>
-          <ntasks_ice>96</ntasks_ice>
-          <ntasks_ocn>156</ntasks_ocn>
+          <ntasks_rof>128</ntasks_rof>
+          <ntasks_ice>128</ntasks_ice>
+          <ntasks_ocn>354</ntasks_ocn>
           <ntasks_cpl>128</ntasks_cpl>
           <ntasks_lnd>128</ntasks_lnd>
           <ntasks_glc>128</ntasks_glc>
@@ -267,8 +267,8 @@
         <rootpe>
           <rootpe_atm>0</rootpe_atm>
           <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>16</rootpe_rof>
-          <rootpe_ice>32</rootpe_ice>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
           <rootpe_ocn>128</rootpe_ocn>
           <rootpe_glc>0</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>
@@ -278,10 +278,11 @@
     </mach>
   </grid>
 
+  <!-- 512 pes is minimum setting for normal job size on betzy !-->
   <grid name="a%TL319.+oi%tnx1v4">
-    <mach name="any">
-      <pes pesize="M" compset="_DATM.*_BLOM%ECO">
-        <comment>none</comment>
+    <mach name="betzy">
+      <pes pesize="L" compset="any">
+        <comment>Large pe-layout with 512 pes in total</comment>
         <ntasks>
           <ntasks_atm>128</ntasks_atm>
           <ntasks_rof>128</ntasks_rof>
@@ -315,45 +316,6 @@
       </pes>
     </mach>
   </grid>
-
-  <!-- 512 pes is minimum setting for normal job size on betzy !-->
-  <grid name="a%TL319.+oi%tnx1v4">
-    <mach name="betzy">
-      <pes pesize="L" compset="_DATM.*_BLOM">
-        <comment>Large pe-layout with 512 pes in total</comment>
-        <ntasks>
-          <ntasks_atm>1</ntasks_atm>
-          <ntasks_rof>1</ntasks_rof>
-          <ntasks_ice>154</ntasks_ice>
-          <ntasks_ocn>354</ntasks_ocn>
-          <ntasks_cpl>158</ntasks_cpl>
-          <ntasks_lnd>1</ntasks_lnd>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</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_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>155</rootpe_atm>
-          <rootpe_lnd>156</rootpe_lnd>
-          <rootpe_rof>157</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>158</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
   <!-- GRID: TL319_tn14 : end !-->
 
   <grid name="a%0.9x1.25.+oi%tnx1v4|a%1.9x2.5.+oi%tnx1v4">