Skip to content

Commit

Permalink
Merge pull request #1406 from GEOS-ESM/hotfix/atrayano/#1405_terminat…
Browse files Browse the repository at this point in the history
…e_import_all

Fixes #1405. Marks connections with specific 'reserved' keyword as used
  • Loading branch information
mathomp4 authored Mar 7, 2022
2 parents 5020c80 + c98473f commit 40b13dc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixes DO_NOT_CONNECT errors when calling MAPL_TerminateAnyImport
- Fixed the alarms in the couplers to account if they are called before ESMF_ClockAdvance is called
- Reverted generic/VarSpec.F90 to hash b02e8ff (fix for #1410)

Expand Down
1 change: 1 addition & 0 deletions generic/VarConn.F90
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ subroutine append(CONN, SHORT_NAME, TO_NAME, &
new_conn => CONN%conn_v%back()
new_conn%From = VarConnPoint(SHORT_NAME, gc_id=usableFROM_EXPORT)
new_conn%To = VarConnPoint(usableTONAME, gc_id=usableTO_IMPORT)
if(short_name == "MAPL_AnyChildImport") new_conn%used = .true.

_RETURN(ESMF_SUCCESS)

Expand Down

0 comments on commit 40b13dc

Please sign in to comment.