Merge pull request #1000 from GEOS-ESM/develop

Merge Develop into Main for release
GEOS-ESM · Aug 26, 2021 · b6b482e · b6b482e
2 parents 0ca59e5 + 0721869
commit b6b482e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 executors:
   gfortran:
     docker:
-      - image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
+      - image: gmao/ubuntu20-geos-env-mkl:v6.2.7-openmpi_4.0.6-gcc_11.2.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN
@@ -17,7 +17,7 @@ executors:
 
   ifort:
     docker:
-      - image: gmao/ubuntu20-geos-env:v6.2.4-intelmpi_2021.2.0-intel_2021.2.0
+      - image: gmao/ubuntu20-geos-env:v6.2.7-intelmpi_2021.2.0-intel_2021.2.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -16,7 +16,7 @@ jobs:
     name: Build and Test MAPL
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
+      image: gmao/ubuntu20-geos-env-mkl:v6.2.7-openmpi_4.0.6-gcc_11.2.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests
@@ -67,7 +67,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.2.4-openmpi_4.0.5-gcc_10.3.0                                                                                    #
+  #     image: gmao/ubuntu20-geos-env-mkl:v6.2.7-openmpi_4.0.6-gcc_11.2.0                                                                                    #
   #   env:                                                                                                                                                   #
   #     OMPI_ALLOW_RUN_AS_ROOT: 1                                                                                                                            #
   #     OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1                                                                                                                    #
@@ -138,7 +138,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v6.2.4-intelmpi_2021.2.0-intel_2021.2.0
+      image: gmao/ubuntu20-geos-env:v6.2.7-intelmpi_2021.2.0-intel_2021.2.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [2.8.4] - 2021-08-27
+
+### Added
+
+- Added `esma_cpack` include for tarring ability
+
+### Changed
+
+- Updated ESMA_cmake to v3.5.4
+
+### Fixed
+
+- Fix bug when restart name has a "-" at the beginning
+
 ## [2.8.3] - 2021-08-19
 
 ### Removed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.8.3
+  VERSION 2.8.4
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # mepo can now clone subrepos in three styles
@@ -18,6 +18,7 @@ foreach (dir IN LISTS ESMA_CMAKE_DIRS)
   if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${dir})
     list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}")
     include (esma)
+    set(MAPL_STANDALONE TRUE)
   endif ()
 endforeach ()
 
@@ -40,6 +41,7 @@ if (NOT COMMAND esma)
       if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${dir})
         list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}")
         include (esma)
+        set(MAPL_STANDALONE TRUE)
       endif ()
     endforeach ()
     option (SKIP_MEPO "Set to skip mepo steps" ON)
@@ -146,3 +148,8 @@ install(
    )
 
 ecbuild_install_project (NAME MAPL)
+
+# This must be after ecbuild_install_project
+if (MAPL_STANDALONE)
+  include (esma_cpack OPTIONAL)
+endif ()
diff --git a/base/MAPL_Generic.F90 b/base/MAPL_Generic.F90
@@ -5907,7 +5907,7 @@ subroutine MAPL_ESMFStateReadFromFile(STATE,CLOCK,FILENAME,MPL,HDR,RC)
           !possible insufficent metadata in the other restarts to support the other grid factories
           if (trim(grid_type) == 'Cubed-Sphere') then
              app_factory => get_factory(MPL%GRID%ESMFGRID)
-             allocate(file_factory,source=grid_manager%make_factory(trim(filename)))
+             allocate(file_factory,source=grid_manager%make_factory(trim(fname)))
              _ASSERT(file_factory%physical_params_are_equal(app_factory),"Factories not equal")
           end if
           call ArrDescrSetNCPar(arrdes,MPL,num_readers=mpl%grid%num_readers,RC=STATUS)

diff --git a/components.yaml b/components.yaml
@@ -11,7 +11,7 @@ ESMA_env:
 ESMA_cmake:
   local: ./ESMA_cmake
   remote: ../ESMA_cmake.git
-  tag: v3.5.3
+  tag: v3.5.4
   develop: develop
 
 ecbuild: