Remove redundant num_bodies from wave classes; infer from HydroSystem

num_bodies was duplicated across wave constructors, IrregularWaveParams, and HydroSystem - always the same value. Move ownership to WaveBase and set it automatically in HydroSystem::AddWaves(), eliminating a source of configuration errors and simplifying the wave creation API.

Author: dav-og

demos/f3of/demo_f3of_dt1.cpp

@@ -153,7 +153,7 @@ int main(int argc, char* argv[]) {
     // ---------------- End DT specific set up, now add hydro forces ----------------------------------
 
     // define wave parameters (not used in this demo TODO have hydroforces constructor without hydro inputs)
-    auto default_dont_add_waves = std::make_shared<NoWave>(3);
+    auto default_dont_add_waves = std::make_shared<NoWave>();
 
     // set up hydro forces
     std::vector<std::shared_ptr<ChBody>> bodies;

demos/f3of/demo_f3of_dt2.cpp

@@ -158,7 +158,7 @@ int main(int argc, char* argv[]) {
     system.AddLink(base_rev);
 
     // define wave parameters (not used in this demo TODO have hydroforces constructor without hydro inputs)
-    auto default_dont_add_waves = std::make_shared<NoWave>(3);
+    auto default_dont_add_waves = std::make_shared<NoWave>();
 
     // set up hydro forces
     std::vector<std::shared_ptr<ChBody>> bodies;

demos/f3of/demo_f3of_dt3.cpp

@@ -155,7 +155,7 @@ int main(int argc, char* argv[]) {
     anchor->SetConstrainedCoords(true, true, true, true, true, true);  // x, y, z, Rx, Ry, Rz
 
     // define wave parameters (not used in this demo TODO have hydroforces constructor without hydro inputs)
-    auto default_dont_add_waves = std::make_shared<NoWave>(3);
+    auto default_dont_add_waves = std::make_shared<NoWave>();
 
     // set up hydro forces
     std::vector<std::shared_ptr<ChBody>> bodies;

demos/oswec/demo_oswec_decay.cpp

@@ -184,7 +184,7 @@ int main(int argc, char* argv[]) {
     revolute->Initialize(base_body, flap_body, ChFramed(ChVector3d(0.0, 0.0, -8.9), revoluteRot));
     system.AddLink(revolute);
 
-    auto default_dont_add_waves = std::make_shared<NoWave>(2);
+    auto default_dont_add_waves = std::make_shared<NoWave>();
 
     //// attach hydrodynamic forces to body
     std::vector<std::shared_ptr<ChBody>> bodies;

demos/oswec/demo_oswec_reg_waves.cpp

@@ -198,7 +198,7 @@ int main(int argc, char* argv[]) {
         bodies.push_back(flap_body);
         bodies.push_back(base_body);
 
-        auto my_hydro_inputs = std::make_shared<RegularWave>(static_cast<unsigned int>(bodies.size()));
+        auto my_hydro_inputs = std::make_shared<RegularWave>();
         my_hydro_inputs->regular_wave_amplitude_ = 0.01;
         my_hydro_inputs->regular_wave_omega_     = (2 * CH_PI) / (periods[reg_wave_num - 1]);
 

demos/rm3/demo_rm3_decay.cpp

@@ -116,7 +116,7 @@ int main(int argc, char* argv[]) {
     prismatic_pto->SetDampingCoefficient(0.0);
     system.AddLink(prismatic_pto);
 
-    auto default_dont_add_waves = std::make_shared<NoWave>(2);
+    auto default_dont_add_waves = std::make_shared<NoWave>();
 
     // attach hydrodynamic forces to body
     std::vector<std::shared_ptr<ChBody>> bodies;

demos/rm3/demo_rm3_reg_waves.cpp

@@ -133,7 +133,7 @@ int main(int argc, char* argv[]) {
     bodies.push_back(plate_body2);
 
     // define wave parameters
-    auto my_hydro_inputs                     = std::make_shared<RegularWave>(static_cast<unsigned int>(bodies.size()));
+    auto my_hydro_inputs                     = std::make_shared<RegularWave>();
     my_hydro_inputs->regular_wave_amplitude_ = 1.0;
     my_hydro_inputs->regular_wave_omega_     = 2.10;
 

demos/sphere/demo_sphere_decay.cpp

@@ -85,7 +85,7 @@ int main(int argc, char* argv[]) {
     // my_hydro_inputs.regular_wave_amplitude = 0.022;
     // my_hydro_inputs.regular_wave_omega = 2.10;
 
-    auto default_dont_add_waves = std::make_shared<NoWave>(1);
+    auto default_dont_add_waves = std::make_shared<NoWave>();
 
     // attach hydrodynamic forces to body
     std::vector<std::shared_ptr<ChBody>> bodies;

demos/sphere/demo_sphere_irreg_waves.cpp

@@ -103,7 +103,6 @@ int main(int argc, char* argv[]) {
     bodies.push_back(sphereBody);
 
     IrregularWaveParams wave_inputs;
-    wave_inputs.num_bodies_          = (unsigned int)bodies.size();
     wave_inputs.simulation_dt_       = timestep;
     wave_inputs.simulation_duration_ = simulationDuration;
     wave_inputs.ramp_duration_       = 60.0;

demos/sphere/demo_sphere_irreg_waves_eta_import.cpp

@@ -106,7 +106,6 @@ int main(int argc, char* argv[]) {
     std::cout << "Defining irregular wave input parameters..." << std::endl;
     IrregularWaveParams params;
     std::cout << "bodies.size() = " << bodies.size() << std::endl;
-    params.num_bodies_          = (unsigned int)bodies.size();
     params.simulation_dt_       = timestep;
     params.simulation_duration_ = simulationDuration;
     params.ramp_duration_       = 0.0;