From d353f4e8e5731017426e30f00d2b33e3848c8989 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Feb 2021 10:07:34 -0500 Subject: [PATCH 1/3] Update to GFE Namespace --- .../GEOScatch_GridComp/mk_restarts/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/mk_restarts/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/mk_restarts/CMakeLists.txt index 4a9dd2e40..121c3a76a 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/mk_restarts/CMakeLists.txt +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/mk_restarts/CMakeLists.txt @@ -35,7 +35,7 @@ foreach (src ${exe_srcs}) ecbuild_add_executable ( TARGET ${exe} SOURCES ${src} - LIBS MAPL gftl-shared GEOS_SurfaceShared GEOSroute_GridComp GEOS_LandShared ${this}) + LIBS MAPL GFTL_SHARED::gftl-shared GEOS_SurfaceShared GEOSroute_GridComp GEOS_LandShared ${this}) endforeach () install(PROGRAMS mk_Restarts DESTINATION bin) From 24f8d6cade59df6499b0a0b9687661c6064be04e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 6 Apr 2021 14:28:02 -0400 Subject: [PATCH 2/3] Update CI image to 6.1.0 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02efcc47c..830a248df 100644 --- 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 index f2e5a7280..e73f6f257 100644 --- 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 }} From b68a00ca45dfda8564ff1da59ca3bffbded866d6 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 9 Apr 2021 12:20:16 -0400 Subject: [PATCH 3/3] Use cmake option for GFE namespace --- .../Utils/mk_restarts/CMakeLists.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 index 121c3a76a..3c96f962f 100644 --- 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::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)