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

Jump to bottom

Make ESMF_CONTEXT_PARENT_VM default for ESMF_GridComp creation in generic3g/GenericGridComp.F90 (MAPL3) #2952

Merged
merged 4 commits into from
Aug 6, 2024
Merged

Make ESMF_CONTEXT_PARENT_VM default for ESMF_GridComp creation in generic3g/GenericGridComp.F90 (MAPL3) #2952

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba8e6f6
Change default contextFlag for ESMF_GridCompCreate
darianboggs Aug 5, 2024
6ca1175
Merge branch 'release/MAPL-v3' into feature/wdboggs/mapl3default_cont…
darianboggs Aug 6, 2024
438d893
Update CHANGELOG.md
darianboggs Aug 6, 2024
849ff71
Add `contextFlag=ESMF_CONTEXT_PARENT_VM, `
darianboggs Aug 6, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed all ESMF_AttributeGet and ESMF_AttributeSet to ESMF_InfoGet and ESMF_InfoSet respectively as old calls will be deprecated soon.
- Update executables using FLAP to use fArgParse
- Update `Findudunits.cmake` to link with libdl and look for the `udunits2.xml` file (as some MAPL tests require it)
- Modified `ESMF_GridComp` creation in `GenericGridComp` to use `ESMF_CONTEXT_PARENT_VM` by default.

### Fixed

Expand Down
7 changes: 5 additions & 2 deletions generic3g/GenericGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,15 @@ recursive type(ESMF_GridComp) function create_grid_comp_primary( &
type(OuterMetaComponent), pointer :: outer_meta
type(ESMF_Clock) :: user_clock
type(GriddedComponentDriver) :: user_gc_driver
type(ESMF_Context_Flag) :: contextFlag
integer :: status

gridcomp = ESMF_GridCompCreate(name=outer_name(name), petlist=petlist, _RC)
contextFlag = ESMF_CONTEXT_PARENT_VM
if(present(petlist)) contextFlag = ESMF_CONTEXT_OWN_VM
gridcomp = ESMF_GridCompCreate(name=outer_name(name), petlist=petlist, contextFlag=contextFlag, _RC)
call set_is_generic(gridcomp, _RC)

user_gridcomp = ESMF_GridCompCreate(name=name, petlist=petlist, _RC)
user_gridcomp = ESMF_GridCompCreate(name=name, petlist=petlist, contextFlag=contextFlag, _RC)
call set_is_generic(user_gridcomp, .false., _RC)

call attach_outer_meta(gridcomp, _RC)
Expand Down
Loading