Skip to content

Commit

Permalink
Merge branch 'develop' into feature/mathomp4/#1282-configurable-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 authored Jan 31, 2022
2 parents 6efafa0 + ccccd31 commit 8f58d68
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- A small performance improvement. cycle => exit in MAPL_Generic.F90
- Made history global metadata configurable. This can be done in two ways
1. Globally for all collections by setting `COMMENT:`, `CONTACT:`, `CONVENTION:`, `INSTITUTION:`, `REFERENCES:`, and `SOURCE:` at the top of `HISTORY.rc` like `EXPDSC:`
2. On a per-collection bases by setting `collection.comment:`, `collection.contact:`, `collection.convention:`, `collection.institution:`, `collection.references:`, and `collection.source:`
Expand Down
12 changes: 4 additions & 8 deletions generic/MAPL_Generic.F90
Original file line number Diff line number Diff line change
Expand Up @@ -7019,17 +7019,13 @@ recursive subroutine MAPL_WireComponent(GC, RC)

_VERIFY(status)
SATISFIED = .true.
cycle
STAT = ior(STAT,MAPL_CplSATISFIED)
call MAPL_VarSpecSet(IM_SPECS(K), STAT=STAT, RC=status)
_VERIFY(status)
exit
end if
end do

if (SATISFIED) then
STAT = ior(STAT,MAPL_CplSATISFIED)
call MAPL_VarSpecSet(IM_SPECS(K), STAT=STAT, RC=status)
_VERIFY(status)
end if


do J=1,NC
gridcomp => STATE%get_child_gridcomp(J)
call MAPL_GridCompGetVarSpecs(gridcomp, EXPORT=EX_SPECS, RC=status)
Expand Down

0 comments on commit 8f58d68

Please sign in to comment.