Fixes #3146 Merged field_utils into field

GEOS-ESM · Nov 4, 2024 · 4c6ced2 · 4c6ced2
1 parent 7f972d6
commit 4c6ced2
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 92 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,7 +210,6 @@ add_subdirectory (pfio)
 add_subdirectory (profiler)
 add_subdirectory (generic)
 add_subdirectory (generic3g)
-add_subdirectory (field_utils)
 add_subdirectory (field)
 add_subdirectory (oomph) # temporary - will rename to generic when done
 add_subdirectory (shared)

diff --git a/MAPL/CMakeLists.txt b/MAPL/CMakeLists.txt
@@ -3,7 +3,7 @@ esma_set_this()
 
 esma_add_library (${this}
   SRCS MAPL.F90
-  DEPENDENCIES MAPL.base MAPL.generic MAPL.pfio MAPL_cfio_r4 MAPL.gridcomps MAPL.orbit MAPL.griddedio MAPL.field_utils ${EXTDATA_TARGET}
+  DEPENDENCIES MAPL.base MAPL.generic MAPL.pfio MAPL_cfio_r4 MAPL.gridcomps MAPL.orbit MAPL.griddedio MAPL.field ${EXTDATA_TARGET}
                ESMF::ESMF NetCDF::NetCDF_Fortran MPI::MPI_Fortran
   TYPE SHARED
   )

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -67,7 +67,7 @@ endif()
 
 esma_add_library(
   ${this} SRCS ${srcs}
-  DEPENDENCIES MAPL.shared MAPL.constants MAPL.profiler MAPL.pfio MAPL_cfio_r4 MAPL.field_utils PFLOGGER::pflogger
+  DEPENDENCIES MAPL.shared MAPL.constants MAPL.profiler MAPL.pfio MAPL_cfio_r4 MAPL.field PFLOGGER::pflogger
                GFTL_SHARED::gftl-shared-v2 GFTL_SHARED::gftl-shared-v1  GFTL::gftl-v2 GFTL::gftl-v1
                ESMF::ESMF NetCDF::NetCDF_Fortran MPI::MPI_Fortran
   TYPE SHARED)

