EAMxx: move data/time interpolation into IO library

bartgol · bartgol · commit fd1a765b6692 · 2025-10-16T09:02:53.000-06:00
diff --git a/cime b/cime
@@ -1 +1 @@
-Subproject commit c64260ed94aff167a59635ed4a9ae5af16824e91
+Subproject commit c65c0c4cc33468a276cc4eba5ef663fdad92d5b7
diff --git a/components/eam/src/physics/crm/pam/external b/components/eam/src/physics/crm/pam/external
@@ -0,0 +1 @@
+Subproject commit 4f65fc04c624988baf06efda56fc4e0f528c0835
diff --git a/components/eamxx/src/control/atmosphere_surface_coupling_exporter.hpp b/components/eamxx/src/control/atmosphere_surface_coupling_exporter.hpp
@@ -3,8 +3,8 @@
 
 #include "surface_coupling_utils.hpp"
 
+#include "share/io/eamxx_time_interpolation.hpp"
 #include "share/atm_process/atmosphere_process.hpp"
-#include "share/algorithm/eamxx_time_interpolation.hpp"
 #include "share/atm_process/ATMBufferManager.hpp"
 #include "share/data_managers/SCDataManager.hpp"
 
diff --git a/components/eamxx/src/physics/gw/impl/gw_gw_ediff_impl.hpp b/components/eamxx/src/physics/gw/impl/gw_gw_ediff_impl.hpp
@@ -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>
 
