From 9f44e428ed397acf58fece56c1b8cdc0e61714f9 Mon Sep 17 00:00:00 2001 From: Atanas Trayanov Date: Fri, 4 Mar 2022 16:36:57 -0500 Subject: [PATCH 1/2] Fixes #1405. Marks connections with specific 'reserved' keyword as used --- CHANGELOG.md | 1 + generic/VarConn.F90 | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0718c7e430d8..a539a516318f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Fixed +Fixes DO_NOT_CONNECT errors when calling MAPL_TerminateAnyImport ### Added diff --git a/generic/VarConn.F90 b/generic/VarConn.F90 index 4eeff7836c89..aae3ea7be7ba 100644 --- a/generic/VarConn.F90 +++ b/generic/VarConn.F90 @@ -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) From 16f47bfd4ae7faf997c33e3fb8f92f512af08f5b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Mar 2022 11:46:17 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a461a27457d..d33d58800955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Fixed -Fixes DO_NOT_CONNECT errors when calling MAPL_TerminateAnyImport ### Added @@ -22,6 +21,7 @@ Fixes DO_NOT_CONNECT errors when calling MAPL_TerminateAnyImport ### 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 ## [2.18.0] - 2022-02-23