v11: Add Build Info, Update ESMA_env, ESMA_cmake, FV3 GC

.circleci/config.yml

@@ -32,7 +32,9 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort, ifx]
+              # ifx currently can't build FMS
+              #compiler: [gfortran, ifort, ifx]
+              compiler: [gfortran, ifort]
           baselibs_version: *baselibs_version
           repo: GEOSgcm
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
@@ -44,7 +46,9 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort, ifx]
+              # ifx currently can't build FMS
+              #compiler: [gfortran, ifort, ifx]
+              compiler: [gfortran, ifort]
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm
@@ -58,7 +62,9 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort, ifx]
+              # ifx currently can't build FMS
+              #compiler: [gfortran, ifort, ifx]
+              compiler: [gfortran, ifort]
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm
@@ -90,25 +96,25 @@ workflows:
           image_name: geos-env-bcs
           tag_build_arg_name: *tag_build_arg_name
           resource_class: xlarge
-      - ci/publish_docker:
-          filters:
-            tags:
-              only: /^v.*$/
-          name: publish-ifx-docker-image
-          context:
-            - docker-hub-creds
-            - ghcr-creds
-          os_version: *os_version
-          baselibs_version: *baselibs_version
-          bcs_version: *bcs_version
-          container_name: geosgcm
-          mpi_name: intelmpi
-          mpi_version: "2021.14"
-          compiler_name: ifx
-          compiler_version: "2025.0"
-          image_name: geos-env-bcs
-          tag_build_arg_name: *tag_build_arg_name
-          resource_class: xlarge
+      #- ci/publish_docker:
+          #filters:
+            #tags:
+              #only: /^v.*$/
+          #name: publish-ifx-docker-image
+          #context:
+            #- docker-hub-creds
+            #- ghcr-creds
+          #os_version: *os_version
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
+          #container_name: geosgcm
+          #mpi_name: intelmpi
+          #mpi_version: "2021.14"
+          #compiler_name: ifx
+          #compiler_version: "2025.0"
+          #image_name: geos-env-bcs
+          #tag_build_arg_name: *tag_build_arg_name
+          #resource_class: xlarge
       - ci/publish_docker:
           filters:
             tags:

BUILD_INFO.rc.in

@@ -0,0 +1,45 @@
+== Build Configuration ==
+Build Type: @CMAKE_BUILD_TYPE@
+
+== System ==
+System Name: @CMAKE_SYSTEM_NAME@
+System Version: @CMAKE_SYSTEM_VERSION@
+Host System: @CMAKE_HOST_SYSTEM@
+Processor Description: @proc_description@
+
+== CMake ==
+CMake Version Used for Build: @CMAKE_VERSION@
+CMake Required Version: @CMAKE_MINIMUM_REQUIRED_VERSION@
+
+== Git ==
+Git Version: @GIT_VERSION_STRING@
+
+== Modules ==
+@ENVIRONMENT_MODULES@
+
+== Basedir ==
+BASEDIR: @BASEDIR_WITHOUT_ARCH@
+
+== Compilers ==
+C Compiler: @CMAKE_C_COMPILER@ (ID: @CMAKE_C_COMPILER_ID@ @CMAKE_C_COMPILER_VERSION@)
+C++ Compiler: @CMAKE_CXX_COMPILER@ (ID: @CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@)
+Fortran Compiler: @CMAKE_Fortran_COMPILER@ (ID: @CMAKE_Fortran_COMPILER_ID@ @CMAKE_Fortran_COMPILER_VERSION@)
+
+== MPI ==
+MPI C Compiler: @MPI_C_COMPILER@
+MPI C++ Compiler: @MPI_CXX_COMPILER@
+MPI Fortran Compiler: @MPI_Fortran_COMPILER@
+MPI Version: @MPI_VERSION@
+MPI Libraries: @MPI_LIBRARIES@
+MPI Stack: @MPI_STACK@
+MPI Stack Version: @MPI_STACK_VERSION@
+
+== BLAS ==
+BLAS_LIBRARIES: @BLAS_LIBRARIES@
+
+== LAPACK ==
+LAPACK_LIBRARIES: @LAPACK_LIBRARIES@
+
+== ESMF ==
+ESMF_VERSION: @ESMF_VERSION@
+ESMFMKFILE: @ESMFMKFILE@

