From c540504e3fbb31bb74659675e44e937228e8dad9 Mon Sep 17 00:00:00 2001 From: Arlindo da Silva Date: Thu, 21 Oct 2021 18:39:00 -0400 Subject: [PATCH 1/5] ams: exposed optional parameter TO_NAME in AddExportFromChild for GOCART-2G --- generic/MAPL_Generic.F90 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index 105d9343d958..b23697b51688 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -3337,13 +3337,15 @@ end subroutine MAPL_StateAddExportSpec_ ! !IIROUTINE: MAPL_StateAddExportSpecFrmChld --- Add \texttt{EXPORT} spec from child !INTERFACE: - subroutine MAPL_StateAddExportSpecFrmChld ( GC, SHORT_NAME, CHILD_ID, RC ) + subroutine MAPL_StateAddExportSpecFrmChld ( GC, SHORT_NAME, CHILD_ID, RC, TO_NAME ) !ARGUMENTS: type(ESMF_GridComp), intent(INOUT) :: GC - character (len=*) , intent(IN) :: SHORT_NAME + character (len=*) , intent(IN) :: SHORT_NAME ! NAME in CHILD integer , intent(IN) :: CHILD_ID integer , optional , intent(OUT) :: RC + character (len=*), optional, intent(IN) :: TO_NAME ! NAME to appear is EXPORT; + ! default is SHORT_NAME !EOPI character(len=ESMF_MAXSTR), parameter :: IAm="MAPL_StateAddExportSpecFrmChld" @@ -3351,6 +3353,7 @@ subroutine MAPL_StateAddExportSpecFrmChld ( GC, SHORT_NAME, CHILD_ID, RC ) call MAPL_AddConnectivityE2E ( GC, SHORT_NAME, & + TO_NAME = TO_NAME, & SRC_ID = CHILD_ID, & TO_EXPORT = MAPL_Self, RC=STATUS ) _VERIFY(STATUS) @@ -4911,10 +4914,11 @@ subroutine MAPL_AddConnectivityOld ( GC, SHORT_NAME, TO_NAME, & end subroutine MAPL_AddConnectivityOld subroutine MAPL_AddConnectivityE2E ( GC, SHORT_NAME, & - SRC_ID, TO_EXPORT, RC ) + SRC_ID, TO_EXPORT, RC, TO_NAME ) type(ESMF_GridComp), intent(INOUT) :: GC ! Gridded component character (len=*), intent(IN ) :: SHORT_NAME + character (len=*), optional, intent(IN) :: TO_NAME: name in TO_EXPORT integer, intent(IN ) :: SRC_ID !FROM_EXPORT integer, intent(IN ) :: TO_EXPORT integer, optional, intent( OUT) :: RC ! Error code: @@ -4927,6 +4931,7 @@ subroutine MAPL_AddConnectivityE2E ( GC, SHORT_NAME, & _VERIFY(STATUS) call MAPL_VarConnCreate(CONN%CONNECT, SHORT_NAME, & + TO_NAME = TO_NAME, & FROM_EXPORT=SRC_ID, & TO_EXPORT=TO_EXPORT, RC=STATUS ) _VERIFY(STATUS) From 96952f2f45360059d3a062b4fe5586fc5195be6f Mon Sep 17 00:00:00 2001 From: Arlindo da Silva Date: Thu, 21 Oct 2021 19:48:00 -0400 Subject: [PATCH 2/5] ams: updated CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e094e55d3f51..db206022d581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Exposed `TO_NAME` argument in `MAPL_StateAddExportSpecFrmChld()` to + allow renaming of EXPORTS. Needed for GOCART-2G. + ### Fixed ## [2.8.6] - 2021-09-13 From f96756f66b97bdd4725208e0ec95da0ae43434a7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 22 Oct 2021 08:37:21 -0400 Subject: [PATCH 3/5] Fix bad changelog merge --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2edaed7c91d8..4c0007b9c624 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Exposed `TO_NAME` argument in `MAPL_StateAddExportSpecFrmChld()` to + allow renaming of EXPORTS. Needed for GOCART-2G. + ### Changed ### Removed @@ -31,8 +34,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 4 spaces for Python - 2 spaces for CMake and YAML - Preload available macros in CMake package configuration file. -- Exposed `TO_NAME` argument in `MAPL_StateAddExportSpecFrmChld()` to - allow renaming of EXPORTS. Needed for GOCART-2G. ### Changed From 9e32b1791b32c92d7a113d4715ebc4d351bc43ea Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 22 Oct 2021 08:42:14 -0400 Subject: [PATCH 4/5] Update generic/MAPL_Generic.F90 --- generic/MAPL_Generic.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index da3999d0cbd6..adcb79c0f4ee 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -4955,7 +4955,7 @@ subroutine MAPL_AddConnectivityE2E ( GC, SHORT_NAME, & type(ESMF_GridComp), intent(INOUT) :: GC ! Gridded component character (len=*), intent(IN ) :: SHORT_NAME - character (len=*), optional, intent(IN) :: TO_NAME: name in TO_EXPORT + character (len=*), optional, intent(IN) :: TO_NAME !name in TO_EXPORT integer, intent(IN ) :: SRC_ID !FROM_EXPORT integer, intent(IN ) :: TO_EXPORT integer, optional, intent( OUT) :: RC ! Error code: From 7e7155dada74b7697215334db13b54aec1559d44 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 22 Oct 2021 08:45:55 -0400 Subject: [PATCH 5/5] Update generic/MAPL_Generic.F90 --- generic/MAPL_Generic.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index adcb79c0f4ee..fc82799b86af 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -4951,7 +4951,7 @@ subroutine MAPL_AddConnectivityOld ( GC, SHORT_NAME, TO_NAME, & end subroutine MAPL_AddConnectivityOld subroutine MAPL_AddConnectivityE2E ( GC, SHORT_NAME, & - SRC_ID, TO_EXPORT, RC, TO_NAME ) + SRC_ID, TO_EXPORT, TO_NAME, RC ) type(ESMF_GridComp), intent(INOUT) :: GC ! Gridded component character (len=*), intent(IN ) :: SHORT_NAME