More places for the LLVM workaround when dealing with Fortran pointers

inside Fortran derived types that are handed through the C/C++ layer.

Author: theurich

src/Infrastructure/Util/src/ESMF_FortranWordsize.cppF90

@@ -288,8 +288,11 @@ subroutine f_esmf_fortranudtpointercompare(ptr1, ptr2, flag)
   type (wrapper):: ptr1
   type (wrapper):: ptr2
   integer       :: flag
+  type(simple_udt), pointer:: udt1, udt2
+  udt1 => ptr1%udt
+  udt2 => ptr2%udt
   flag = 0
-  if (associated(ptr1%udt,ptr2%udt)) flag = 1
+  if (associated(udt1,udt2)) flag = 1
 end subroutine
 
 

src/addon/NUOPC/src/NUOPC_Connector.F90

@@ -5290,10 +5290,10 @@ subroutine InitializeIPDv05p6b(connector, importState, exportState, clock, rc)
       line=__LINE__, file=trim(name)//":"//FILENAME)) return  ! bail out
 
     ! prepare FieldBundles to store src and dst Fields
-    is%wrap%srcFields = ESMF_FieldBundleCreate(rc=rc)
+    is%wrap%srcFields = ESMF_FieldBundleCreate(name="srcFields", rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=trim(name)//":"//FILENAME)) return  ! bail out
-    is%wrap%dstFields = ESMF_FieldBundleCreate(rc=rc)
+    is%wrap%dstFields = ESMF_FieldBundleCreate(name="dstFields", rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=trim(name)//":"//FILENAME)) return  ! bail out
 
@@ -6621,6 +6621,7 @@ subroutine Finalize(connector, importState, exportState, clock, rc)
     character(*), parameter   :: rName="Finalize"
     integer                   :: stat
     type(type_InternalState)  :: is
+    type(type_InternalStateStruct), pointer :: wrap
     integer                   :: localrc
     logical                   :: existflag
     logical                   :: routeHandleIsCreated
@@ -6867,14 +6868,15 @@ subroutine Finalize(connector, importState, exportState, clock, rc)
         line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &
         return  ! bail out
     endif
-    
+
     ! deallocate internal state memory
-    deallocate(is%wrap, stat=stat)
+    wrap => is%wrap
+    deallocate(wrap, stat=stat)
     if (ESMF_LogFoundDeallocError(statusToCheck=stat, &
       msg="Deallocation of internal state memory failed.", &
       line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &
       return  ! bail out
-      
+
     ! handle diagnostic
     if (btest(diagnostic,10)) then
       call NUOPC_Write(importState, fileNamePrefix="diagnostic_"//&

src/addon/NUOPC/src/NUOPC_Driver.F90

@@ -3939,10 +3939,13 @@ recursive subroutine Finalize(driver, importState, exportState, clock, rc)
     character(*), parameter   :: rName="Finalize"
     integer                   :: urc, stat
     type(type_InternalState)  :: is
+    type(type_InternalStateStruct), pointer :: wrap
     type(ESMF_Clock)          :: internalClock
     integer                   :: i, j, itemCount
     type(ComponentMapEntry)   :: cmEntry
+    type(ComponentMapEntryT), pointer :: cmWrap
     type(ConnectorMapEntry)   :: cnEntry
+    type(ConnectorMapEntryT), pointer :: cnWrap
     character(ESMF_MAXSTR)    :: iString, jString
     logical                   :: existflag
     logical                   :: areServicesSet
@@ -4218,7 +4221,8 @@ recursive subroutine Finalize(driver, importState, exportState, clock, rc)
       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
         line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &
         return  ! bail out
-      deallocate(cmEntry%wrap, stat=stat)
+      cmWrap => cmEntry%wrap
+      deallocate(cmWrap, stat=stat)
       if (ESMF_LogFoundDeallocError(statusToCheck=stat, &
         msg="Deallocation of cmEntry failed.", &
         line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &
@@ -4239,7 +4243,8 @@ recursive subroutine Finalize(driver, importState, exportState, clock, rc)
       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
         line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &
         return  ! bail out
-      deallocate(cnEntry%wrap, stat=stat)
+      cnWrap => cnEntry%wrap
+      deallocate(cnWrap, stat=stat)
       if (ESMF_LogFoundDeallocError(statusToCheck=stat, &
         msg="Deallocation of cnEntry failed.", &
         line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &
@@ -4294,7 +4299,8 @@ recursive subroutine Finalize(driver, importState, exportState, clock, rc)
       line=__LINE__, file=trim(name)//":"//FILENAME)) return  ! bail out
 
     ! deallocate internal state memory
-    deallocate(is%wrap, stat=stat)
+    wrap => is%wrap
+    deallocate(wrap, stat=stat)
     if (ESMF_LogFoundDeallocError(statusToCheck=stat, &
       msg="Deallocation of internal state memory failed.", &
       line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &

src/addon/NUOPC/src/NUOPC_ModelBase.F90

@@ -2392,6 +2392,7 @@ recursive subroutine Finalize(gcomp, importState, exportState, clock, rc)
     type(ESMF_Clock)          :: internalClock
     integer                   :: verbosity, diagnostic, profiling
     type(type_InternalState)  :: is
+    type(type_InternalStateStruct), pointer :: wrap
     type(ESMF_Time)           :: currTime
     character(len=40)         :: currTimeString
 
@@ -2519,7 +2520,8 @@ recursive subroutine Finalize(gcomp, importState, exportState, clock, rc)
       deallocate(is%wrap%cachedExportFieldList)
 
     ! deallocate internal state memory
-    deallocate(is%wrap, stat=stat)
+    wrap => is%wrap
+    deallocate(wrap, stat=stat)
     if (ESMF_LogFoundDeallocError(statusToCheck=stat, &
       msg="Deallocation of internal state memory failed.", &
       line=__LINE__, file=trim(name)//":"//FILENAME, rcToReturn=rc)) &