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

fixes #1549 #1551

Merged
merged 2 commits into from
Jun 7, 2022
Merged

fixes #1549 #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589b6f5
fixes #1549
bena-nasa Jun 7, 2022
be55456
Update CHANGELOG and CMakeLists for 2.21.3 Release
mathomp4 Jun 7, 2022
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
8 changes: 6 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Adding missing _RETURN and _VERIFY macros in GriddedIO.F90

### Added

### Changed
Expand All @@ -19,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.21.3] - 2022-06-07

### Fixed

- Fixed bug in non cubed-sphere grid path in MAPL_GetHorzIJIndex

## [2.21.2] - 2022-05-31

### Fixed
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 @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

project (
MAPL
VERSION 2.21.2
VERSION 2.21.3
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the default build type to release
Expand Down
42 changes: 15 additions & 27 deletions base/Base/Base_Base_implementation.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3011,10 +3011,8 @@ module subroutine MAPL_GetHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid, rc)

integer :: IM_World, JM_World, dims(3)
integer :: IM, JM, counts(3)
real(ESMF_KIND_R8), pointer :: lons(:,:) => null()
real(ESMF_KIND_R8), pointer :: lats(:,:) => null()
real(ESMF_KIND_R8), allocatable :: lons_1d(:)
real(ESMF_KIND_R8), allocatable :: lats_1d(:)
real(ESMF_KIND_R8), pointer :: lons(:,:)
real(ESMF_KIND_R8), pointer :: lats(:,:)
real(ESMF_KIND_R8), allocatable :: elons(:)
real(ESMF_KIND_R8), allocatable :: elats(:)
integer :: i,iiloc,jjloc
Expand Down Expand Up @@ -3082,26 +3080,26 @@ module subroutine MAPL_GetHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid, rc)
else
if (localSearch) then
call ESMF_GridGetCoord(grid,coordDim=1, localDe=0, &
staggerloc=ESMF_STAGGERLOC_CENTER, fArrayPtr = lons, rc=status)
_VERIFY(STATUS)
staggerloc=ESMF_STAGGERLOC_CORNER, fArrayPtr = lons, _RC)
call ESMF_GridGetCoord(grid,coordDim=2, localDe=0, &
staggerloc=ESMF_STAGGERLOC_CENTER, fArrayPtr = lats, rc=status)
_VERIFY(STATUS)
staggerloc=ESMF_STAGGERLOC_CORNER, fArrayPtr = lats, _RC)
else
_FAIL('if not isCubed, localSearch must be .true.')
end if
allocate(lons_1d(im),stat=status)
_VERIFY(STATUS)
allocate(lats_1d(jm),stat=status)
_VERIFY(STATUS)
allocate(elons(im+1),stat=status)
_VERIFY(STATUS)
allocate(elats(jm+1),stat=status)
_VERIFY(STATUS)
lons_1d = lons(:,1)
lats_1d = lats(1,:)
call calc_edges_1d(elons,lons_1d,IM)
call calc_edges_1d(elats,lats_1d,JM)
call ESMF_GridGet(grid,coordSys=coordSys,rc=status)
_VERIFY(STATUS)
elons = lons(:,1)
elats = lats(1,:)
if (coordSys==ESMF_COORDSYS_SPH_DEG) then
elons=elons*MAPL_DEGREES_TO_RADIANS_R8
elats=elats*MAPL_DEGREES_TO_RADIANS_R8
else if (coordSys==ESMF_COORDSYS_CART) then
_FAIL('Unsupported coordinate system: ESMF_COORDSYS_CART')
end if
! lat-lon grid goes from -180 to 180 shift if we must
! BMA this -180 to 180 might change at some point
do i=1,npts
Expand All @@ -3113,7 +3111,7 @@ module subroutine MAPL_GetHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid, rc)
II(i) = IIloc
JJ(i) = JJloc
end do
deallocate(lons_1d,lats_1d,elons,elats)
deallocate(elons,elats)
end if

_RETURN(ESMF_SUCCESS)
Expand Down Expand Up @@ -3167,16 +3165,6 @@ integer function ijsearch(coords,idim,valueIn,periodic) ! fast bisection version
endif
end function ijsearch

subroutine calc_edges_1d(ecoords,coords,idim)
integer, intent(in) :: idim
real(ESMF_KIND_R8), intent(in) :: coords(idim)
real(ESMF_KIND_R8), intent(out) :: ecoords(idim+1)
ecoords(1) = coords(1) - 0.5 * ( coords(2) - coords(1) )
ecoords(2:idim) = 0.5 * ( coords(1:idim-1)+coords(2:idim) )
ecoords(idim+1) = coords(idim) + 0.5 * (coords(idim) - coords(idim-1))
return
end subroutine calc_edges_1d

end subroutine MAPL_GetHorzIJIndex

module subroutine MAPL_GenGridName(im, jm, lon, lat, xyoffset, gridname, geos_style)
Expand Down