Consolidate hydro source files under src/hydro/

Author: dav-og

CMakeLists.txt

@@ -344,10 +344,11 @@ set(HYDROCHRONO_SOURCES
     src/hydro/config/config_loader.cpp
     src/hydro/config/setup_from_yaml.cpp
     src/hydro/config/yaml_discovery.cpp
-    # Core library sources
-    src/chloadaddedmass.cpp
-    src/hydro_forces.cpp
-    src/helper.cpp
+    # Coupling module (consolidated under src/hydro/coupling/)
+    src/hydro/coupling/added_mass.cpp
+    # Core facade and utilities
+    src/hydro/hydro_forces.cpp
+    src/hydro/utils/helper.cpp
     # Hydro modules
     src/hydro/waves/wave_base.cpp
     src/hydro/waves/wave_utilities.cpp
@@ -470,7 +471,7 @@ message(STATUS "HYDROCHRONO_ENABLE_YAML_RUNNER: ${HYDROCHRONO_ENABLE_YAML_RUNNER
 if(HYDROCHRONO_ENABLE_YAML_RUNNER)
     add_executable(run_hydrochrono
         app/run_hydrochrono.cpp
-        src/hydrochrono_runner/run_hydrochrono_from_yaml.cpp
+        src/hydro/runner/run_from_yaml.cpp
         src/utils/misc_options.cpp
     )
 

src/chloadaddedmass.cpp src/hydro/coupling/added_mass.cppsrc/chloadaddedmass.cpp renamed to src/hydro/coupling/added_mass.cpp

@@ -1,7 +1,7 @@
 /*********************************************************************
- * @file  chloadaddedmass.h
+ * @file  added_mass.cpp
  *
- * @brief header file for added mass chload class.
+ * @brief Implementation of ChLoadAddedMass class.
  *********************************************************************/
 #include <hydroc/coupling/added_mass.h>
 
@@ -68,4 +68,5 @@ void ChLoadAddedMass::LoadIntLoadResidual_Mv(ChVectorDynamic<>& R, const ChVecto
     // a_w).eigen();
     // since R is a vector, we can probably just do R += C*M*a with no need to separate w into a_x and a_w above
     R += c * m_jacobians->M * w;
-}
+}
+

src/hydro_forces.cpp src/hydro/hydro_forces.cppsrc/hydro_forces.cpp renamed to src/hydro/hydro_forces.cpp

@@ -59,13 +59,13 @@
 #include <hydroc/waves/irregular_wave.h>
 #include <hydroc/logging.h>
 #include <hydroc/core/system_state.h>
-#include "hydro/core/chrono_state_utils.h"
-#include "hydro/force_components/hydrostatics_component.h"
-#include "hydro/force_components/radiation_component.h"
-#include "hydro/force_components/excitation_component.h"
+#include "core/chrono_state_utils.h"
+#include "force_components/hydrostatics_component.h"
+#include "force_components/radiation_component.h"
+#include "force_components/excitation_component.h"
 #include <hydroc/core/hydro_system.h>
 #include <hydroc/coupling/chrono_coupler.h>
-#include "hydro/radiation/radiation_rirf_processing.h"
+#include "radiation/radiation_rirf_processing.h"
 
 #include <chrono/physics/ChLoad.h>
 #include <unsupported/Eigen/Splines>

…ono_runner/run_hydrochrono_from_yaml.cpp src/hydro/runner/run_from_yaml.cppsrc/hydrochrono_runner/run_hydrochrono_from_yaml.cpp renamed to src/hydro/runner/run_from_yaml.cpp src/hydrochrono_runner/run_hydrochrono_from_yaml.cpp renamed to src/hydro/runner/run_from_yaml.cpp

@@ -1,8 +1,8 @@
 #include <hydroc/version.h>
-#include "../hydro/config/yaml_discovery.h"
+#include "../config/yaml_discovery.h"
 #include <hydroc/logging.h>
-#include "../hydro/config/setup_from_yaml.h"
-#include "../hydro/config/yaml_parser.h"
+#include "../config/setup_from_yaml.h"
+#include "../config/yaml_parser.h"
 #include <hydroc/hydro_forces.h>
 #include <hydroc/io/simulation_export.h>
 #include <hydroc/waves/wave_base.h>

src/helper.cpp src/hydro/utils/helper.cppsrc/helper.cpp renamed to src/hydro/utils/helper.cpp

@@ -1,3 +1,8 @@
+/*********************************************************************
+ * @file  helper.cpp
+ *
+ * @brief Implementation of helper utilities.
+ *********************************************************************/
 #include <hydroc/helper.h>
 
 #include <cstdlib>
@@ -46,4 +51,5 @@ int hydroc::SetInitialEnvironment(int argc, char* argv[]) noexcept {
 
 std::string hydroc::getDataDir() noexcept {
     return DATADIR.lexically_normal().generic_string();
-}
+}
+