Merge branch 'remove_cism1' into simple_bfb_feb21

ESCOMP · Feb 23, 2021 · a716735 · a716735
2 parents f29c77a + 6dc9ed9
commit a716735
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -18,7 +18,7 @@
     ICE  = [CICE, DICE, SICE]
     OCN  = [DOCN, ,AQUAP, SOCN]
     ROF  = [RTM, SROF]
-    GLC  = [CISM1, CISM2]
+    GLC  = [CISM2, SGLC]
     WAV  = [SWAV]
     BGC  = optional BGC scenario
 

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -1190,19 +1190,4 @@
     </mach>
   </grid>
 
-  <overrides>
-    <grid name="any" >
-      <mach name="any" >
-        <pes pesize="any" compset="CISM1">
-          <ntasks>
-            <ntasks_glc>1</ntasks_glc>
-          </ntasks>
-          <nthrds>
-            <nthrds_glc>1</nthrds_glc>
-          </nthrds>
-        </pes>
-      </mach>
-    </grid>
-  </overrides>
-
 </config_pes>