Merge branch 'main' into feature/fix_mpas_input

.github/workflows/extbuild.yml

@@ -19,11 +19,11 @@ jobs:
       CPPFLAGS: "-I/usr/include -I/usr/local/include "
       LDFLAGS: "-L/usr/lib/x86_64-linux-gnu "
       # Versions of all dependencies can be updated here - these match tag names in the github repo
-      ESMF_VERSION: v8.5.0
-      ParallelIO_VERSION: pio2_6_0
+      ESMF_VERSION: v8.6.1
+      ParallelIO_VERSION: pio2_6_2
     steps:
       - id: checkout-CDEPS
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - id: load-env
@@ -37,7 +37,7 @@ jobs:
           sudo apt-get install autotools-dev autoconf
       - name: Cache PARALLELIO
         id: cache-PARALLELIO
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${GITHUB_WORKSPACE}/pio
           key: ${{ runner.os }}-${{ env.ParallelIO_VERSION }}-parallelio2

.gitignore

@@ -31,9 +31,5 @@
 *.out
 *.app
 
-# Externals
-fox
-share/genf90
-
 # ignore pycache
 __pycache__

.gitmodules

@@ -0,0 +1,16 @@
+# This is a git-fleximod adapted .gitmodules file.  Any field with a name starting in fx is a git-fleximod
+# specific field.  See https://github.com/ESMCI/git-fleximod for details.
+
+[submodule "fox"]
+path = fox
+url = https://github.com/ESMCI/fox.git
+fxtag = 4.1.2.1
+fxrequired = AlwaysRequired
+fxDONOTUSEurl = https://github.com/ESMCI/fox.git
+
+[submodule "genf90"]
+path = share/genf90
+url = https://github.com/PARALLELIO/genf90
+fxtag = 4816965
+fxrequired = AlwaysRequired
+fxDONOTUSEurl = https://github.com/PARALLELIO/genf90

dglc/cime_config/config_component.xml

@@ -43,7 +43,7 @@
     </desc>
   </entry>
 
-  <entry id="DGLC_USE_GREENLAND">
+  <entry id="GLC_USE_GREENLAND">
     <type>logical</type>
     <default_value>FALSE</default_value>
     <group>run_component_dglc</group>
@@ -58,7 +58,7 @@
     </desc>
   </entry>
 
-  <entry id="DGLC_USE_ANTARCTICA">
+  <entry id="GLC_USE_ANTARCTICA">
     <type>logical</type>
     <default_value>FALSE</default_value>
     <group>run_component_dglc</group>

dglc/cime_config/testdefs/testlist_dglc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
 
-  <test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8gris4_mg37" name="SMS_Ln5">
+  <test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8gris4_mg37" name="SMS_Ly3">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cdeps"/>
       <machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
@@ -10,7 +10,7 @@
       <option name="wallclock"> 00:10:00 </option>
     </options>
   </test>
-  <test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8_mg37" name="SMS_Ln5">
+  <test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f10_f10_ais8_mg37" name="SMS_Ly3">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cdeps"/>
       <machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>
@@ -19,7 +19,7 @@
       <option name="wallclock"> 00:10:00 </option>
     </options>
   </test>
-  <test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f19_g17_gris4" name="SMS_Ln5">
+  <test compset="2000_SATM_SLND_SICE_SGLC_SROF_DGLC%NOEVOLVE_SWAV" grid="f19_g17_gris4" name="SMS_Ly3">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cdeps"/>
       <machine name="betzy" compiler="intel" category="aux_cdeps_noresm"/>