Merge pull request #1778 from GEOS-ESM/develop

GitFlow: Merge Develop into Main for 2.30.0 Release
GEOS-ESM · Nov 3, 2022 · 723999d · 723999d
2 parents 6135a39 + a29bb80
commit 723999d
Show file tree

Hide file tree

Showing 8 changed files with 1,783 additions and 37 deletions.
diff --git a/Apps/CMakeLists.txt b/Apps/CMakeLists.txt
@@ -14,3 +14,17 @@ install (PROGRAMS
   mapl_stub.pl
   TYPE SYSCONF
   )
+
+ecbuild_add_executable (TARGET Regrid_Util.x SOURCES Regrid_Util.F90 DEPENDS esmf )
+target_link_libraries (Regrid_Util.x PRIVATE MAPL ${MPI_Fortran_LIBRARIES})
+# CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280
+if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG")
+           target_link_libraries(Regrid_Util.x PRIVATE OpenMP::OpenMP_Fortran)
+   endif ()
+
+ecbuild_add_executable (TARGET time_ave_util.x SOURCES time_ave_util.F90 DEPENDS esmf )
+target_link_libraries (time_ave_util.x PRIVATE MAPL ${MPI_Fortran_LIBRARIES})
+# CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280
+if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG")
+           target_link_libraries(time_ave_util.x PRIVATE OpenMP::OpenMP_Fortran)
+   endif ()
diff --git a/griddedio/Regrid_Util.F90 → Apps/Regrid_Util.F90 b/griddedio/Regrid_Util.F90 → Apps/Regrid_Util.F90
@@ -3,34 +3,8 @@
    module regrid_util_support_mod
 
    use ESMF
-   use ESMFL_Mod
-   use MAPL_Profiler
-   use MAPL_ExceptionHandling
-   use MAPL_BaseMod
-   use MAPL_MemUtilsMod
-   use MAPL_CFIOMod
-   use MAPL_CommsMod
-   use MAPL_ShmemMod
-   use ESMF_CFIOMod
-   use ESMF_CFIOUtilMod
-   use ESMF_CFIOFileMod
-   use MAPL_NewRegridderManager
-   use MAPL_AbstractRegridderMod
-   use mapl_RegridMethods
-   use MAPL_GridManagerMod
-   use MAPL_LatLonGridFactoryMod, only: LatLonGridFactory
-   use MAPL_CubedSphereGridFactoryMod, only: CubedSphereGridFactory
-   use MAPL_TripolarGridFactoryMod, only: TripolarGridFactory
-   use MAPL_Constants, only: MAPL_PI_R8
-   use MAPL_ExceptionHandling
-   use MAPL_ApplicationSupport
-   use pFIO
-   use MAPL_ESMFFieldBundleWrite
-   use MAPL_ESMFFieldBundleRead
-   use MAPL_ServerManager
-   use MAPL_FileMetadataUtilsMod
+   use MAPL
    use gFTL_StringVector
-   use MAPL_VerticalDataMod
 
    implicit NONE