Skip to content

Commit

Permalink
Merge pull request #3083 from GEOS-ESM/main
Browse files Browse the repository at this point in the history
Auto GitFlow - main → develop
  • Loading branch information
mathomp4 authored Oct 7, 2024
2 parents d543cf8 + 9eddd5e commit 4835afe
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions base/MAPL_EsmfRegridder.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4835afe

Please sign in to comment.