diff --git a/source/Seafloor.cpp b/source/Seafloor.cpp index 3422a3ff..8c64515e 100644 --- a/source/Seafloor.cpp +++ b/source/Seafloor.cpp @@ -42,7 +42,7 @@ Seafloor::setup(EnvCondRef env, const string& filepath) if (env->SeafloorMode == moordyn::SEAFLOOR_3D) { LOGDBG << "Seafloor set to 3D mode."; // const string SeafloorFilename = - // (string)folder + "/seafloor_profile_3d.txt"; + // (string)folder + "seafloor_profile_3d.txt"; LOGMSG << "Reading seafloor from " << filepath << '\n'; vector fLines; // Buffer to load file into line-by-line diff --git a/source/Waves.cpp b/source/Waves.cpp index 1d7781f4..ee63edbb 100644 --- a/source/Waves.cpp +++ b/source/Waves.cpp @@ -361,7 +361,7 @@ Waves::setup(EnvCondRef env_in, // NOTE: nodal settings should use storeWaterKin in objects // now go through each applicable WaveKin option if (wave_mode == waves::WAVES_SUM_COMPONENTS_NODE) { - const string WaveFilename = (string)folder + "/wave_frequencies.txt"; + const string WaveFilename = (string)folder + "wave_frequencies.txt"; LOGMSG << "Reading waves spectrum frequencies from '" << WaveFilename << "'..." << endl; auto waveSpectrum = spectrumFromFile(WaveFilename, _log); diff --git a/source/Waves/WaveGrid.cpp b/source/Waves/WaveGrid.cpp index 933a11b6..f3054288 100644 --- a/source/Waves/WaveGrid.cpp +++ b/source/Waves/WaveGrid.cpp @@ -356,7 +356,7 @@ constructWaveGridSpectrumData(const std::string& folder, moordyn::Log* _log) { - const string WaveFilename = folder + "/wave_frequencies.txt"; + const string WaveFilename = folder + "wave_frequencies.txt"; LOGMSG << "Reading waves FFT from '" << WaveFilename << "'..." << endl; // NOTE: need to decide what inputs/format to expect in file @@ -391,7 +391,7 @@ constructWaveGridSpectrumData(const std::string& folder, auto nt = static_cast(2 * (evenFreqComps.size() - 1)); auto [px, py, pz] = - rectilinearGridFromFile(folder + "/water_grid.txt", _log); + rectilinearGridFromFile(folder + "water_grid.txt", _log); auto waveGrid = make_unique( _log, px, py, pz, nt, env->waterKinOptions.dtWave); @@ -414,7 +414,7 @@ constructWaveGridElevationData(const std::string& folder, // load wave elevation time series from file (similar to what's done in // GenerateWaveExtnFile.py, and was previously in misc2.cpp) - const string WaveFilename = folder + "/wave_elevation.txt"; + const string WaveFilename = folder + "wave_elevation.txt"; LOGMSG << "Reading waves elevation from '" << WaveFilename << "'..." << endl; @@ -529,11 +529,11 @@ constructWaveGridElevationData(const std::string& folder, // make a grid for wave kinematics based on settings in // water_grid.txt auto [px, py, pz] = - rectilinearGridFromFile(folder + "/water_grid.txt", _log); + rectilinearGridFromFile(folder + "water_grid.txt", _log); waveGrid = make_unique(_log, px, py, pz, nt, dtWave); waveGrid->allocateKinematicArrays(); - // makeGrid(((string)folder + "/water_grid.txt").c_str()); + // makeGrid(((string)folder + "water_grid.txt").c_str()); std::vector betas(nw, 0); return fillWaveGrid( std::move(waveGrid), zetaC0.data(), nw, betas, dw, env, _log); @@ -545,7 +545,7 @@ constructSteadyCurrentGrid(const std::string& folder, moordyn::Log* _log) { - const string CurrentsFilename = folder + "/current_profile.txt"; + const string CurrentsFilename = folder + "current_profile.txt"; LOGMSG << "Reading currents profile from '" << CurrentsFilename << "'..." << endl; @@ -622,7 +622,7 @@ constructDynamicCurrentGrid(const std::string& folder, moordyn::Log* _log) { - const string CurrentsFilename = folder + "/current_profile_dynamic.txt"; + const string CurrentsFilename = folder + "current_profile_dynamic.txt"; LOGMSG << "Reading currents dynamic profile from '" << CurrentsFilename << "'..." << endl;