Merge pull request #1125 from GEOS-ESM/arlindo-temp

CI-Friendly version of #1123
GEOS-ESM · Oct 22, 2021 · 72bec82 · 72bec82
2 parents f48d150 + 7e7155d
commit 72bec82
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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

diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90
@@ -3374,20 +3374,23 @@ 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"
     integer                               :: STATUS
 
 
     call MAPL_AddConnectivityE2E ( GC, SHORT_NAME, &
+                                TO_NAME = TO_NAME, &
                                 SRC_ID = CHILD_ID, &
                                 TO_EXPORT = MAPL_Self, RC=STATUS  )
     _VERIFY(STATUS)
@@ -4948,10 +4951,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, TO_NAME, RC )
 
     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:
@@ -4964,6 +4968,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)