Skip to content

Patch the points below seabed errors and #384 #387

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
sanguinariojoe merged 2 commits into from
Jun 9, 2026
Merged

Patch the points below seabed errors and #384 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b8612
fix(core): Demote points below seabed from error to warning
sanguinariojoe Jun 9, 2026
561440a
fix(core): MATLAB wrappers trying to use the instance as a parameter …
sanguinariojoe Jun 9, 2026
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
14 changes: 5 additions & 9 deletions source/MoorDyn2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,7 @@ moordyn::MoorDyn::Init(const double* x, const double* xd, bool skip_ic)
}
// call this just to set WaterKin (may also set up output file in
// future)
try {
PointList[l]->initialize();
}
MOORDYN_CATCHER(err, err_msg);
if (err != MOORDYN_SUCCESS)
return err;
PointList[l]->initialize();
ix += 3;
}

Expand Down Expand Up @@ -1193,9 +1188,10 @@ moordyn::MoorDyn::ReadInFile()
// Note - this is not in MD-F
if (r0[2] < -env->WtrDpth) {
env->WtrDpth = -r0[2];
LOGWRN << "\t Water depth set to point " << PointList.size() + 1
<< " z position because point was specified below the "
"seabed" << endl;
LOGWRN << "\t Water depth set to point "
<< PointList.size() + 1
<< " z position because point was specified below the"
<< " seabed" << endl;
}

// Check point ID is sequential starting from 1
Expand Down
3 changes: 1 addition & 2 deletions source/Point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,10 @@ Point::initialize()
const real waterDepth =
seafloor ? seafloor->getDepthAt(r[0], r[1]) : -env->WtrDpth;
if (waterDepth > r[2]) {
LOGERR << "Error: water depth is shallower than Point " << number
LOGWRN << "Error: water depth is shallower than Point " << number
<< "." << endl
<< "\tseabed z = " << waterDepth << endl
<< "\tpoint = " << r << endl;
throw moordyn::invalid_value_error("Invalid water depth");
}
}

Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_Load.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_Load(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_LoadState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_LoadState(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_Save.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_Save(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SaveBodyVTK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDynBody, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_SaveBodyVTK(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SaveLineVTK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDynLine, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_SaveLineVTK(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SaveRodVTK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDynRod, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_SaveRodVTK(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SaveState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_SaveState(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SaveVTK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_SaveVTK(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SetLogFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray filename_matlab = inputs[0];
const CharArray filename_matlab = inputs[1];
std::string filename(filename_matlab.toAscii());
const int err = MoorDyn_SetLogFile(instance, filename.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
2 changes: 1 addition & 1 deletion wrappers/matlab/MoorDynM_SetTimeScheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ using matlab::mex::ArgumentList;

MOORDYNM_MEX_FUNCTION_BEGIN(MoorDyn, 2, 0)
{
const CharArray name_matlab = inputs[0];
const CharArray name_matlab = inputs[1];
std::string name(name_matlab.toAscii());
const int err = MoorDyn_SetTimeScheme(instance, name.c_str());
MOORDYNM_CHECK_ERROR(err);
Expand Down
Loading