diff --git a/field/CMakeLists.txt b/field/CMakeLists.txt
@@ -2,6 +2,18 @@ esma_set_this (OVERRIDE MAPL.field)
 
 set(srcs
   API.F90
+  FieldUtils.F90
+  FieldBLAS.F90
+  FieldPointerUtilities.F90
+  FieldDelta.F90
+  FieldUtilities.F90
+  FieldUnaryFunctions.F90
+  FieldBinaryOperations.F90
+  FieldUnits.F90
+  FieldCondensedArray.F90
+  FieldCondensedArray_private.F90
+  FieldDelta.F90
+  FieldBundleDelta.F90
   VerticalStaggerLoc.F90
   FieldCreate.F90
   FieldReset.F90
@@ -11,9 +23,13 @@ set(srcs
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
+if (BUILD_WITH_PFLOGGER)
+  find_package (PFLOGGER REQUIRED)
+endif ()
+
 esma_add_library(${this}
   SRCS ${srcs}
-  DEPENDENCIES MAPL.shared MAPL.esmf_utils ESMF::ESMF 
+  DEPENDENCIES MAPL.shared MAPL.esmf_utils PFLOGGER::pflogger ESMF::ESMF udunits2f
   TYPE SHARED
   )
 

diff --git a/field_utils/EsmfRegridder.F90 → field/EsmfRegridder.F90 b/field_utils/EsmfRegridder.F90 → field/EsmfRegridder.F90
diff --git a/field_utils/FieldBLAS.F90 → field/FieldBLAS.F90 b/field_utils/FieldBLAS.F90 → field/FieldBLAS.F90
diff --git a/field_utils/FieldBinaryOperations.F90 → field/FieldBinaryOperations.F90 b/field_utils/FieldBinaryOperations.F90 → field/FieldBinaryOperations.F90
diff --git a/field_utils/FieldBinaryOperatorTemplate.H → field/FieldBinaryOperatorTemplate.H b/field_utils/FieldBinaryOperatorTemplate.H → field/FieldBinaryOperatorTemplate.H
diff --git a/field_utils/FieldBundleDelta.F90 → field/FieldBundleDelta.F90 b/field_utils/FieldBundleDelta.F90 → field/FieldBundleDelta.F90
diff --git a/field_utils/FieldCondensedArray.F90 → field/FieldCondensedArray.F90 b/field_utils/FieldCondensedArray.F90 → field/FieldCondensedArray.F90
diff --git a/field_utils/FieldCondensedArray_private.F90 → field/FieldCondensedArray_private.F90 b/field_utils/FieldCondensedArray_private.F90 → field/FieldCondensedArray_private.F90
diff --git a/field_utils/FieldDelta.F90 → field/FieldDelta.F90 b/field_utils/FieldDelta.F90 → field/FieldDelta.F90
diff --git a/field_utils/FieldPointerUtilities.F90 → field/FieldPointerUtilities.F90 b/field_utils/FieldPointerUtilities.F90 → field/FieldPointerUtilities.F90
diff --git a/field_utils/FieldUnaryFunctionTemplate.H → field/FieldUnaryFunctionTemplate.H b/field_utils/FieldUnaryFunctionTemplate.H → field/FieldUnaryFunctionTemplate.H
diff --git a/field_utils/FieldUnaryFunctions.F90 → field/FieldUnaryFunctions.F90 b/field_utils/FieldUnaryFunctions.F90 → field/FieldUnaryFunctions.F90
diff --git a/field_utils/FieldUnits.F90 → field/FieldUnits.F90 b/field_utils/FieldUnits.F90 → field/FieldUnits.F90
diff --git a/field_utils/FieldUtilities.F90 → field/FieldUtilities.F90 b/field_utils/FieldUtilities.F90 → field/FieldUtilities.F90
diff --git a/field_utils/FieldUtils.F90 → field/FieldUtils.F90 b/field_utils/FieldUtils.F90 → field/FieldUtils.F90
diff --git a/field_utils/function_overload.macro → field/function_overload.macro b/field_utils/function_overload.macro → field/function_overload.macro
diff --git a/field/tests/CMakeLists.txt b/field/tests/CMakeLists.txt
@@ -16,4 +16,13 @@ add_pfunit_ctest(MAPL.field.test_fieldreset
                 MAX_PES 1
                 )
 
-add_dependencies(build-tests MAPL.field.test_fieldcreate)
+add_pfunit_ctest(MAPL.field.test_utils
+                TEST_SOURCES   Test_FieldBLAS.pf Test_FieldArithmetic.pf Test_FieldCondensedArray_private.pf
+                               Test_FieldDelta.pf Test_FieldBundleDelta.pf
+                LINK_LIBRARIES MAPL.pfunit
+                EXTRA_INITIALIZE Initialize
+                EXTRA_USE MAPL_pFUnit_Initialize
+                OTHER_SOURCES field_utils_setup.F90
+                MAX_PES 4
+                )
+add_dependencies(build-tests MAPL.field.test_fieldcreate MAPL.field.test_fieldreset MAPL.field.test_utils)
diff --git a/field_utils/tests/Test_FieldArithmetic.pf → field/tests/Test_FieldArithmetic.pf b/field_utils/tests/Test_FieldArithmetic.pf → field/tests/Test_FieldArithmetic.pf
diff --git a/field_utils/tests/Test_FieldBLAS.pf → field/tests/Test_FieldBLAS.pf b/field_utils/tests/Test_FieldBLAS.pf → field/tests/Test_FieldBLAS.pf
diff --git a/field_utils/tests/Test_FieldBundleDelta.pf → field/tests/Test_FieldBundleDelta.pf b/field_utils/tests/Test_FieldBundleDelta.pf → field/tests/Test_FieldBundleDelta.pf
diff --git a/...tests/Test_FieldCondensedArray_private.pf → ...tests/Test_FieldCondensedArray_private.pf b/...tests/Test_FieldCondensedArray_private.pf → ...tests/Test_FieldCondensedArray_private.pf
diff --git a/field_utils/tests/Test_FieldDelta.pf → field/tests/Test_FieldDelta.pf b/field_utils/tests/Test_FieldDelta.pf → field/tests/Test_FieldDelta.pf
diff --git a/field_utils/tests/field_utils_setup.F90 → field/tests/field_utils_setup.F90 b/field_utils/tests/field_utils_setup.F90 → field/tests/field_utils_setup.F90
diff --git a/field_utils/undo_function_overload.macro → field/undo_function_overload.macro b/field_utils/undo_function_overload.macro → field/undo_function_overload.macro
diff --git a/field_utils/CMakeLists.txt b/field_utils/CMakeLists.txt
diff --git a/field_utils/tests/CMakeLists.txt b/field_utils/tests/CMakeLists.txt
diff --git a/generic3g/CMakeLists.txt b/generic3g/CMakeLists.txt
@@ -56,7 +56,7 @@ endif ()
 esma_add_library(${this}
   SRCS ${srcs}
   DEPENDENCIES MAPL.regridder_mgr MAPL.geom_mgr MAPL.GeomIO MAPL.esmf_utils MAPL.field MAPL.shared MAPL.profiler MAPL.base MAPL.hconfig_utils
-               PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 GFTL::gftl-v2
+               ESMF::ESMF NetCDF::NetCDF_Fortran udunits2f PFLOGGER::pflogger GFTL_SHARED::gftl-shared-v2 GFTL::gftl-v2
   TYPE SHARED
   )
 
@@ -108,7 +108,6 @@ esma_add_fortran_submodules(
 
 target_include_directories (${this} PUBLIC
   $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
-target_link_libraries (${this} PUBLIC udunits2f MAPL.field_utils ESMF::ESMF NetCDF::NetCDF_Fortran)
 
 if (PFUNIT_FOUND)
   add_subdirectory(tests EXCLUDE_FROM_ALL)

diff --git a/geom_mgr/CMakeLists.txt b/geom_mgr/CMakeLists.txt
@@ -24,7 +24,7 @@ set(srcs
 
 esma_add_library(${this}
   SRCS ${srcs}
-  DEPENDENCIES MAPL.pfio MAPL.base MAPL.shared MAPL.field_utils MAPL.hconfig_utils GFTL::gftl-v2
+  DEPENDENCIES MAPL.pfio MAPL.base MAPL.shared MAPL.hconfig_utils GFTL::gftl-v2
   TYPE SHARED
   )
 

diff --git a/mapl3g/CMakeLists.txt b/mapl3g/CMakeLists.txt
@@ -7,7 +7,7 @@ set (srcs
 
 esma_add_library (${this}
   SRCS ${srcs}
-  DEPENDENCIES MAPL.generic3g MAPL.pfio MAPL.cap3g MAPL.gridcomps MAPL.griddedio MAPL.field_utils ${EXTDATA_TARGET}
+  DEPENDENCIES MAPL.generic3g MAPL.pfio MAPL.cap3g MAPL.gridcomps MAPL.griddedio MAPL.field ${EXTDATA_TARGET}
                ESMF::ESMF NetCDF::NetCDF_Fortran MPI::MPI_Fortran PFLOGGER::pflogger
   TYPE SHARED
   )

diff --git a/pfunit/CMakeLists.txt b/pfunit/CMakeLists.txt
@@ -10,5 +10,5 @@ set (srcs
 
 esma_add_library (${this} EXCLUDE_FROM_ALL SRCS ${srcs} NOINSTALL TYPE SHARED)
 
-target_link_libraries (${this} MAPL.shared MAPL.field_utils PFUNIT::pfunit ESMF::ESMF NetCDF::NetCDF_Fortran)
+target_link_libraries (${this} MAPL.shared PFUNIT::pfunit ESMF::ESMF NetCDF::NetCDF_Fortran udunits2f) 
 set_target_properties (${this} PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})
diff --git a/regridder_mgr/CMakeLists.txt b/regridder_mgr/CMakeLists.txt
@@ -29,7 +29,7 @@ set(srcs
 
 esma_add_library(${this}
   SRCS ${srcs}
-  DEPENDENCIES MAPL.geom_mgr MAPL.pfio MAPL.base MAPL.shared MAPL.field_utils GFTL::gftl-v2
+  DEPENDENCIES MAPL.geom_mgr MAPL.pfio MAPL.base MAPL.shared GFTL::gftl-v2
   TYPE SHARED
   )