From dd28a17cdaca2b4fc0941e2d59e5ebc414313927 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Mon, 30 Sep 2024 12:01:51 -0400 Subject: [PATCH 1/2] candidate for v2.46.4 remove assert that there is no mask --- base/MAPL_EsmfRegridder.F90 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/base/MAPL_EsmfRegridder.F90 b/base/MAPL_EsmfRegridder.F90 index 91df059e6623..97587cf6421d 100644 --- a/base/MAPL_EsmfRegridder.F90 +++ b/base/MAPL_EsmfRegridder.F90 @@ -1530,9 +1530,9 @@ subroutine create_route_handle(this, kind, rc) _VERIFY(status) case (REGRID_METHOD_PATCH) - _ASSERT(.not.has_mask, "destination masking with this regrid type is unsupported") call ESMF_FieldRegridStore(src_field, dst_field, & & regridmethod=ESMF_REGRIDMETHOD_PATCH, & + & dstMaskValues = dstMaskValues, & & linetype=ESMF_LINETYPE_GREAT_CIRCLE, & ! closer to SJ Lin interpolation weights? & srcTermProcessing = srcTermProcessing, & & factorList=factorList, factorIndexList=factorIndexList, & @@ -1540,26 +1540,28 @@ subroutine create_route_handle(this, kind, rc) _VERIFY(status) case (REGRID_METHOD_CONSERVE_2ND) - _ASSERT(.not.has_mask, "destination masking with this regrid type is unsupported") call ESMF_FieldRegridStore(src_field, dst_field, & & regridmethod=ESMF_REGRIDMETHOD_CONSERVE_2ND, & + & dstMaskValues = dstMaskValues, & & linetype=ESMF_LINETYPE_GREAT_CIRCLE, & ! closer to SJ Lin interpolation weights? & srcTermProcessing = srcTermProcessing, & & factorList=factorList, factorIndexList=factorIndexList, & & routehandle=route_handle, unmappedaction=unmappedaction, rc=status) _VERIFY(status) case (REGRID_METHOD_CONSERVE, REGRID_METHOD_CONSERVE_MONOTONIC, REGRID_METHOD_VOTE, REGRID_METHOD_FRACTION) - _ASSERT(.not.has_mask, "destination masking with this regrid type is unsupported") + call ESMF_FieldRegridStore(src_field, dst_field, & & regridmethod=ESMF_REGRIDMETHOD_CONSERVE, & + & dstMaskValues = dstMaskValues, & & srcTermProcessing = srcTermProcessing, & & factorList=factorList, factorIndexList=factorIndexList, & & routehandle=route_handle, unmappedaction=unmappedaction, rc=status) _VERIFY(status) case (REGRID_METHOD_NEAREST_STOD) - _ASSERT(.not.has_mask, "destination masking with this regrid type is unsupported") + call ESMF_FieldRegridStore(src_field, dst_field, & & regridmethod=ESMF_REGRIDMETHOD_NEAREST_STOD, & + & dstMaskValues = dstMaskValues, & & factorList=factorList, factorIndexList=factorIndexList, & & routehandle=route_handle, unmappedaction=unmappedaction, rc=status) _VERIFY(status) From 3295ceebe7e870aaca2018c12ea1ac82d0628fa5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Oct 2024 12:58:06 -0400 Subject: [PATCH 2/2] Update CMakelists and changelog for 2.46.4 release --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfea0235e181..c432373df80f 100644 --- 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.46.4] - 2024-10-07 + +### Fixed + +- Removed erroneous asserts that blocked some use cases in creating route handles + ## [2.46.3] - 2024-08-16 ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a0ecb3b109a..1f6fc9356cec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ endif () project ( MAPL - VERSION 2.46.3 + VERSION 2.46.4 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF # Set the possible values of build type for cmake-gui