Merge branch 'develop' into bugfix/rreichle/Surface_Longwave_LONG_NAMES

GEOS-ESM · Jun 6, 2023 · 040c2bc · 040c2bc
2 parents 38257b1 + 7707e85
commit 040c2bc
Show file tree

Hide file tree

Showing 10 changed files with 1,837 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.7.0
+baselibs_version: &baselibs_version v7.13.0
 bcs_version: &bcs_version v11.00.0
 
 orbs:

diff --git a/GEOSagcm_GridComp/CMakeLists.txt b/GEOSagcm_GridComp/CMakeLists.txt
@@ -5,7 +5,15 @@ set (alldirs
   GEOSphysics_GridComp
   )
 
-if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_AgcmGridComp.F90)
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_AgcmSimpleGridComp.F90)
+
+  message(STATUS "Building Held-Suarez GridComp")
+  esma_add_library (${this}
+    SRCS GEOS_AgcmSimpleGridComp.F90
+    SUBCOMPONENTS GEOSsuperdyn_GridComp GEOShs_GridComp
+    DEPENDENCIES MAPL esmf)
+
+elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_AgcmGridComp.F90)
 
   esma_add_library (${this}
     SRCS GEOS_AgcmGridComp.F90