Skip to content

fix: fixed path errors in waves files. #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanDavies19 merged 1 commit into from
Nov 26, 2024
Merged

fix: fixed path errors in waves files. #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Seafloor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> fLines; // Buffer to load file into line-by-line
Expand Down
2 changes: 1 addition & 1 deletion source/Waves.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions source/Waves/WaveGrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -391,7 +391,7 @@ constructWaveGridSpectrumData(const std::string& folder,
auto nt = static_cast<unsigned int>(2 * (evenFreqComps.size() - 1));

auto [px, py, pz] =
rectilinearGridFromFile(folder + "/water_grid.txt", _log);
rectilinearGridFromFile(folder + "water_grid.txt", _log);

auto waveGrid = make_unique<WaveGrid>(
_log, px, py, pz, nt, env->waterKinOptions.dtWave);
Expand All @@ -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;

Expand Down Expand Up @@ -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<WaveGrid>(_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<real> betas(nw, 0);
return fillWaveGrid(
std::move(waveGrid), zetaC0.data(), nw, betas, dw, env, _log);
Expand All @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
Loading