Merge branch 'develop' into release/MAPL-v3

GEOS-ESM · Oct 7, 2024 · 25d2b84 · 25d2b84
2 parents bb8d1c5 + 4835afe
commit 25d2b84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,6 +71,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.49.1] - 2024-10-07
+
+### Fixed
+
+- Removed erroneous asserts that blocked some use cases in creating route handles
+
 ## [2.49.0] - 2024-10-04
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.49.0
+  VERSION 2.49.1
   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_EsmfRegridder.F90 b/base/MAPL_EsmfRegridder.F90
@@ -1532,36 +1532,38 @@ 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, &
                    & routehandle=route_handle, unmappedaction=unmappedaction, rc=status)
               _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)