CMakeLists.txt

@@ -80,7 +80,7 @@ if (NOT Baselibs_FOUND)
   # Another issue with historical reasons, old/wrong zlib target used in GEOS
   add_library(ZLIB::zlib ALIAS ZLIB::ZLIB)
 
-  find_package(MAPL 2.55 QUIET)
+  find_package(MAPL 2.56 QUIET)
   if (MAPL_FOUND)
     message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"")
   endif ()
@@ -100,6 +100,9 @@ esma_add_subdirectory (${env_dir})
 # Recursively build source tree
 add_subdirectory (src)
 
+configure_file(BUILD_INFO.rc.in BUILD_INFO.rc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/BUILD_INFO.rc DESTINATION etc)
+
 # https://www.scivision.dev/cmake-auto-gitignore-build-dir/
 # --- auto-ignore build directory
 if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)

README.md

@@ -16,28 +16,28 @@
 | [CICE](https://github.com/GEOS-ESM/CICE)                                       | [geos/v0.2.0](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.2.0)                            |
 | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc)                         | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1)                                 |
 | [ecbuild](https://github.com/GEOS-ESM/ecbuild)                                 | [geos/v1.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0)                         |
-| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake)                           | [v3.59.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.59.0)                                |
-| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v4.36.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.36.0)                                |
+| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake)                           | [v3.62.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.62.1)                                |
+| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v4.38.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.38.0)                                |
 | [FMS](https://github.com/GEOS-ESM/FMS)                                         | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) |
-| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.14.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.0)                    |
+| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1)                    |
 | [GAAS](https://github.com/GEOS-ESM/GAAS)                                       | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0)                                        |
 | [geos-chem](https://github.com/GEOS-ESM/geos-chem)                             | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1)             |
 | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp)           | [v2.5.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.5.0)                        |
-| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.1.7](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.7)                                 |
+| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.1.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.8)                                 |
 | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp)             | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0)                         |
 | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.3.11](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.11)                               |
-| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.7.3](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.7.3)                          |
+| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.7.4](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.7.4)                          |
 | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.12.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.12.0)                    |
 | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1)       |
 | [gigatraj](https://github.com/GEOS-ESM/gigatraj)                               | [geos/v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0)                                       |
 | [GMAO_perllib](https://github.com/GEOS-ESM/GMAO_perllib)                       | [v1.1.0](https://github.com/GEOS-ESM/GMAO_perllib/releases/tag/v1.1.0)                               |
-| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v2.1.0](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v2.1.0)                               |
+| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v2.1.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v2.1.1)                               |
 | [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.3.0)                            |
 | [HEMCO](https://github.com/GEOS-ESM/HEMCO)                                     | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0)                         |
 | [Icepack](https://github.com/GEOS-ESM/Icepack)                                 | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0)                       |
 | [MAM](https://github.com/GEOS-ESM/MAM)                                         | [v1.0.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.0.0)                                         |
-| [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.55.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.55.0)                                    |
+| [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.56.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.56.0)                                    |
 | [MATRIX](https://github.com/GEOS-ESM/MATRIX)                                   | [v1.0.0](https://github.com/GEOS-ESM/MATRIX/releases/tag/v1.0.0)                                      |
 | [MITgcm](https://github.com/GEOS-ESM/MITgcm)                                   | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o)                        |
 | [MOM5](https://github.com/GEOS-ESM/MOM5)                                       | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0)                |

components.yaml

@@ -5,13 +5,13 @@ GEOSgcm:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.36.0
+  tag: v4.38.0
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.59.0
+  tag: v3.62.1
   develop: develop
 
 ecbuild:
@@ -29,14 +29,14 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v2.1.0
+  tag: v2.1.1
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.1.7
+  tag: v2.1.8
   develop: main
 
 GMAO_perllib:
@@ -50,7 +50,7 @@ GMAO_perllib:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.55.0
+  tag: v2.56.0
   develop: develop
 
 FMS:
@@ -62,7 +62,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v2.7.3
+  tag: v2.7.4
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -75,7 +75,7 @@ GigaTraj:
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v2.14.0
+  tag: v2.14.1
   develop: develop
 
 fvdycore: