diff --git a/CHANGELOG.md b/CHANGELOG.md index e80d4e505881..f271ecd19966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed bug that required a /dev/null ExtData entry to still have a file variable name - Fixed bug with checking for duplicate alias in collection - Added protection in History to only allow `instantaneous` or `time-averaged` modes +- Check userRC after ESMF_GridCompInitialize in MAPL_GenericInitialize ### Added diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index 5f770fa4818e..afdc7d0cd178 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -1265,6 +1265,7 @@ recursive subroutine initialize_children_and_couplers(rc) exportState=child_export_state, & clock=CLOCK, PHASE=CHLDMAPL(I)%PTR%PHASE_INIT(PHASE), & userRC=userRC, __RC__ ) + _VERIFY(userRC) call MAPL_TimerOff(STATE,trim(CHILD_NAME)) end if end do