Merge pull request #894 from GEOS-ESM/develop

Sync develop into main
GEOS-ESM · Jan 30, 2024 · e74fdb1 · e74fdb1
2 parents 9b06a8b + e2b79bd
commit e74fdb1
Show file tree

Hide file tree

Showing 30 changed files with 6,296 additions and 199 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:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,7 @@ set (alldirs
   GEOSdataatm_GridComp
   GEOSmkiau_GridComp
   GEOSogcm_GridComp
+  GEOSwgcm_GridComp
   )