diff --git a/components/eamxx/src/physics/gw/impl/gw_gwd_compute_stress_profiles_and_diffusivities_impl.hpp b/components/eamxx/src/physics/gw/impl/gw_gwd_compute_stress_profiles_and_diffusivities_impl.hpp
@@ -2,7 +2,8 @@
 #define GW_GWD_COMPUTE_STRESS_PROFILES_AND_DIFFUSIVITIES_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>
 
 namespace scream {
diff --git a/components/eamxx/src/physics/gw/impl/gw_gwd_compute_tendencies_from_stress_divergence_impl.hpp b/components/eamxx/src/physics/gw/impl/gw_gwd_compute_tendencies_from_stress_divergence_impl.hpp
@@ -2,9 +2,10 @@
 #define GW_GWD_COMPUTE_TENDENCIES_FROM_STRESS_DIVERGENCE_IMPL_HPP
 
 #include "gw_functions.hpp" // for ETI only but harmless for GPU
-#include "util/eamxx_utils.hpp"
-#include <cmath>
+#include "share/util/eamxx_utils.hpp"
+
 #include <ekat_math_utils.hpp>
+#include <cmath>
 
 namespace scream {
 namespace gw {
diff --git a/components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp b/components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp
@@ -8,7 +8,7 @@
 #include "share/scorpio_interface/eamxx_scorpio_interface.hpp"
 #include "share/io/scorpio_input.hpp"
 #include "share/util/eamxx_time_stamp.hpp"
-#include "share/algorithm/eamxx_time_interpolation.hpp"
+#include "share/io/eamxx_time_interpolation.hpp"
 
 #include <ekat_team_policy_utils.hpp>
 #include <ekat_lin_interp.hpp>
diff --git a/components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.hpp b/components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.hpp
@@ -3,7 +3,7 @@
 
 #include "share/atm_process/atmosphere_process.hpp"
 
-#include "share/algorithm/eamxx_time_interpolation.hpp"
+#include "share/io/eamxx_time_interpolation.hpp"
 #include "share/remap/abstract_remapper.hpp"
 
 #include <ekat_parameter_list.hpp>
diff --git a/components/eamxx/src/physics/spa/eamxx_spa_process_interface.cpp b/components/eamxx/src/physics/spa/eamxx_spa_process_interface.cpp
@@ -1,6 +1,6 @@
 #include "eamxx_spa_process_interface.hpp"
 
-#include "share/algorithm/eamxx_data_interpolation.hpp"
+#include "share/io/eamxx_data_interpolation.hpp"
 #include "share/scorpio_interface/eamxx_scorpio_interface.hpp"
 #include "share/property_checks/field_within_interval_check.hpp"
 
diff --git a/components/eamxx/src/share/CMakeLists.txt b/components/eamxx/src/share/CMakeLists.txt
@@ -34,20 +34,9 @@ add_subdirectory(diagnostics)
 # IO library
 add_subdirectory(io)
 
-set(SHARE_SRC
-  algorithm/eamxx_data_interpolation.cpp
-  algorithm/eamxx_time_interpolation.cpp
-)
-
-add_library(scream_share ${SHARE_SRC})
-
-target_include_directories(scream_share PUBLIC
-  ${SCREAM_SRC_DIR}
-  ${SCREAM_BIN_DIR}/src
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_link_libraries(scream_share PUBLIC
+# For bwd compatibility: a "catch" all interface lib of all the stuff in the share folder
+add_library(scream_share INTERFACE)
+target_link_libraries(scream_share INTERFACE
   eamxx_core
   eamxx_scorpio_interface
   eamxx_utils
@@ -60,13 +49,6 @@ target_link_libraries(scream_share PUBLIC
   eamxx_diagnostics
   scream_io)
 
-# Used in the data interpolation
-target_link_libraries(scream_share PUBLIC stdc++fs)
-
-if (NOT SCREAM_LIB_ONLY)
-  add_subdirectory(tests)
-endif()
-
 # The "build_cf_dictionary" target downloads an XML file containing valid field
 # names and aliases based on the CF conventions, and transforms it into a YAML
 # file that we use to validate our own fields against it. This target is only
diff --git a/components/eamxx/src/share/io/CMakeLists.txt b/components/eamxx/src/share/io/CMakeLists.txt
@@ -12,6 +12,8 @@ add_library(eamxx_io
   scorpio_scm_input.cpp
   scorpio_output.cpp
   eamxx_io_utils.cpp
+  eamxx_data_interpolation.cpp
+  eamxx_time_interpolation.cpp
 )
 
 target_link_libraries(eamxx_io PUBLIC eamxx_data_managers eamxx_scorpio_interface)
diff --git a/components/eamxx/src/share/io/eamxx_data_interpolation.cpp b/components/eamxx/src/share/io/eamxx_data_interpolation.cpp
@@ -1,4 +1,4 @@
-#include "share/algorithm/eamxx_data_interpolation.hpp"
+#include "share/io/eamxx_data_interpolation.hpp"
 
 #include "share/remap/identity_remapper.hpp"
 #include "share/remap/vertical_remapper.hpp"
diff --git a/components/eamxx/src/share/io/eamxx_data_interpolation.hpp b/components/eamxx/src/share/io/eamxx_data_interpolation.hpp
diff --git a/components/eamxx/src/share/io/eamxx_time_interpolation.cpp b/components/eamxx/src/share/io/eamxx_time_interpolation.cpp
@@ -1,4 +1,4 @@
-#include "share/algorithm/eamxx_time_interpolation.hpp"
+#include "share/io/eamxx_time_interpolation.hpp"
 #include "share/scorpio_interface/eamxx_scorpio_interface.hpp"
 #include "share/io/eamxx_io_utils.hpp"
 
diff --git a/components/eamxx/src/share/io/eamxx_time_interpolation.hpp b/components/eamxx/src/share/io/eamxx_time_interpolation.hpp
diff --git a/components/eamxx/src/share/io/tests/CMakeLists.txt b/components/eamxx/src/share/io/tests/CMakeLists.txt
@@ -101,4 +101,20 @@ if (NOT SCREAM_ONLY_GENERATE_BASELINES)
     LIBS eamxx_io LABELS io
     MPI_RANKS 1 ${SCREAM_TEST_MAX_RANKS}
   )
+
+  # Generate data for data interpolation test
+  CreateUnitTest(data_interpolation_setup "data_interpolation_setup.cpp"
+    LIBS eamxx_io LABELS io
+    FIXTURES_SETUP data_interpolation_setup)
+
+  # Test data interpolation
+  CreateUnitTest(data_interpolation "data_interpolation_tests.cpp"
+    LIBS eamxx_io LABELS io
+    MPI_RANKS 1 ${SCREAM_TEST_MAX_RANKS}
+    FIXTURES_REQUIRED data_interpolation_setup)
+
+  # Time interpolation
+  CreateUnitTest(time_interpolation "time_interpolation_tests.cpp"
+    LIBS eamxx_io LABELS io
+    MPI_RANKS 1 ${SCREAM_TEST_MAX_RANKS})
 endif()
diff --git a/components/eamxx/src/share/io/tests/data_interpolation_setup.cpp b/components/eamxx/src/share/io/tests/data_interpolation_setup.cpp
diff --git a/components/eamxx/src/share/io/tests/data_interpolation_tests.cpp b/components/eamxx/src/share/io/tests/data_interpolation_tests.cpp
@@ -3,7 +3,7 @@
 #include "data_interpolation_tests.hpp"
 
 #include "share/scorpio_interface/eamxx_scorpio_interface.hpp"
-#include "share/algorithm/eamxx_data_interpolation.hpp"
+#include "share/io/eamxx_data_interpolation.hpp"
 #include "share/grid/point_grid.hpp"
 #include "share/field/field_utils.hpp"
 #include "share/core/eamxx_config.hpp"
diff --git a/components/eamxx/src/share/io/tests/data_interpolation_tests.hpp b/components/eamxx/src/share/io/tests/data_interpolation_tests.hpp
diff --git a/components/eamxx/src/share/io/tests/time_interpolation_tests.cpp b/components/eamxx/src/share/io/tests/time_interpolation_tests.cpp
@@ -6,7 +6,7 @@
 #include "share/field/field.hpp"
 #include "share/data_managers/field_manager.hpp"
 
-#include "share/algorithm/eamxx_time_interpolation.hpp"
+#include "share/io/eamxx_time_interpolation.hpp"
 #include "share/core/eamxx_setup_random_test.hpp"
 #include "share/util/eamxx_time_stamp.hpp"
 
diff --git a/components/eamxx/src/share/tests/CMakeLists.txt b/components/eamxx/src/share/tests/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 4f65fc04c624988baf06efda56fc4e0f528c0835`