Merge pull request #2399 from GEOS-ESM/hotfix/bmauer/fixes-#2398

Fixes #2398
GEOS-ESM · Oct 4, 2023 · d1cdaa4 · d1cdaa4
2 parents 6c718d2 + 9e81463
commit d1cdaa4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.41.1] - 2023-10-04
+
+### Fixed
+
+- Adding missing check on the return status when reading import checkpoint in MAPL\_GenericInitialize
+
 ## [2.41.0] - 2023-09-22
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.41.0
+  VERSION 2.41.1
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui

diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90
@@ -1613,6 +1613,7 @@ subroutine create_import_and_initialize_state_variables(rc)
                   if (MAPL_AM_I_Root(VM)) then
                      call ESMF_StatePrint(Import)
                   end if
+                  _RETURN(ESMF_FAILURE)
                end if
             endif
          end if
-Original file line number
+Diff line change
@@ Expand Up @@
                       if (MAPL_AM_I_Root(VM)) then
                          call ESMF_StatePrint(Import)
                       end if
+                      _RETURN(ESMF_FAILURE)
                    end if
                 endif
              end if
@@ Expand Down @@