From 247623a3ada00c27209a4623ed62bd522d2a009f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 25 May 2023 13:30:23 -0400 Subject: [PATCH 1/2] Use -O2 optimization in moist with GNU Release --- .../GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt index a1f0435e1..af3e15f1f 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt @@ -20,6 +20,10 @@ if (CMAKE_Fortran_COMPILER_ID MATCHES Intel AND CMAKE_BUILD_TYPE MATCHES Aggress set (CMAKE_Fortran_FLAGS_AGGRESSIVE "${GEOS_Fortran_FLAGS_VECT}") endif () +if (CMAKE_Fortran_COMPILER_ID MATCHES GNU AND CMAKE_BUILD_TYPE MATCHES Release) + string (REPLACE "${FOPT3}" "${FOPT2}" CMAKE_Fortran_FLAGS_RELEASE ${CMAKE_Fortran_FLAGS_RELEASE}) +endif () + # Note For unknown reasons, BACM_1M_Interface takes 20 minutes to compile at O3 # and 10 minutes at O2. But only 7 seconds with O1. So we compile at O1 if (CMAKE_Fortran_COMPILER_ID MATCHES Intel AND CMAKE_BUILD_TYPE MATCHES Release) From cc7800e75ec119a87f9bc922fd3ebd46708c6110 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 31 May 2023 12:22:40 -0400 Subject: [PATCH 2/2] Update CI Baselibs --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc09c5c54..260f043f6 100644 --- 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: