From 136d5c606ba2e8828fd3890537070c65d4e4d23a Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Wed, 2 Dec 2020 15:32:14 -0700
Subject: [PATCH] Remove CISM1 compset and test

As of cism2_1_74, CISM1 is no longer supported
---
 cime_config/config_compsets.xml    | 10 +---------
 cime_config/config_pes.xml         |  8 --------
 cime_config/testlist_allactive.xml | 10 ----------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 9a685f516c..cf15ef1679 100644
--- 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, MOSART, SROF]
-    GLC  = [CISM1, CISM2, SGLC]
+    GLC  = [CISM2, SGLC]
     WAV  = [WW3, DWAV, XWAV, SWAV]
     ESP  = [SESP]
     BGC  = optional BGC scenario
@@ -64,14 +64,6 @@
     <lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%EVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
-  <!-- Include one CISM1 compset, mainly for testing purposes, to make sure that
-       CISM1 can operate in a fully-coupled configuration. Main point is to
-       check the PE layout. -->
-  <compset>
-    <alias>B1850G1</alias>
-    <lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM1%EVOLVE_WW3_BGC%BDRD</lname>
-  </compset>
-
   <!-- Prognostic wave -->
 
 
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 240a94c5b5..963cfca2e5 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -1684,14 +1684,6 @@
 	    <nthrds_cpl>1</nthrds_cpl>
 	  </nthrds>
 	</pes>
-	<pes pesize="any" compset="CISM1">
-	  <ntasks>
-	    <ntasks_glc>1</ntasks_glc>
-	  </ntasks>
-	  <nthrds>
-	    <nthrds_glc>1</nthrds_glc>
-	  </nthrds>
-	</pes>
       </mach>
     </grid>
   </overrides>
diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
index 6f05b63600..264c533a20 100644
--- a/cime_config/testlist_allactive.xml
+++ b/cime_config/testlist_allactive.xml
@@ -251,16 +251,6 @@
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="SMS_Ld5" grid="f19_g17" compset="B1850G1" testmods="allactive/cism/test_coupling">
-    <machines>
-      <machine name="cheyenne" compiler="gnu" category="prebeta">
-        <options>
-          <option name="wallclock">0:30:00</option>
-          <option name="comment">Include a fully-coupled test with CISM1, mainly to make sure the PE layout works</option>
-        </options>
-      </machine>
-    </machines>
-  </test>
   <test name="SMS_Ld1" grid="f19_g17" compset="B1850G" testmods="allactive/cism/test_coupling">
     <machines>
       <machine name="hobart" compiler="nag" category="prebeta"/>