Merge pull request #43 from mvertens/feature/remove_mct

Remove MCT from code base
ESCOMP · Jan 22, 2024 · 118b220 · 118b220
2 parents 363ff40 + 3741af1
commit 118b220
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 899 deletions.
diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -9,7 +9,7 @@ import os, sys
 CIMEROOT = os.environ.get("CIMEROOT")
 if CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
 
 from standard_script_setup import *
 from CIME.case import Case

diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -14,7 +14,7 @@ import os, sys, glob
 CIMEROOT = os.environ.get("CIMEROOT")
 if CIMEROOT is None:
     raise SystemExit("ERROR: must set CIMEROOT environment variable")
-sys.path.append(os.path.join(CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(CIMEROOT, "CIME", "Tools"))
 
 from standard_script_setup import *
 from CIME.case import Case

diff --git a/cime_config/testdefs/testlist_rtm.xml b/cime_config/testdefs/testlist_rtm.xml
@@ -3,9 +3,8 @@
 
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
-      <machine name="izumi" compiler="nag" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="gnu" category="rtm"></machine>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
@@ -14,9 +13,8 @@
   </test>
   <test name="SMS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
-      <machine name="izumi" compiler="nag" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="gnu" category="rtm"></machine>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
@@ -25,9 +23,8 @@
   </test>
   <test name="SMS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmColdStart">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
-      <machine name="cheyenne" compiler="gnu" category="rtm"></machine>
-      <machine name="izumi" compiler="nag" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="gnu" category="rtm"></machine>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
@@ -36,7 +33,7 @@
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnIceOff">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
          <options>
            <option name="wallclock">00:20:00</option>
          </options>
@@ -45,7 +42,7 @@
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </options>
@@ -54,7 +51,7 @@
   </test>
   <test name="ERS_D_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOn">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </options>
@@ -63,7 +60,7 @@
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOnFloodOnEffvelOff">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </options>
@@ -72,7 +69,7 @@
   </test>
   <test name="ERS_Ld5" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/rtmOff">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm">
+      <machine name="derecho" compiler="intel" category="rtm">
         <options>
           <option name="wallclock">00:20:00</option>
         </options>
@@ -81,7 +78,7 @@
   </test>
   <test name="SMS_D_Ld5_Vmct" grid="f10_f10_mg37" compset="I2000Clm50BgcCropRtm" testmods="rtm/default">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="rtm"></machine>
+      <machine name="derecho" compiler="intel" category="rtm"></machine>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>

diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -1,3 +1,20 @@
+===============================================================
+Tag name:  rtm1_0_79
+Originator(s): mvertens/erik
+Date: Jan 22, 2024
+One-line Summary: Remove MCT from RTM
+
+This tag removes MCT code that is no longer used since it is only in the mct cap.
+Also updates the testlist to be moved to Derecho, removing izumi
+
+Erik added some changes to this that were important for RTM as a maintainer of
+RTM which cover the following issues:
+
+Resolves #45 -- failing tests
+Resolves #44 -- lower testing for RTM (remove Izumi tests)
+Resolves #41 -- Move testlist from Cheyenne to Derecho
+Resolves #33 -- Update path to CIME tools needed for buildnml/buildlib
+
 ===============================================================
 Tag name:  rtm1_0_78
 Originator(s): erik