Skip to content

Commit 7beb374

Browse files
committed
Revert changes that seem accidental on PR branch.
1 parent c9ea6e6 commit 7beb374

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/Infrastructure/Array/interface/ESMF_Array.F90

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,6 @@ subroutine ESMF_ArraySMM(srcArray, dstArray, routehandle, keywordEnforcer, &
715715
#endif
716716
type(ESMF_Logical) :: handleAllElements
717717
type(ESMF_Pointer) :: this
718-
type(c_funptr) :: c_ptr_func
719-
integer(c_intptr_t) :: faddress
720718

721719
! initialize return code; assume routine not implemented
722720
localrc = ESMF_RC_NOT_IMPL
@@ -750,7 +748,7 @@ subroutine ESMF_ArraySMM(srcArray, dstArray, routehandle, keywordEnforcer, &
750748
if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
751749
ESMF_CONTEXT, rcToReturn=rc)) return
752750
endif
753-
751+
754752
! prepare for passing of dynamic masking
755753
if (present(dynamicMask)) then
756754
! check for valid input
@@ -934,7 +932,7 @@ subroutine ESMF_ArraySMM(srcArray, dstArray, routehandle, keywordEnforcer, &
934932
ESMF_CONTEXT, rcToReturn=rc)
935933
return
936934
endif
937-
935+
938936
! Call into the C++ interface, which will sort out optional arguments
939937
call c_ESMC_ArraySMM(opt_srcArray, opt_dstArray, routehandle, &
940938
opt_routesyncflag, opt_finishedflag, opt_cancelledflag, opt_zeroregion, &
@@ -946,7 +944,7 @@ subroutine ESMF_ArraySMM(srcArray, dstArray, routehandle, keywordEnforcer, &
946944
if (present(finishedflag)) then
947945
finishedflag = opt_finishedflag
948946
endif
949-
947+
950948
! translate back cancelledflag
951949
if (present(cancelledflag)) then
952950
cancelledflag = opt_cancelledflag

0 commit comments

Comments
 (0)