Attach params to IrregularWaves class

Author: tridelat

include/hydroc/wave_types.h

@@ -324,16 +324,7 @@ class IrregularWaves : public WaveBase {
     void AddH5Data(std::vector<HydroData::IrregularWaveInfo>& irreg_h5_data, HydroData::SimulationParameters& sim_data);
 
   private:
-    unsigned int num_bodies_;
-    double simulation_dt_;
-    double simulation_duration_;
-    double ramp_duration_;
-    std::string eta_file_path_;
-    double wave_height_;
-    double wave_period_;
-    double peak_enhancement_factor_;
-    bool is_normalized_ = false;
-    int seed_;
+    IrregularWaveParams params_;
     std::vector<double> spectrum_;
     std::vector<double> time_data_;
     std::vector<double> free_surface_elevation_sampled_;

src/wave_types.cpp

@@ -232,40 +232,31 @@ void WriteFreeSurfaceMeshObj(const std::vector<std::array<double, 3>>& points,
 }
 
 IrregularWaves::IrregularWaves(const IrregularWaveParams& params)
-    : num_bodies_(params.num_bodies_),
-      eta_file_path_(params.eta_file_path_),
-      wave_height_(params.wave_height_),
-      wave_period_(params.wave_period_),
-      peak_enhancement_factor_(params.peak_enhancement_factor_),
-      is_normalized_(params.is_normalized_),
-      simulation_dt_(params.simulation_dt_),
-      simulation_duration_(params.simulation_duration_),
-      ramp_duration_(params.ramp_duration_),
-      seed_(params.seed_) {}
+    : params_(params) {}
 
 void IrregularWaves::InitializeIRFVectors() {
-    ex_irf_sampled_.resize(num_bodies_);
-    ex_irf_time_sampled_.resize(num_bodies_);
-    ex_irf_width_sampled_.resize(num_bodies_);
+    ex_irf_sampled_.resize(params_.num_bodies_);
+    ex_irf_time_sampled_.resize(params_.num_bodies_);
+    ex_irf_width_sampled_.resize(params_.num_bodies_);
 
-    std::vector<Eigen::MatrixXd> ex_irf_old(num_bodies_);
-    std::vector<Eigen::VectorXd> ex_irf_time_old(num_bodies_);
+    std::vector<Eigen::MatrixXd> ex_irf_old(params_.num_bodies_);
+    std::vector<Eigen::VectorXd> ex_irf_time_old(params_.num_bodies_);
 
-    for (unsigned int b = 0; b < num_bodies_; b++) {
+    for (unsigned int b = 0; b < params_.num_bodies_; b++) {
         ex_irf_sampled_[b]      = GetExcitationIRF(b);
         ex_irf_time_sampled_[b] = wave_info_[b].excitation_irf_time;
         CalculateWidthIRF();
     }
 
     // Resample excitation IRF time series
-    if (simulation_dt_ > 0.0) {
-        ResampleIRF(simulation_dt_);
+    if (params_.simulation_dt_ > 0.0) {
+        ResampleIRF(params_.simulation_dt_);
     }
 
-    if (!eta_file_path_.empty()) {
+    if (!params_.eta_file_path_.empty()) {
         ReadEtaFromFile();
         spectrumCreated_ = false;
-    } else if (wave_height_ != 0.0 && wave_period_ != 0.0) {
+    } else if (params_.wave_height_ != 0.0 && params_.wave_period_ != 0.0) {
         CreateSpectrum();
         CreateFreeSurfaceElevation();
         spectrumCreated_ = true;
@@ -289,10 +280,10 @@ std::vector<double> IrregularWaves::GetEtaTimeData() {
 }
 
 void IrregularWaves::ReadEtaFromFile() {
-    std::cout << "Reading eta file " << eta_file_path_ << "." << std::endl;
-    std::ifstream file(eta_file_path_);
+    std::cout << "Reading eta file " << params_.eta_file_path_ << "." << std::endl;
+    std::ifstream file(params_.eta_file_path_);
     if (!file) {
-        throw std::runtime_error("Unable to open file at: " + eta_file_path_ + ".");
+        throw std::runtime_error("Unable to open file at: " + params_.eta_file_path_ + ".");
     }
 
     std::string line;
@@ -322,13 +313,13 @@ void IrregularWaves::AddH5Data(std::vector<HydroData::IrregularWaveInfo>& irreg_
 }
 
 Eigen::VectorXd IrregularWaves::GetForceAtTime(double t) {
-    unsigned int total_dofs = num_bodies_ * 6;
+    unsigned int total_dofs = params_.num_bodies_ * 6;
     Eigen::VectorXd f(total_dofs);
     for (int i = 0; i < total_dofs; i++) {
         f[i] = 0.0;
     }
 
-    for (int body = 0; body < num_bodies_; body++) {
+    for (int body = 0; body < params_.num_bodies_; body++) {
         // Loop through the DOFs
         for (int dof = 0; dof < 6; ++dof) {
             // Compute the convolution for the current DOF
@@ -342,7 +333,7 @@ Eigen::VectorXd IrregularWaves::GetForceAtTime(double t) {
 }
 
 void IrregularWaves::ResampleIRF(double dt) {
-    for (unsigned int b = 0; b < num_bodies_; b++) {
+    for (unsigned int b = 0; b < params_.num_bodies_; b++) {
         auto& time_array  = ex_irf_time_sampled_[b];
         auto& width_array = ex_irf_width_sampled_[b];
         auto& val_array   = ex_irf_sampled_[b];
@@ -378,7 +369,7 @@ void IrregularWaves::ResampleIRF(double dt) {
 }
 
 void IrregularWaves::CalculateWidthIRF() {
-    for (unsigned int b = 0; b < num_bodies_; b++) {
+    for (unsigned int b = 0; b < params_.num_bodies_; b++) {
         auto& time_array  = ex_irf_time_sampled_[b];
         auto& width_array = ex_irf_width_sampled_[b];
 
@@ -414,7 +405,7 @@ void IrregularWaves::CreateSpectrum() {
 
     // Calculate the Pierson-Moskowitz Spectrum
     spectral_densities_ =
-        JONSWAPSpectrumHz(spectrum_frequencies_, wave_height_, wave_period_, peak_enhancement_factor_, is_normalized_);
+        JONSWAPSpectrumHz(spectrum_frequencies_,params_. wave_height_,params_. wave_period_, params_.peak_enhancement_factor_, params_.is_normalized_);
 
     // Open a file stream for writing
     std::ofstream outputFile("spectral_densities.txt");
@@ -475,7 +466,7 @@ Eigen::VectorXd JONSWAPSpectrumHz(Eigen::VectorXd& f, double Hs, double Tp, doub
 void IrregularWaves::CreateFreeSurfaceElevation() {
     // Create a time index vector
     // UpdateNumTimesteps();
-    int num_timesteps = static_cast<int>(simulation_duration_ / simulation_dt_) + 1;
+    int num_timesteps = static_cast<int>(params_.simulation_duration_ / params_.simulation_dt_) + 1;
 
     double t_irf_min = 0.0;
     double t_irf_max = 0.0;
@@ -494,7 +485,7 @@ void IrregularWaves::CreateFreeSurfaceElevation() {
         }
     }
 
-    auto time_array = Eigen::VectorXd::LinSpaced(num_timesteps, 0, simulation_duration_ + 2 * (t_irf_max - t_irf_min));
+    auto time_array = Eigen::VectorXd::LinSpaced(num_timesteps, 0, params_.simulation_duration_ + 2 * (t_irf_max - t_irf_min));
 
     // Save time array as a std::vector
     free_surface_time_sampled_.resize(time_array.size());
@@ -509,12 +500,12 @@ void IrregularWaves::CreateFreeSurfaceElevation() {
 
     // Calculate the free surface elevation
     free_surface_elevation_sampled_ =
-        FreeSurfaceElevation(spectrum_frequencies_, spectral_densities_, time_array, sim_data_.water_depth, seed_);
+        FreeSurfaceElevation(spectrum_frequencies_, spectral_densities_, time_array, sim_data_.water_depth, params_.seed_);
 
     // Apply ramp if ramp_duration is greater than 0
-    if (ramp_duration_ > 0.0) {
+    if (params_.ramp_duration_ > 0.0) {
         // UpdateRampTimesteps();
-        int ramp_timesteps   = static_cast<int>(ramp_duration_ / simulation_dt_) + 1;
+        int ramp_timesteps   = static_cast<int>(params_.ramp_duration_ / params_.simulation_dt_) + 1;
         Eigen::VectorXd ramp = Eigen::VectorXd::LinSpaced(ramp_timesteps, 0.0, 1.0);
 
         for (size_t i = 0; i < ramp.size(); ++i) {
@@ -612,8 +603,8 @@ double IrregularWaves::ExcitationConvolution(int body, int dof, double time) {
 
 void IrregularWaves::SetUpWaveMesh(std::string filename) {
     mesh_file_name_            = filename;
-    int num_timesteps          = static_cast<int>(simulation_duration_ / simulation_dt_) + 1;
-    Eigen::VectorXd time_index = Eigen::VectorXd::LinSpaced(num_timesteps, 0, simulation_duration_);
+    int num_timesteps          = static_cast<int>(params_.simulation_duration_ / params_.simulation_dt_) + 1;
+    Eigen::VectorXd time_index = Eigen::VectorXd::LinSpaced(num_timesteps, 0, params_.simulation_duration_);
     std::vector<std::array<double, 3>> free_surface_3d_pts =
         CreateFreeSurface3DPts(free_surface_elevation_sampled_, time_index);
     std::vector<std::array<size_t, 3>> free_surface_triangles = CreateFreeSurfaceTriangles(time_index.size());