Clean up hydro_forces public header and make Chrono dependencies explicit

Author: dav-og

include/hydroc/hydro_forces.h

@@ -58,22 +58,12 @@
 #include <Eigen/Dense>
 
 // Chrono library includes
-#include <chrono/solver/ChIterativeSolverLS.h>
-#include <chrono/solver/ChSolverPMINRES.h>
-#include <chrono/timestepper/ChTimestepper.h>
-#include <chrono/timestepper/ChTimestepperHHT.h>
-
+// Note: We include only the headers strictly necessary for the types used in this header.
+// Implementation-only Chrono headers are included in hydro_forces.cpp.
+// ChForce.h includes ChFunction internally, so we don't need a separate include.
 #include <chrono/physics/ChBody.h>
-#include <chrono/physics/ChBodyEasy.h>
 #include <chrono/physics/ChForce.h>
-#include <chrono/physics/ChLoad.h>
 #include <chrono/physics/ChLoadContainer.h>
-#include <chrono/physics/ChLoadsBody.h>
-#include <chrono/physics/ChSystemNSC.h>
-#include <chrono/physics/ChSystemSMC.h>
-
-// Chrono FEA includes
-#include <chrono/fea/ChMeshFileLoader.h>
 
 // Hydroc library includes
 #include <hydroc/io/h5_reader.h>
@@ -97,13 +87,16 @@ class ChronoHydroCoupler;
 // Types GeneralizedForce and BodyForces are defined in hydro_types.h (included above)
 }
 
-using namespace chrono;
-using namespace chrono::fea;
-
 class ForceFunc6d;
 class TestHydro;
 
