candidate for v2.46.4 remove assert that there is no mask

GEOS-ESM · Sep 30, 2024 · dd28a17 · dd28a17
1 parent e8b8e5e
commit dd28a17
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/base/MAPL_EsmfRegridder.F90 b/base/MAPL_EsmfRegridder.F90
@@ -1530,36 +1530,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)