Merge branch 'develop' into feature/pcolarco/#1-geosmoist-updates

GEOS-ESM · Apr 15, 2021 · 761154f · 761154f
2 parents 687737a + c1db08a
commit 761154f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 executors:
   gcc-build-env:
     docker:
-      - image: gmao/ubuntu20-geos-env-mkl:v6.0.27-openmpi_4.0.5-gcc_10.2.0
+      - image: gmao/ubuntu20-geos-env-mkl:v6.1.0-openmpi_4.0.5-gcc_10.2.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -17,7 +17,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-latest
     container: 
-      image: gmao/ubuntu20-geos-env-mkl:v6.0.27-openmpi_4.0.5-gcc_10.2.0
+      image: gmao/ubuntu20-geos-env-mkl:v6.1.0-openmpi_4.0.5-gcc_10.2.0
       credentials:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/CMakeLists.txt
@@ -32,10 +32,17 @@ esma_add_library (${this}
 
 foreach (src ${exe_srcs})
   string (REGEX REPLACE ".F90" "" exe ${src})
-  ecbuild_add_executable (
-    TARGET ${exe}
-    SOURCES ${src}
-    LIBS MAPL gftl-shared GEOS_SurfaceShared GEOSroute_GridComp GEOS_LandShared ${this})
+  if (ESMA_USE_GFE_NAMESPACE)
+    ecbuild_add_executable (
+      TARGET ${exe}
+      SOURCES ${src}
+      LIBS MAPL GFTL_SHARED::gftl-shared GEOS_SurfaceShared GEOSroute_GridComp GEOS_LandShared ${this})
+  else ()
+    ecbuild_add_executable (
+      TARGET ${exe}
+      SOURCES ${src}
+      LIBS MAPL gftl-shared GEOS_SurfaceShared GEOSroute_GridComp GEOS_LandShared ${this})
+  endif ()
 endforeach ()
 
 install(PROGRAMS mk_Restarts DESTINATION bin)