Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto GitFlow - main → develop #3083

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Auto GitFlow - main → develop #3083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd28a17
candidate for v2.46.4 remove assert that there is no mask
bena-nasa Sep 30, 2024
230d319
Merge pull request #3071 from GEOS-ESM/develop
mathomp4 Oct 4, 2024
3295cee
Update CMakelists and changelog for 2.46.4 release
mathomp4 Oct 7, 2024
29d9269
Merge tag 'v2.46.4' into hotfix/mathomp4/bring-2.46.4
mathomp4 Oct 7, 2024
9eddd5e
Merge pull request #3081 from GEOS-ESM/hotfix/mathomp4/bring-2.46.4
mathomp4 Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading