Merge branch 'fix/iso_c_binding' into develop

src/Infrastructure/LocalArray/interface/ESMF_LocalArray.F90

@@ -20,11 +20,10 @@ module ESMF_LocalArrayMod
 ! This file contains the sub modules for LocalArray class definition and methods
 !
 !------------------------------------------------------------------------------
-  use iso_c_binding
-
+
   use ESMF_LocalArrayCreateMod
   use ESMF_LocalArrayGetMod
-  
+
 #ifndef ESMF_NO_F2018ASSUMEDTYPE
   public c_esmf_f90ptrsizeprint
 #endif

src/Superstructure/AttributeAPI/interface/ESMF_Attribute.F90

@@ -28,15 +28,19 @@ module ESMF_AttributeMod
 
 use iso_c_binding, only : C_PTR, C_NULL_PTR, c_associated
 
-use ESMF_UtilTypesMod
-use ESMF_LogErrMod
+use ESMF_UtilTypesMod     ! ESMF utility types
+use ESMF_InitMacrosMod    ! ESMF initializer macros
+use ESMF_BaseMod          ! ESMF base class
+use ESMF_LogErrMod        ! ESMF error handling
+
+use ESMF_VMMod
 use ESMF_InfoMod
 use ESMF_InfoDescribeMod
 use ESMF_InfoSyncMod
-use ESMF_InitMacrosMod
 use ESMF_StateTypesMod
 use ESMF_ArrayMod
 use ESMF_ArrayBundleMod
+use ESMF_CompMod
 use ESMF_CplCompMod
 use ESMF_GridCompMod
 use ESMF_SciCompMod

src/Superstructure/InfoAPI/interface/ESMF_InfoCache.F90

@@ -24,6 +24,11 @@ module ESMF_InfoCacheMod
 use ESMF_InitMacrosMod    ! ESMF initializer macros
 use ESMF_BaseMod          ! ESMF base class
 use ESMF_LogErrMod        ! ESMF error handling
+use ESMF_StateMod
+use ESMF_StateItemMod
+use ESMF_FieldMod
+use ESMF_FieldGetMod
+use ESMF_FieldBundleMod
 
 use ESMF_VMMod
 use ESMF_InfoMod
@@ -37,8 +42,17 @@ module ESMF_InfoCacheMod
 ! =============================================================================
 ! =============================================================================
 
-!private
-!public
+private
+
+public c_infocache_initialize
+public c_infocache_destroy
+public c_infocache_updatefields
+public ESMF_InfoCacheFindField
+public ESMF_InfoCacheReassembleField
+public ESMF_InfoCacheReassembleFieldsFinalize
+public ESMF_InfoCacheReassembleFields
+
+public ESMF_InfoDescribe
 
 interface ! ===================================================================
 

src/Superstructure/InfoAPI/interface/ESMF_InfoDescribe.F90

@@ -56,8 +56,7 @@ module ESMF_InfoDescribeMod
 !==============================================================================
 !==============================================================================
 
-!private
-!public
+private
 
 interface