-class ComponentFunc : public ChFunction {
+/**
+ * @brief Per-DOF force function for Chrono's ChForce system.
+ *
+ * Inherits from chrono::ChFunction to provide time-dependent force values.
+ * Each instance represents a single degree of freedom (surge, sway, heave, roll, pitch, yaw).
+ */
+class ComponentFunc : public chrono::ChFunction {
   public:
     /**
      * @brief Default constructor.
@@ -162,7 +155,7 @@ class ForceFunc6d {
      * @param object The body in the system to which this 6-dimensional force is being applied.
      * @param all_hydro_forces_user The TestHydro class where the total force on all bodies is calculated.
      */
-    ForceFunc6d(std::shared_ptr<ChBody> object, TestHydro* all_hydro_forces_user);
+    ForceFunc6d(std::shared_ptr<chrono::ChBody> object, TestHydro* all_hydro_forces_user);
 
     /**
      * @brief Copy constructor that ensures the force is only added to a body once.
@@ -199,15 +192,16 @@ class ForceFunc6d {
      */
     void ApplyForceAndTorqueToBody();
 
-    std::shared_ptr<ChBody> body_;                  ///< Pointer to the body this force is applied to.
+    std::shared_ptr<chrono::ChBody> body_;          ///< Pointer to the body this force is applied to.
     int b_num_;                                     ///< Body's index in the system. Currently 1-indexed.
     ComponentFunc forces_[6];                       ///< Forces for each degree of freedom.
     std::shared_ptr<ComponentFunc> force_ptrs_[6];  ///< Pointers to the forces.
-    std::shared_ptr<ChForce> chrono_force_;         ///< Chrono force for the body.
-    std::shared_ptr<ChForce> chrono_torque_;        ///< Chrono torque for the body.
+    std::shared_ptr<chrono::ChForce> chrono_force_;  ///< Chrono force for the body.
+    std::shared_ptr<chrono::ChForce> chrono_torque_; ///< Chrono torque for the body.
     TestHydro* all_hydro_forces_;                   ///< Pointer to TestHydro for calculations.
 };
 
+// Forward declaration of ChLoadAddedMass (defined in added_mass.h, included in .cpp)
 class ChLoadAddedMass;
 
 // Lightweight hydrodynamics profiling stats
@@ -236,7 +230,7 @@ class TestHydro {
      * @param h5_file_name Name of the h5 file where hydro data is stored.
      * @param waves WaveBase object. Defaults to NoWave if not provided.
      */
-    TestHydro(std::vector<std::shared_ptr<ChBody>> user_bodies,
+    TestHydro(std::vector<std::shared_ptr<chrono::ChBody>> user_bodies,
               std::string h5_file_name,
               std::shared_ptr<WaveBase> waves = std::make_shared<NoWave>());
 
@@ -364,7 +358,7 @@ class TestHydro {
 
   private:
     // Class properties related to the body and hydrodynamics
-    std::vector<std::shared_ptr<ChBody>> bodies_;
+    std::vector<std::shared_ptr<chrono::ChBody>> bodies_;
     int num_bodies_;
     HydroData file_info_;
     std::vector<ForceFunc6d> force_per_body_;
@@ -390,7 +384,7 @@ class TestHydro {
     double cached_state_time_ = std::numeric_limits<double>::quiet_NaN();
 
     // Added mass related properties
-    std::shared_ptr<ChLoadContainer> my_loadcontainer;
+    std::shared_ptr<chrono::ChLoadContainer> my_loadcontainer;
     std::shared_ptr<ChLoadAddedMass> my_loadbodyinertia;
 
     /**

src/hydro/hydro_forces.cpp

@@ -67,7 +67,18 @@
 #include <hydroc/coupling/chrono_coupler.h>
 #include "radiation/radiation_rirf_processing.h"
 
+// Chrono includes needed for implementation (not exposed in public header)
 #include <chrono/physics/ChLoad.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLoadsBody.h>
+#include <chrono/physics/ChSystemNSC.h>
+#include <chrono/physics/ChSystemSMC.h>
+#include <chrono/solver/ChIterativeSolverLS.h>
+#include <chrono/solver/ChSolverPMINRES.h>
+#include <chrono/timestepper/ChTimestepper.h>
+#include <chrono/timestepper/ChTimestepperHHT.h>
+#include <chrono/fea/ChMeshFileLoader.h>
+
 #include <unsupported/Eigen/Splines>
 
 #include <Eigen/Dense>
@@ -87,6 +98,17 @@
 #include <omp.h>
 #endif
 
+// Local using declarations for Chrono types (implementation only - not leaked to users)
+// These provide convenience within this translation unit while keeping the public header clean.
+using chrono::ChBody;
+using chrono::ChBodyEasyMesh;
+using chrono::ChForce;
+using chrono::ChFunction;
+using chrono::ChLoadContainer;
+using chrono::ChSolver;
+using chrono::ChSystem;
+using chrono::ChVector3d;
+
 const int kDofPerBody  = 6;
 const int kDofLinOrRot = 3;
 
@@ -158,8 +180,8 @@ ForceFunc6d::ForceFunc6d() : forces_{{this, 0}, {this, 1}, {this, 2}, {this, 3},
         // default deletion logic to do nothing
         // Also! don't need to worry about deleting this later, because stack arrays are always deleted automatically
     }
-    chrono_force_  = chrono_types::make_shared<ChForce>();
-    chrono_torque_ = chrono_types::make_shared<ChForce>();
+    chrono_force_  = std::make_shared<ChForce>();
+    chrono_torque_ = std::make_shared<ChForce>();
     chrono_force_->SetAlign(ChForce::AlignmentFrame::WORLD_DIR);
     chrono_torque_->SetAlign(ChForce::AlignmentFrame::WORLD_DIR);
     chrono_force_->SetName("hydroforce");
@@ -297,15 +319,15 @@ TestHydro::TestHydro(std::vector<std::shared_ptr<ChBody>> user_bodies,
     }
 
     // Handle added mass info (applied via Chrono load system)
-    my_loadcontainer = chrono_types::make_shared<ChLoadContainer>();
+    my_loadcontainer = std::make_shared<ChLoadContainer>();
 
     std::vector<std::shared_ptr<ChLoadable>> loadables(bodies_.size());
     for (int i = 0; i < static_cast<int>(bodies_.size()); ++i) {
         loadables[i] = bodies_[i];
     }
 
     my_loadbodyinertia =
-        chrono_types::make_shared<ChLoadAddedMass>(file_info_.GetBodyInfos(), loadables, bodies_[0]->GetSystem());
+        std::make_shared<ChLoadAddedMass>(file_info_.GetBodyInfos(), loadables, bodies_[0]->GetSystem());
 
     bodies_[0]->GetSystem()->Add(my_loadcontainer);
     my_loadcontainer->Add(my_loadbodyinertia);

tests/regression/f3of/f3of_dt1_test.cpp

@@ -2,6 +2,11 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemSMC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
+#include <chrono/physics/ChLinkTSDA.h>
+#include <chrono/solver/ChSolver.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/f3of/f3of_dt2_test.cpp

@@ -2,6 +2,11 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemSMC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
+#include <chrono/physics/ChLinkTSDA.h>
+#include <chrono/solver/ChSolver.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/f3of/f3of_dt3_test.cpp

@@ -3,7 +3,11 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemSMC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
 #include <chrono/physics/ChLinkMate.h>  // fixed body uses link
+#include <chrono/solver/ChSolver.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/oswec/oswec_decay_test.cpp

@@ -3,7 +3,11 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemNSC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
 #include <chrono/physics/ChLinkMate.h>  // fixed body uses link
+#include <chrono/solver/ChSolver.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/oswec/oswec_reg_waves_test.cpp

@@ -3,7 +3,11 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemNSC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
 #include <chrono/physics/ChLinkMate.h>  // fixed body uses link
+#include <chrono/solver/ChSolver.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/rm3/rm3_decay_test.cpp

@@ -3,6 +3,12 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemNSC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
+#include <chrono/physics/ChLinkTSDA.h>
+#include <chrono/solver/ChSolver.h>
+#include <chrono/timestepper/ChTimestepper.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/rm3/rm3_reg_waves_test.cpp

@@ -4,6 +4,12 @@
 #include <hydroc/logging.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemNSC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChLinkLock.h>
+#include <chrono/physics/ChLinkTSDA.h>
+#include <chrono/solver/ChSolver.h>
+#include <chrono/timestepper/ChTimestepper.h>
 
 #include <chrono>   // std::chrono::high_resolution_clock::now
 #include <iomanip>  // std::setprecision

tests/regression/sphere/demo_sphere_decay.cpp

@@ -3,6 +3,9 @@
 #include <hydroc/hydro_forces.h>
 
 #include <chrono/core/ChRealtimeStep.h>
+#include <chrono/physics/ChSystemNSC.h>
+#include <chrono/physics/ChBodyEasy.h>
+#include <chrono/solver/ChSolver.h>
 
 #include <chrono>      // std::chrono::high_resolution_clock::now
 #include <filesystem>  // c++17 only