From 714cc088cf3b15c6645492e741bf26e3df44a413 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Thu, 28 Mar 2024 09:49:54 -0400 Subject: [PATCH 1/2] Fixes #2686 --- CHANGELOG.md | 2 ++ base/MAPL_CubedSphereGridFactory.F90 | 2 +- base/tests/mapl_bundleio_test.F90 | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14325c71d711..201bcaa011bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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. + ### Removed ### Deprecated diff --git a/base/MAPL_CubedSphereGridFactory.F90 b/base/MAPL_CubedSphereGridFactory.F90 index cfb561b7d5ff..0d7070ede827 100644 --- 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 index ad9981c858c6..ff541c9343fc 100644 --- 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 From c4f90bbe7afba4d67745b1df4bdf9d099753b530 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 28 Mar 2024 11:13:55 -0400 Subject: [PATCH 2/2] Prepare for 2.44.3 Release --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 201bcaa011bb..9fa03e2d96c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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. - ### Removed ### 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 index d0cbe7caa523..96875bfee68a 100644 --- 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