Merge pull request #351 from GEOS-ESM/develop

GitFlow: Merge develop into main for release
GEOS-ESM · Feb 6, 2024 · e7b9323 · e7b9323
2 parents bd5f53a + 94ba296
commit e7b9323
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.14.0
-#bcs_version: &bcs_version v11.1.0
+#baselibs_version: &baselibs_version v7.17.0
+#bcs_version: &bcs_version v11.4.0
 
 orbs:
-  ci: geos-esm/circleci-tools@1
+  ci: geos-esm/circleci-tools@2
 
 workflows:
   build-test:
@@ -18,8 +18,38 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          repo: GEOSgcm
           #baselibs_version: *baselibs_version
+          repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
-          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
+          persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
+
+      # Run AMIP GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
+
+      # Run Coupled GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-coupled-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
+          gcm_ocean_type: MOM6
+          change_layout: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [3.39.0] - 2024-02-06
+
+### Added
+
+- Added `ESMF::ESMF` alias for ESMF library
+  - Needed to avoid an issue UFS has with MAPL/GOCART (see https://github.com/GEOS-ESM/MAPL/issues/2569)
+  - Needed for Baselibs builds of MAPL 2.44 and higher as we now move to use `ESMF::ESMF` as the target
+  - Will be added to `FindESMF.cmake` in a future release of ESMF, so we only add the alias if it doesn't exist
+
+### Changed
+
+- Update CI to v2 orb
+
 ## [3.38.0] - 2024-01-19
 
 ### Added

diff --git a/external_libraries/FindBaselibs.cmake b/external_libraries/FindBaselibs.cmake
@@ -163,6 +163,13 @@ if (Baselibs_FOUND)
 
     # Finally, we add an alias since GEOS (at the moment) uses esmf not ESMF for the target
     add_library(esmf ALIAS ESMF)
+
+    # We also add an alias for the target ESMF::ESMF. This will eventually be
+    # added to `FindESMF.cmake` in ESMF, but for now we do it here. To be safe,
+    # we only add the alias if it doesn't already exist.
+    if (NOT TARGET ESMF::ESMF)
+      add_library(ESMF::ESMF ALIAS ESMF)
+    endif ()
   endif ()
 
   # ------