From 5568ef86f277649c3aa1f2fb94fa519afbf49ec7 Mon Sep 17 00:00:00 2001
From: Gerhard Theurich <theurich@sourcespring.net>
Date: Wed, 25 Sep 2024 17:04:47 -0600
Subject: [PATCH] Remove calls into ESMF_ReconcileExchgAttributes from
 ESMF_StateReconcile(). This operation is not needed for standard following
 ESMF and NUOPC code.

---
 .../src/ESMF_StateReconcile.F90               | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/src/Superstructure/StateReconcile/src/ESMF_StateReconcile.F90 b/src/Superstructure/StateReconcile/src/ESMF_StateReconcile.F90
index d693fe03f2..6830315611 100644
--- a/src/Superstructure/StateReconcile/src/ESMF_StateReconcile.F90
+++ b/src/Superstructure/StateReconcile/src/ESMF_StateReconcile.F90
@@ -228,14 +228,6 @@ subroutine ESMF_StateReconcile(state, vm, rc)
 
     if (isNoop) then
 call ESMF_LogWrite("returning early with isNoop=.true.", ESMF_LOGMSG_DEBUG, rc=localrc)
-#if 0
-  !TODO: this is copied here for the old attribute reconciliation behavior
-  !TODO: remove now that we decided that's not what we want to happen
-      call ESMF_ReconcileExchgAttributes (state, vm, rc=localrc)
-      if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
-          ESMF_CONTEXT,  &
-          rcToReturn=rc)) return
-#endif
 #if 1
       ! successful early return because of NOOP condition
       if (present(rc)) rc = ESMF_SUCCESS
@@ -1144,41 +1136,7 @@ subroutine ESMF_StateReconcile_driver (state, vm, attreconflag, rc)
     ! -------------------------------------------------------------------------
     if (meminfo) call ESMF_VMLogMemInfo ("after 7.) Deserialize received objects and create proxies")
 
-    ! -------------------------------------------------------------------------
-    ! 8.) Attributes on the State itself
-    ! -------------------------------------------------------------------------
-    if (profile) then
-      call ESMF_TraceRegionEnter("8.) Attributes on the State itself", rc=localrc)
-      if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
-        ESMF_CONTEXT,  &
-        rcToReturn=rc)) return
-    endif
-    ! -------------------------------------------------------------------------
-#if 1
-  !TODO: Turn this off, and probably remove completely from StateReconcile
-  !TODO: But first make sure the NUOPC protos still all work!!!!
-    if (attreconflag == ESMF_ATTRECONCILE_ON) then
-      if (trace) then
-        call ESMF_ReconcileDebugPrint (ESMF_METHOD //  &
-            ': *** Step 8 - Exchange Base Attributes', ask=.false.)
-        call ESMF_VMBarrier (vm)
-      end if
-      call ESMF_ReconcileExchgAttributes (state, vm, rc=localrc)
-      if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
-          ESMF_CONTEXT,  &
-          rcToReturn=rc)) return
-    end if
-#endif
     state%statep%reconcileneededflag = .false.
-    ! -------------------------------------------------------------------------
-    if (profile) then
-      call ESMF_TraceRegionExit("8.) Attributes on the State itself", rc=localrc)
-      if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
-        ESMF_CONTEXT,  &
-        rcToReturn=rc)) return
-    endif
-    ! -------------------------------------------------------------------------
-    if (meminfo) call ESMF_VMLogMemInfo ("after 8.) Attributes on the State itself")
 
     if (trace) then
       call ESMF_ReconcileDebugPrint (ESMF_METHOD // ': Complete!')