Merge pull request #2687 from GEOS-ESM/hotfix/tclune/#2686-workaround…

…-for-NAG Fixes #2686
GEOS-ESM · Mar 28, 2024 · 670bc7e · 670bc7e
2 parents 761fc2b + c4f90bb
commit 670bc7e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
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.44.3] - 2024-03-28
+
+### Fixed
+
+- The bundle I/O unit test was failing on NAG.  Partly due to an untrapped return code, but also some weird issue with setting values in ESMF Config. Probably not a bug in the compiler but something in  ESMF or MAPL handling line continuations.
+
 ## [2.44.2] - 2024-03-26
 
 ### Fixed

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

diff --git a/base/MAPL_CubedSphereGridFactory.F90 b/base/MAPL_CubedSphereGridFactory.F90
@@ -691,7 +691,7 @@ subroutine verify(n, m_world, ms, rc)
          else
 
             _ASSERT(n /= MAPL_UNDEFINED_INTEGER,'n not specified')
-            _ASSERT(m_world /= MAPL_UNDEFINED_INTEGER,'m_wold not specified')
+            _ASSERT(m_world /= MAPL_UNDEFINED_INTEGER,'m_world not specified')
             allocate(ms(n), stat=status)
             _VERIFY(status)
 

diff --git a/base/tests/mapl_bundleio_test.F90 b/base/tests/mapl_bundleio_test.F90
@@ -128,6 +128,7 @@ function create_cf(grid_name,im_world,jm_world,nx,ny,lm,cs_stretch_param,rc) res
        pole=grid_name(1:2)
 
        cf = MAPL_ConfigCreate(_RC)
+       call MAPL_ConfigSetAttribute(cf,value=NX, label=trim(grid_name)//".other:",_RC)
        call MAPL_ConfigSetAttribute(cf,value=NX, label=trim(grid_name)//".NX:",_RC)
        call MAPL_ConfigSetAttribute(cf,value=lm, label=trim(grid_name)//".LM:",_RC)
        if (jm_world==6*im_world) then