Skip to content

Commit

Permalink
fixes #3369
Browse files Browse the repository at this point in the history
  • Loading branch information
bena-nasa committed Jan 28, 2025
1 parent 142a615 commit e95bc86
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixed but with MAPL_GetHorzijIndex from previous release when not points are passed on a processor causing a deadlock

### Removed

### Deprecated
Expand Down
7 changes: 2 additions & 5 deletions base/Base/Base_Base_implementation.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2632,7 +2632,6 @@ module subroutine MAPL_GetHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid, rc)
type(ESMF_CoordSys_Flag) :: coordSys
character(len=ESMF_MAXSTR) :: grid_type

_RETURN_IF(npts == 0 )
! if the grid is present then we can just get the prestored edges and the dimensions of the grid
! this also means we are running on a distributed grid
! if grid not present then the we just be running outside of ESMF and the user must
Expand Down Expand Up @@ -2789,9 +2788,6 @@ module subroutine MAPL_GetGlobalHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid,

logical :: good_grid, stretched

! Return if no local points
_RETURN_IF(npts == 0)

if ( .not. present(grid)) then
_FAIL("need a cubed-sphere grid")
endif
Expand All @@ -2808,10 +2804,11 @@ module subroutine MAPL_GetGlobalHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid,

! make sure the grid can be used in this subroutine
good_grid = grid_is_ok(grid)

if ( .not. good_grid ) then
_FAIL( "MAPL_GetGlobalHorzIJIndex cannot handle this grid")
endif
! Return if no local points
_RETURN_IF(npts==0)

! shift the grid away from Japan Fuji Mt.
shift0 = shift
Expand Down

0 comments on commit e95bc86

Please sign in to comment.