Merge branch 'develop' into 'main' for v2.2 release (PR EarthWorksOrg#52

)
gdicker1 · Jun 3, 2024 · 5f7081e · 5f7081e
2 parents e00dda1 + 84613c1
commit 5f7081e
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 7 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,12 +1,12 @@
 [ccs_config]
-tag = ccs_config-ew2.1.000
+tag = release-ccs_config-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/ccs_config_cesm.git
 local_path = ccs_config
 required = True
 
 [cam]
-tag = cam-ew2.1.002
+tag = release-cam-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/CAM
 local_path = components/cam
@@ -29,7 +29,7 @@ externals = Externals.cfg
 required = True
 
 [cmeps]
-tag = cmeps-ew2.1.000
+tag = release-cmeps-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/CMEPS.git
 local_path = components/cmeps
@@ -72,7 +72,7 @@ local_path = libraries/parallelio
 required = True
 
 [cime]
-tag = cime-ew2.1.000
+tag = release-cime-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/cime
 local_path = cime
@@ -95,21 +95,21 @@ externals = Externals_CLM.cfg
 required = True
 
 [mpas-ocean]
-tag = mpaso-ew2.1.000
+tag = release-mpaso-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/mpas-ocean.git
 local_path = components/mpas-ocean
 required = True
 
 [mpas-seaice]
-tag = mpassi-ew2.1.001
+tag = release-mpassi-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/mpas-seaice.git
 local_path = components/mpas-seaice
 required = True
 
 [mpas-framework]
-tag = mpasfrwk-ew2.1.001
+tag = release-mpasfrwk-ew2.2
 protocol = git
 repo_url = https://github.com/EarthWorksOrg/mpas-framework.git
 local_path = components/mpas-framework

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -101,6 +101,38 @@
      <lname>1850_DATM%CRUv7_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
   </compset>
 
+  <!-- EarthWorks specific compsets
+       MPAS-ocean and/or MPAS-seaice couplings -->
+
+  <!-- F2000climo, with MPASSI%PRES -->
+  <compset>
+     <alias>F2000climoEW</alias>
+     <lname>2000_CAM60_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+  </compset>
+
+  <!-- F2000dev, with MPASSI%PRES -->
+  <compset>
+    <alias>F2000devEW</alias>
+    <lname>2000_CAM%DEV_CLM50%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+  </compset>
+
+  <compset>
+      <alias>FullyCoupledEW</alias>
+      <lname>2000_CAM60_CLM50%SP_MPASSI_MPASO_SROF_SGLC_SWAV</lname>
+  </compset>
+
+  <!-- Like FullyCoupledEW, but with MOSART river -->
+  <compset>
+     <alias>CHAOS2000</alias>
+     <lname>2000_CAM60_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  </compset>
+
+  <!-- Use cam_dev / CAM7 physics instead -->
+  <compset>
+     <alias>CHAOS2000dev</alias>
+     <lname>2000_CAM%DEV_CLM50%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  </compset>
+
   <entries>
     <entry id="RUN_STARTDATE">
       <values>
@@ -115,3 +147,8 @@
   </entries>
 
 </compsets>
+
+
+
+
+
diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<testlist version="2.0">
+
+  <!-- ew-pr Tests to run for the EW PR process -->
+  <test name="SMS_P128_Vnuopc" grid="mpasa120z32_mpasa120" compset="FHS94" >
+    <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"> 00:05:00 </option>
+    </options>
+  </test>
+  <test name="SMS_P128_Vnuopc" grid="mpasa120z32_mpasa120" compset="FKESSLER" >
+    <machines>
+      <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:05:00 </option>
+    </options>
+  </test>
+  <test name="SMS_P128_Vnuopc" grid="mpasa120_mpasa120" compset="QPC6" >
+    <machines>
+      <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:20:00 </option>
+    </options>
+  </test>
+  <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="F2000climoEW" >
+    <machines>
+      <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:20:00 </option>
+    </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 using cam_dev physics</option>
+    </options>
+  </test>
+
+  <!-- ew-ver Tests to run for verification runs --> 
+  <test name="SMS_Ld1200_Vnuopc" grid="mpasa120z32_mpasa120" compset="FHS94">
+    <machines>
+      <machine name="derecho" compiler="nvhpc" category="ew-ver"/>
+      <machine name="derecho" compiler="intel" category="ew-ver"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 10:00:00 </option>
+      <option name="comment">EarthWorks run of FHS94 to generate plots for days 200 to 1200</option>
+    </options>
+  </test>
+
+  <!-- ew-rel Tests to run while creating a release -->
+  <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"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:15:00 </option>
+    </options>
+  </test>
+  <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"> 12:00:00 </option>
+    </options>
+  </test>
+  <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"> 12:00:00 </option>
+    </options>
+  </test>
+  <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"> 12:00:00 </option>
+    </options>
+  </test>
+  <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"> 12:00:00 </option>
+    </options>
+  </test>
+</testlist>