Merge branch 'bartgol/eamxx/libs-reorg-part-9' into next (PR #7780)

Ninth step of the reorg: diagnostics lib and algorithm lib

[BFB]

Author: bartgol

components/eamxx/docs/developer/io.md

@@ -8,7 +8,6 @@ add_subdirectory(share)
 
 add_subdirectory(dynamics)
 add_subdirectory(physics)
-add_subdirectory(diagnostics)
 add_subdirectory(control)
 if (PROJECT_NAME STREQUAL "E3SM")
   add_subdirectory(mct_coupling)

components/eamxx/src/CMakeLists.txt

@@ -12,7 +12,7 @@ set(SCREAM_CONTROL_HEADERS
 )
 
 add_library(scream_control ${SCREAM_CONTROL_SOURCES})
-target_link_libraries(scream_control PUBLIC scream_share scream_io ekat::YamlParser)
+target_link_libraries(scream_control PUBLIC scream_share eamxx_io ekat::YamlParser)
 
 if (Kokkos_ENABLE_CUDA)
   # This is to silence some nvcc warning that is a CUDA compiler bug

components/eamxx/src/control/CMakeLists.txt

@@ -162,7 +162,7 @@ macro (CreateDynamicsLib HOMME_TARGET NP PLEV QSIZE)
     set (dynLibName scream_${hommeLibName})
     add_library(${dynLibName} ${SCREAM_DYNAMICS_SOURCES})
     target_compile_definitions(${dynLibName} PUBLIC EAMXX_HAS_HOMME)
-    target_link_libraries(${dynLibName} PUBLIC scream_share scream_io ${hommeLibName})
+    target_link_libraries(${dynLibName} PUBLIC scream_share eamxx_io ${hommeLibName})
     get_target_property(modulesDir ${hommeLibName} Fortran_MODULE_DIRECTORY)
     set_target_properties(${dynLibName} PROPERTIES Fortran_MODULE_DIRECTORY ${modulesDir})
     target_include_directories(${dynLibName} PUBLIC ${modulesDir})

components/eamxx/src/diagnostics/tests/CMakeLists.txt

@@ -16,7 +16,7 @@ if (NOT SCREAM_ONLY_GENERATE_BASELINES)
   # Test I/O on dyn grid
   CreateUnitTest(dyn_grid_io
       "dyn_grid_io.cpp;test_helper_mod.F90"
-      LIBS scream_io ${dynLibName}
+      LIBS eamxx_io ${dynLibName}
       MPI_RANKS 1 ${SCREAM_TEST_MAX_RANKS}
       LABELS dynamics io)
 endif()

components/eamxx/src/dynamics/homme/CMakeLists.txt

@@ -40,9 +40,8 @@ set (SCREAM_LIBS
      spa
      iop_forcing
      nudging
-     diagnostics
      tms
-     )
+)
 
 # ZM is not always on yet
 if (TARGET zm)

components/eamxx/src/dynamics/homme/tests/CMakeLists.txt

@@ -6,7 +6,7 @@
 
 #include "dynamics/register_dynamics.hpp"
 #include "physics/register_physics.hpp"
-#include "diagnostics/register_diagnostics.hpp"
+#include "share/diagnostics/register_diagnostics.hpp"
 #include "control/register_surface_coupling.hpp"
 
 #include "mct_coupling/ScreamContext.hpp"

components/eamxx/src/mct_coupling/CMakeLists.txt

@@ -2,7 +2,8 @@
 #define GW_GW_EDIFF_IMPL_HPP
 
 #include "gw_functions.hpp" // for ETI only but harmless for GPU
-#include "util/eamxx_utils.hpp"
+#include "share/util/eamxx_utils.hpp"
+
 #include <ekat_math_utils.hpp>
 #include <ekat_subview_utils.hpp>
 

components/eamxx/src/mct_coupling/eamxx_cxx_f90_interface.cpp

@@ -2,7 +2,7 @@
 #define GW_GW_STORM_SPEED_IMPL_HPP
 
 #include "gw_functions.hpp" // for ETI only but harmless for GPU
-#include "util/eamxx_utils.hpp"
+#include "share/util/eamxx_utils.hpp"
 
 namespace scream {
 namespace gw {