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

Propagate errors in SetServices upwards #1002

Closed
wants to merge 2 commits into from
Closed

Propagate errors in SetServices upwards #1002

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
1356f84
Fixed bug in MAPL_AddChildFromMeta(): _VERIFY SS and ESMF_GridCompSet…
LiamBindle Aug 26, 2021
2e75b1d
Updated the changelog
LiamBindle Aug 26, 2021
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixed bug in MAPL_AddChildFromMeta so that an error in the SetServices of a gridded component is propagated upwards correctly

## [2.8.4] - 2021-08-27

### Added
Expand Down
5 changes: 4 additions & 1 deletion base/MAPL_Generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4542,6 +4542,7 @@ recursive integer function MAPL_AddChildFromMeta(META, NAME, GRID, &
!EOPI

integer :: STATUS
integer :: SS_STATUS

integer :: I
type(MAPL_MetaComp), pointer :: CHILD_META, tmp_meta
Expand Down Expand Up @@ -4673,7 +4674,9 @@ recursive integer function MAPL_AddChildFromMeta(META, NAME, GRID, &
call CHILD_META%t_profiler%start(__RC__)
call CHILD_META%t_profiler%start('SetService',__RC__)
gridcomp => META%GET_CHILD_GRIDCOMP(I)
call ESMF_GridCompSetServices ( gridcomp, SS, RC=status )
call ESMF_GridCompSetServices ( gridcomp, SS, userRC=SS_STATUS, RC=status )
_VERIFY(STATUS)
_VERIFY(SS_STATUS)
call CHILD_META%t_profiler%stop('SetService',__RC__)
call CHILD_META%t_profiler%stop(__RC__)
call t_p%stop(trim(NAME),__RC__)
Expand Down