Merge pull request #134 from GEOS-ESM/develop

Merge develop into main for release

Author: mathomp4

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   gcc-build-env:
     docker:
-      - image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
+      - image: gmao/ubuntu20-geos-env-mkl:v6.2.7-openmpi_4.0.6-gcc_11.2.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN

CMakeLists.txt

@@ -25,7 +25,7 @@ endif ()
 
 esma_add_library (${this}
   SRCS ${srcs}
-  SUBCOMPONENTS @fvdycore
+  SUBCOMPONENTS fvdycore
   DEPENDENCIES ${dependencies}
   DEPENDENCIES ${GFDL}
   INCLUDES ${INC_ESMF})