Fix default arguments for sphere irregular wave tests

Author: rserban

tests/regression/sphere/test_sphere_decay.cpp

@@ -101,7 +101,6 @@ int main(int argc, char* argv[]) {
     // main simulation loop
     ui.Init(&system, "Sphere - Decay Test");
     ui.simulationStarted = true;
-    ui.simulationStarted = true;
 
     while (system.GetChTime() <= simulationDuration) {
         if (ui.IsRunning(timestep) == false) break;

tests/regression/sphere/test_sphere_irreg_waves_eta.cpp

@@ -1,14 +1,14 @@
 #include <chrono>
 #include <filesystem>
+#include <fstream>
 #include <iomanip>
-#include <vector>
 #include <iostream>
-#include <fstream>
+#include <vector>
 
 #include <chrono/assets/ChColor.h>
 #include <chrono/core/ChRealtimeStep.h>
-#include <chrono/physics/ChSystemNSC.h>
 #include <chrono/physics/ChBodyEasy.h>
+#include <chrono/physics/ChSystemNSC.h>
 
 #include <hydroc/gui/guihelper.h>
 #include <hydroc/helper.h>
@@ -26,7 +26,7 @@ int main(int argc, char* argv[]) {
         bool profilingOn     = true;
         bool saveDataOn      = true;
         bool plotOn          = true;
-        bool visualizationOn = false;
+        bool visualizationOn = true;
         std::string data_dir;
         if (!hydroc::GetCLIArguments(argc, argv, "Sphere irregular waves eta regression test", saveDataOn, profilingOn,
                                      plotOn, visualizationOn, data_dir))
@@ -41,21 +41,20 @@ int main(int argc, char* argv[]) {
         auto body1_meshfame =
             (DATADIR / "demos" / "sphere" / "geometry" / "oes_task10_sphere.obj").lexically_normal().generic_string();
         auto h5fname = (DATADIR / "demos" / "sphere" / "hydroData" / "sphere.h5").lexically_normal().generic_string();
-        
+
         // Try multiple possible paths for the ETA file
         std::vector<std::filesystem::path> possible_eta_paths = {
             DATADIR / "demos" / "sphere" / "eta" / "eta.txt",
             std::filesystem::path("C:/code/HydroChrono/build/tests/regression/Release/data/sphere/eta/eta.txt"),
-            std::filesystem::path("C:/code/HydroChrono/demos/sphere/eta/eta.txt")
-        };
+            std::filesystem::path("C:/code/HydroChrono/demos/sphere/eta/eta.txt")};
 
         std::filesystem::path eta_file_path;
         bool found_eta_file = false;
-        
+
         for (const auto& path : possible_eta_paths) {
             std::cout << "DEBUG: Checking ETA path: " << path << std::endl;
             if (std::filesystem::exists(path)) {
-                eta_file_path = path;
+                eta_file_path  = path;
                 found_eta_file = true;
                 std::cout << "DEBUG: Found ETA file at: " << eta_file_path << std::endl;
                 break;
@@ -147,7 +146,8 @@ int main(int argc, char* argv[]) {
 
         // add prismatic joint between sphere and ground (limit to heave motion only)
         auto prismatic = chrono_types::make_shared<ChLinkLockPrismatic>();
-        prismatic->Initialize(sphereBody, ground, false, ChFramed(ChVector3d(0, 0, -2)), ChFramed(ChVector3d(0, 0, -5)));
+        prismatic->Initialize(sphereBody, ground, false, ChFramed(ChVector3d(0, 0, -2)),
+                              ChFramed(ChVector3d(0, 0, -5)));
         system.AddLink(prismatic);
 
         // create the spring between body_1 and ground. The spring end points are
@@ -171,10 +171,11 @@ int main(int argc, char* argv[]) {
         wave_inputs.simulation_dt_       = timestep;
         wave_inputs.simulation_duration_ = simulationDuration;
         wave_inputs.ramp_duration_       = 0.0;  // Changed from 60.0
-        wave_inputs.eta_file_path_       = (DATADIR / "demos" / "sphere" / "eta" / "eta.txt").lexically_normal().generic_string();  // Added ETA file
-        wave_inputs.frequency_min_       = 0.001;
-        wave_inputs.frequency_max_       = 1.0;
-        wave_inputs.nfrequencies_        = 1000;
+        wave_inputs.eta_file_path_ =
+            (DATADIR / "demos" / "sphere" / "eta" / "eta.txt").lexically_normal().generic_string();  // Added ETA file
+        wave_inputs.frequency_min_ = 0.001;
+        wave_inputs.frequency_max_ = 1.0;
+        wave_inputs.nfrequencies_  = 1000;
         // Removed wave_height_ and wave_period_ as they're not used with ETA
 
         std::shared_ptr<IrregularWaves> my_hydro_inputs;  // declare outside the try-catch block
@@ -202,6 +203,7 @@ int main(int argc, char* argv[]) {
         // main simulation loop
         ui.Init(&system, "Sphere - Irregular Waves Test");
         ui.SetCamera(8, -25, 15, 0, 0, 0);
+        ui.simulationStarted = true;
 
         while (system.GetChTime() <= simulationDuration) {
             if (ui.IsRunning(timestep) == false) break;
@@ -265,4 +267,4 @@ int main(int argc, char* argv[]) {
         std::cerr << "FATAL ERROR: Unknown unhandled exception in main" << std::endl;
         return 1;
     }
-} 
+}

tests/regression/sphere/test_sphere_irreg_waves_eta_consistency.cpp

@@ -29,12 +29,12 @@
 using namespace chrono;
 
 // Shared simulation parameters
-const double TIMESTEP = 0.015;
-const double DURATION = 60.0;  // Short duration for faster testing
-const double WAVE_HEIGHT = 2.0;
-const double WAVE_PERIOD = 12.0;
+const double TIMESTEP      = 0.015;
+const double DURATION      = 60.0;  // Short duration for faster testing
+const double WAVE_HEIGHT   = 2.0;
+const double WAVE_PERIOD   = 12.0;
 const double RAMP_DURATION = 0.0;  // No ramp for exact comparison
-const int SEED = 42;  // Fixed seed for reproducibility
+const int SEED             = 42;   // Fixed seed for reproducibility
 
 int main(int argc, char* argv[]) {
     std::cout << "=== IRREGULAR WAVES ETA CONSISTENCY TEST ===" << std::endl;
@@ -44,18 +44,17 @@ int main(int argc, char* argv[]) {
     bool profilingOn     = true;
     bool saveDataOn      = true;
     bool plotOn          = true;
-    bool visualizationOn = false;
+    bool visualizationOn = true;
     std::string data_dir;
     if (!hydroc::GetCLIArguments(argc, argv, "Sphere irregular waves eta consistency test", saveDataOn, profilingOn,
                                  plotOn, visualizationOn, data_dir))
         return 1;
     if (!hydroc::SetInitialEnvironment(data_dir)) return 1;
 
     std::filesystem::path DATADIR(hydroc::getDataDir());
-    auto meshfname = (DATADIR / "demos" / "sphere" / "geometry" / "oes_task10_sphere.obj")
-                         .lexically_normal().generic_string();
-    auto h5fname = (DATADIR / "demos" / "sphere" / "hydroData" / "sphere.h5")
-                       .lexically_normal().generic_string();
+    auto meshfname =
+        (DATADIR / "demos" / "sphere" / "geometry" / "oes_task10_sphere.obj").lexically_normal().generic_string();
+    auto h5fname = (DATADIR / "demos" / "sphere" / "hydroData" / "sphere.h5").lexically_normal().generic_string();
 
     // Output directory setup
     std::string out_dir = hydroc::getTestOutDir();
@@ -81,40 +80,37 @@ int main(int argc, char* argv[]) {
         ground->EnableCollision(false);
 
         // Sphere body
-        auto sphereBody = chrono_types::make_shared<ChBodyEasyMesh>(
-            meshfname, 1000, false, true, false);
+        auto sphereBody = chrono_types::make_shared<ChBodyEasyMesh>(meshfname, 1000, false, true, false);
         system.Add(sphereBody);
         sphereBody->SetName("body1");
         sphereBody->SetPos(ChVector3d(0, 0, -2));
         sphereBody->SetMass(261.8e3);
 
         // Prismatic joint (heave only)
         auto prismatic = chrono_types::make_shared<ChLinkLockPrismatic>();
-        prismatic->Initialize(sphereBody, ground, false,
-                              ChFramed(ChVector3d(0, 0, -2)),
+        prismatic->Initialize(sphereBody, ground, false, ChFramed(ChVector3d(0, 0, -2)),
                               ChFramed(ChVector3d(0, 0, -5)));
         system.AddLink(prismatic);
 
         // Spring (zero stiffness/damping)
         auto spring = chrono_types::make_shared<ChLinkTSDA>();
-        spring->Initialize(sphereBody, ground, false,
-                           ChVector3d(0, 0, -2), ChVector3d(0, 0, -5));
+        spring->Initialize(sphereBody, ground, false, ChVector3d(0, 0, -2), ChVector3d(0, 0, -5));
         spring->SetSpringCoefficient(0.0);
         spring->SetDampingCoefficient(0.0);
         system.AddLink(spring);
 
         // Create spectrum-based waves
         IrregularWaveParams spectrum_params;
-        spectrum_params.num_bodies_ = 1;
-        spectrum_params.simulation_dt_ = TIMESTEP;
+        spectrum_params.num_bodies_          = 1;
+        spectrum_params.simulation_dt_       = TIMESTEP;
         spectrum_params.simulation_duration_ = DURATION;
-        spectrum_params.ramp_duration_ = RAMP_DURATION;
-        spectrum_params.wave_height_ = WAVE_HEIGHT;
-        spectrum_params.wave_period_ = WAVE_PERIOD;
-        spectrum_params.frequency_min_ = 0.001;
-        spectrum_params.frequency_max_ = 1.0;
-        spectrum_params.nfrequencies_ = 1000;
-        spectrum_params.seed_ = SEED;
+        spectrum_params.ramp_duration_       = RAMP_DURATION;
+        spectrum_params.wave_height_         = WAVE_HEIGHT;
+        spectrum_params.wave_period_         = WAVE_PERIOD;
+        spectrum_params.frequency_min_       = 0.001;
+        spectrum_params.frequency_max_       = 1.0;
+        spectrum_params.nfrequencies_        = 1000;
+        spectrum_params.seed_                = SEED;
 
         auto spectrum_waves = std::make_shared<IrregularWaves>(spectrum_params);
 
@@ -124,7 +120,7 @@ int main(int argc, char* argv[]) {
         hydro_forces.AddWaves(spectrum_waves);
 
         // NOW we can get the free surface data (after AddWaves initialized it)
-        auto fse_time = spectrum_waves->GetFreeSurfaceTime();
+        auto fse_time      = spectrum_waves->GetFreeSurfaceTime();
         auto fse_elevation = spectrum_waves->GetFreeSurfaceElevation();
 
         std::cout << "  Generated " << fse_time.size() << " free surface elevation samples." << std::endl;
@@ -171,38 +167,35 @@ int main(int argc, char* argv[]) {
         ground->EnableCollision(false);
 
         // Sphere body
-        auto sphereBody = chrono_types::make_shared<ChBodyEasyMesh>(
-            meshfname, 1000, false, true, false);
+        auto sphereBody = chrono_types::make_shared<ChBodyEasyMesh>(meshfname, 1000, false, true, false);
         system.Add(sphereBody);
         sphereBody->SetName("body1");
         sphereBody->SetPos(ChVector3d(0, 0, -2));
         sphereBody->SetMass(261.8e3);
 
         // Prismatic joint (heave only)
         auto prismatic = chrono_types::make_shared<ChLinkLockPrismatic>();
-        prismatic->Initialize(sphereBody, ground, false,
-                              ChFramed(ChVector3d(0, 0, -2)),
+        prismatic->Initialize(sphereBody, ground, false, ChFramed(ChVector3d(0, 0, -2)),
                               ChFramed(ChVector3d(0, 0, -5)));
         system.AddLink(prismatic);
 
         // Spring (zero stiffness/damping)
         auto spring = chrono_types::make_shared<ChLinkTSDA>();
-        spring->Initialize(sphereBody, ground, false,
-                           ChVector3d(0, 0, -2), ChVector3d(0, 0, -5));
+        spring->Initialize(sphereBody, ground, false, ChVector3d(0, 0, -2), ChVector3d(0, 0, -5));
         spring->SetSpringCoefficient(0.0);
         spring->SetDampingCoefficient(0.0);
         system.AddLink(spring);
 
         // Create eta-import waves
         IrregularWaveParams eta_params;
-        eta_params.num_bodies_ = 1;
-        eta_params.simulation_dt_ = TIMESTEP;
+        eta_params.num_bodies_          = 1;
+        eta_params.simulation_dt_       = TIMESTEP;
         eta_params.simulation_duration_ = DURATION;
-        eta_params.ramp_duration_ = RAMP_DURATION;
-        eta_params.eta_file_path_ = eta_file;
-        eta_params.frequency_min_ = 0.001;
-        eta_params.frequency_max_ = 1.0;
-        eta_params.nfrequencies_ = 1000;
+        eta_params.ramp_duration_       = RAMP_DURATION;
+        eta_params.eta_file_path_       = eta_file;
+        eta_params.frequency_min_       = 0.001;
+        eta_params.frequency_max_       = 1.0;
+        eta_params.nfrequencies_        = 1000;
 
         auto eta_waves = std::make_shared<IrregularWaves>(eta_params);
 
@@ -223,25 +216,25 @@ int main(int argc, char* argv[]) {
     std::cout << "\nPhase 3: Comparing results..." << std::endl;
 
     if (heave_spectrum.size() != heave_eta.size()) {
-        std::cerr << "ERROR: Different number of timesteps! Spectrum: "
-                  << heave_spectrum.size() << ", Eta: " << heave_eta.size() << std::endl;
+        std::cerr << "ERROR: Different number of timesteps! Spectrum: " << heave_spectrum.size()
+                  << ", Eta: " << heave_eta.size() << std::endl;
         return 1;
     }
 
-    double max_diff = 0.0;
-    double sum_diff_sq = 0.0;
+    double max_diff     = 0.0;
+    double sum_diff_sq  = 0.0;
     size_t max_diff_idx = 0;
 
     for (size_t i = 0; i < heave_spectrum.size(); ++i) {
         double diff = std::abs(heave_spectrum[i] - heave_eta[i]);
         sum_diff_sq += diff * diff;
         if (diff > max_diff) {
-            max_diff = diff;
+            max_diff     = diff;
             max_diff_idx = i;
         }
     }
 
-    double rms_diff = std::sqrt(sum_diff_sq / heave_spectrum.size());
+    double rms_diff    = std::sqrt(sum_diff_sq / heave_spectrum.size());
     double time_at_max = max_diff_idx * TIMESTEP;
 
     std::cout << "  Max difference: " << max_diff << " m (at t=" << time_at_max << "s)" << std::endl;
@@ -257,10 +250,9 @@ int main(int argc, char* argv[]) {
             out << "--------    ------------------    -------------    --------------\n";
             for (size_t i = 0; i < heave_spectrum.size(); ++i) {
                 double t = i * TIMESTEP;
-                out << std::setw(10) << std::fixed << std::setprecision(3) << t
-                    << std::setw(20) << std::fixed << std::setprecision(8) << heave_spectrum[i]
-                    << std::setw(18) << std::fixed << std::setprecision(8) << heave_eta[i]
-                    << std::setw(18) << std::scientific << std::setprecision(4)
+                out << std::setw(10) << std::fixed << std::setprecision(3) << t << std::setw(20) << std::fixed
+                    << std::setprecision(8) << heave_spectrum[i] << std::setw(18) << std::fixed << std::setprecision(8)
+                    << heave_eta[i] << std::setw(18) << std::scientific << std::setprecision(4)
                     << (heave_spectrum[i] - heave_eta[i]) << "\n";
             }
             out.close();
@@ -270,7 +262,7 @@ int main(int argc, char* argv[]) {
 
     // ========== PASS/FAIL determination ==========
     const double tolerance = 1e-6;  // 1 micrometer tolerance
-    bool passed = (max_diff < tolerance);
+    bool passed            = (max_diff < tolerance);
 
     std::cout << "\n=== TEST " << (passed ? "PASSED" : "FAILED") << " ===" << std::endl;
     if (!passed) {