EAMxx: fix some include/link issues

Author: bartgol

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>
 

components/eamxx/src/physics/gw/impl/gw_gw_storm_speed_impl.hpp

@@ -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 {

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 {

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 {

components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/CMakeLists.txt

@@ -11,7 +11,7 @@ CreateDynamicsLib("theta-l_kokkos"  4   72   10)
 set (TEST_LABELS "dynamics;driver;tms;shoc;cld;spa;p3;rrtmgp;physics;dp")
 CreateUnitTest(homme_shoc_cld_spa_p3_rrtmgp_pg2_dp "homme_shoc_cld_spa_p3_rrtmgp_pg2_dp.cpp"
   LABELS ${TEST_LABELS}
-  LIBS cld_fraction tms shoc spa iop_forcing p3 scream_rrtmgp ${dynLibName}
+  LIBS cld_fraction tms shoc spa iop_forcing p3 scream_rrtmgp ${dynLibName} scream_control
   MPI_RANKS ${TEST_RANK_START} ${TEST_RANK_END}
   FIXTURES_SETUP_INDIVIDUAL ${FIXTURES_BASE_NAME}
 )