CAM defaults fixes (PR EarthWorksOrg#20) and changes to testlist (PR E…

…arthWorksOrg#53) The CAM fixes address incorrect or missing file names in namelist_defaults_cam.xml. The tests were changed to match what is expected and described in the (coming) release notes.
gdicker1 · Jun 3, 2024 · 5db7875 · 5db7875
2 parents 7ae37fc + 99c4a8c
commit 5db7875
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -6,7 +6,7 @@ local_path = ccs_config
 required = True
 
 [cam]
-tag = cam-ew2.1.005
+tag = cam-ew2.1.006
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/CAM
 local_path = components/cam

diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml
@@ -28,7 +28,7 @@
       <option name="wallclock"> 00:20:00 </option>
     </options>
   </test>
-  <test name="SMS_P128_Vnuopc" grid="mpasa120_mpasa120" compset="F2000climo" >
+  <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="F2000climoEW" >
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
     </machines>
@@ -37,14 +37,23 @@
     </options>
   </test>
   <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="FullyCoupledEW">
+    <machines>
+      <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 01:00:00 </option>
+      <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi</option>
+    </options>
+  </test>
+  <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
       <machine name="derecho" compiler="intel" category="ew-pr"/>
       <machine name="derecho" compiler="gnu" category="ew-pr"/>
     </machines>
     <options>
       <option name="wallclock"> 01:00:00 </option>
-      <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi</option>
+      <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi using cam_dev physics</option>
     </options>
   </test>
 
@@ -61,7 +70,7 @@
   </test>
 
   <!-- ew-rel Tests to run while creating a release -->
-  <test name="ERP_Vnuopc" grid="mpasa120_oQU120" compset="FullyCoupledEW">
+  <test name="ERS_P128_Vnuopc" grid="mpasa120_oQU120" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
@@ -70,40 +79,40 @@
       <option name="wallclock"> 00:15:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa060_oQU060" compset="FullyCoupledEW">
+  <test name="ERS_P128_Vnuopc" grid="mpasa120z58_oQU120" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 00:30:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa030_oQU030" compset="FullyCoupledEW">
+  <test name="ERS_P128_Vnuopc" grid="mpasa060_oQU060" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa015z58_oQU015" compset="FullyCoupledEW">
+  <test name="ERS_P5120_Vnuopc" grid="mpasa030_oQU030" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
-  <test name="ERP_Vnuopc" grid="mpasa120z58_oQU120" compset="FullyCoupledEW">
+  <test name="ERS_P10240_Vnuopc" grid="mpasa015z58_oQU015" compset="CHAOS2000dev">
     <machines>
       <machine name="derecho" compiler="nvhpc" category="ew-rel"/>
       <machine name="derecho" compiler="intel" category="ew-rel"/>
     </machines>
     <options>
-      <option name="wallclock"> 01:00:00 </option>
+      <option name="wallclock"> 12:00:00 </option>
     </options>
   </test>
 </testlist>