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/addon/ESMX/Comps/ESMX_Data/ESMX_Data.F90

@@ -720,7 +720,7 @@ subroutine ModelFinalize(xdata, rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=__FILE__)) return
 
-    deallocate(is%ptr, stat=stat)
+    deallocate(xstate, stat=stat)
     if (ESMF_LogFoundDeallocError(statusToCheck=stat, &
       msg='XDATA: Memory deallocation failed.', &
       line=__LINE__, &

src/addon/NUOPC/src/NUOPC_FieldDictionaryDef.F90

@@ -144,6 +144,7 @@ subroutine NUOPC_FieldDictionaryDestroyI(fieldDictionary, rc)
     integer :: localrc
     integer :: garbageCount, item
     type(NUOPC_FieldDictionaryEntry) :: fdEntry
+    type(NUOPC_FieldDictionaryEntryS), pointer :: wrap
 
     if (present(rc)) rc = ESMF_SUCCESS
 
@@ -173,7 +174,8 @@ subroutine NUOPC_FieldDictionaryDestroyI(fieldDictionary, rc)
         file=FILENAME, &
         rcToReturn=rc)) &
         return  ! bail out
-      deallocate(fdEntry % wrap, stat=localrc)
+      wrap => fdEntry%wrap  ! LLVM workaround for deallocate() runtime error!
+      deallocate(wrap, stat=localrc)
       if (ESMF_LogFoundDeallocError(statusToCheck=localrc, &
         msg=ESMF_LOGERR_PASSTHRU, &
         line=__LINE__, &