Merge pull request #114 from GEOS-ESM/feature/mathomp4/update-compone…

…nts-2024Aug12

Update components.yaml to match GEOSgcm main as of 2024-Aug-12

.circleci/config.yml

@@ -16,8 +16,8 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
-baselibs_version: &baselibs_version v7.24.0
-bcs_version: &bcs_version v11.3.0
+baselibs_version: &baselibs_version v7.25.0
+bcs_version: &bcs_version v11.5.0
 tag_build_arg_name: &tag_build_arg_name fv3version
 
 orbs:
@@ -72,9 +72,9 @@ workflows:
           baselibs_version: *baselibs_version
           container_name: geosfvdycore
           mpi_name: intelmpi
-          mpi_version: 2021.6.0
+          mpi_version: "2021.13"
           compiler_name: intel
-          compiler_version: 2022.1.0
+          compiler_version: "2024.2"
           image_name: geos-env
           tag_build_arg_name: *tag_build_arg_name
           resource_class: xlarge

CHANGELOG.md

@@ -17,6 +17,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.16.0] - 2024-08-12
+
+### Changed
+
+- Update to `components.yaml` to match or exceed GEOSgcm `main` as of 2024-08-12
+  - ESMA_cmake v3.45.1 → v3.48.0
+  - GMAO_Shared v1.9.7 → v1.9.8
+  - GEOS_Util v2.0.8 → v2.1.2
+  - MAPL v2.46.0 → v2.47.1
+  - FMS geos/2019.01.02+noaff.8 → geos/2019.01.02+noaff.10
+  - fvdycore geos/v2.8.2 → geos/v2.9.0
+
 ## [2.15.0] - 2024-05-03
 
 ### Changed

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSfvdycore
-  VERSION 2.15.0
+  VERSION 2.16.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")

README.md

@@ -14,7 +14,6 @@ In your `.bashrc` or `.tcshrc` or other rc file add a line:
 
 ###### bash
 
-
 ```bash
 umask 0022
 ulimit -s unlimited

components.yaml

@@ -11,7 +11,7 @@ env:
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.45.1
+  tag: v3.48.0
   develop: develop
 
 ecbuild:
@@ -22,26 +22,26 @@ ecbuild:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.9.7
+  tag: v1.9.8
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.0.8
+  tag: v2.1.2
   develop: main
 
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.46.0
+  tag: v2.47.1
   develop: develop
 
 FMS:
   local: ./src/Shared/@FMS
   remote: ../FMS.git
-  tag: geos/2019.01.02+noaff.8
+  tag: geos/2019.01.02+noaff.10
   develop: geos/release/2019.01
 
 FVdycoreCubed_GridComp:
@@ -53,6 +53,6 @@ FVdycoreCubed_GridComp:
 fvdycore:
   local: ./src/Components/@FVdycoreCubed_GridComp/@fvdycore
   remote: ../GFDL_atmos_cubed_sphere.git
-  tag: geos/v2.8.2
+  tag: geos/v2.9.0
   develop: geos/develop
 

parallel_build.csh

@@ -32,7 +32,7 @@ end
 
 if (-d ${ESMADIR}/@env || -d ${ESMADIR}/env@ || -d ${ESMADIR}/env) then
    if ( "$DEVELOP" == "TRUE" ) then
-      echo "Checking out development branch of GMAO_Shared and GEOS_Util"
+      echo "Checking out development branches of GMAO_Shared and GEOS_Util"
       mepo develop GMAO_Shared GEOS_Util
    endif
 else

src/Shared/CMakeLists.txt

@@ -3,11 +3,18 @@ esma_add_subdirectories (
   GMAO_Shared
   )
 
-if (FV_PRECISION STREQUAL R4)
-  esma_add_subdirectory (FMS RENAME fms_r4)
-elseif (FV_PRECISION STREQUAL R8)
-  esma_add_subdirectory (FMS RENAME fms_r8)
-elseif (FV_PRECISION STREQUAL R4R8)
-  esma_add_subdirectory (FMS RENAME fms_r4)
-  esma_add_subdirectory (FMS RENAME fms_r8)
+if (NOT FMS_FOUND)
+  message (STATUS "FMS library not found. Building FMS from source.")
+  if (FV_PRECISION STREQUAL R4)
+    esma_add_subdirectory (FMS RENAME fms_r4)
+  elseif (FV_PRECISION STREQUAL R8)
+    esma_add_subdirectory (FMS RENAME fms_r8)
+  # Special case - FMS is built twice with two
+  # different precisions.
+  elseif (FV_PRECISION STREQUAL R4R8)
+    esma_add_subdirectory (FMS RENAME fms_r4)
+    esma_add_subdirectory (FMS RENAME fms_r8)
+  endif ()
+else ()
+  message (STATUS "FMS library found. Using FMS from ${FMS_DIR}")
 endif ()