Skip to content

Commit

Permalink
Merge pull request #1709 from GEOS-ESM/hotfix/atrayano/dso-parentgc-fix
Browse files Browse the repository at this point in the history
Fixes #1678. Added parentGC argument to the call MAPL_AddChildFromDSO…
  • Loading branch information
mathomp4 authored Oct 4, 2022
2 parents 43d92e9 + 36e834f commit 160a8d7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
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.27.1] - 2022-10-04

### Fixed

- Fixed a missing parentGC argument to addChildFromDSO

## [2.27.0] - 2022-10-03

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
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.27.0
VERSION 2.27.1
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the default build type to release
Expand Down
2 changes: 1 addition & 1 deletion generic/MAPL_Generic.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5006,7 +5006,7 @@ recursive integer function AddChildFromDSO(gc, name, userRoutine, grid, sharedOb

call MAPL_InternalStateRetrieve(gc, meta, _RC)

AddChildFromDSO = AddChildFromDSOMeta(meta, name, userRoutine, grid=grid, sharedObj=sharedObj, petList=petList, configFile=configFile, _RC)
AddChildFromDSO = AddChildFromDSOMeta(meta, name, userRoutine, grid=grid, sharedObj=sharedObj, petList=petList, configFile=configFile, parentGC=gc, _RC)

_RETURN(ESMF_SUCCESS)
end function AddChildFromDSO
Expand Down

0 comments on commit 160a8d7

Please sign in to comment.