Skip to content

Again some fixes to demote errors to warnings and to properly catch exceptions #391

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 10, 2026
Merged

Again some fixes to demote errors to warnings and to properly catch exceptions #391

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
584c87a
fix(core): Demote anchors below seabed from error to warning
sanguinariojoe Jun 10, 2026
9871815
fix(core): Catch the exceptions when initializing the time integrator…
sanguinariojoe Jun 10, 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
3 changes: 1 addition & 2 deletions source/Line.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,9 +546,8 @@ Line::initialize()
// so now we can proceed with figuring out the positions of the nodes along
// the line.
if (getWaterDepth(r[0][0], r[0][1]) > r[0][2]) {
LOGERR << "Water depth is shallower than Line " << number << " anchor"
LOGWRN << "Water depth is shallower than Line " << number << " anchor"
<< endl;
throw moordyn::invalid_value_error("Invalid water depth");
}

// TODO - determine if F should be for each segment or for each node,
Expand Down
22 changes: 19 additions & 3 deletions source/MoorDyn2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,12 @@ moordyn::MoorDyn::icLegacy()
const unsigned int convergence_iters = 9; // 10 iterations, indexed 0-9
ICdt = ICdt / (convergence_iters + 1);

_t_integrator->Init();
try {
_t_integrator->Init();
}
MOORDYN_CATCHER(err, err_msg);
if (err != MOORDYN_SUCCESS)
return err;
if (ICfile != "") {
try {
_t_integrator->LoadState(_basepath + ICfile);
Expand Down Expand Up @@ -371,7 +376,12 @@ moordyn::MoorDyn::icStationary()
for (auto obj : LineList)
t_integrator.AddLine(obj);
t_integrator.SetCFL((std::min)(cfl, 1.0));
t_integrator.Init();
try {
t_integrator.Init();
}
MOORDYN_CATCHER(err, err_msg);
if (err != MOORDYN_SUCCESS)
return err;
if (ICfile != "") {
try {
t_integrator.LoadState(_basepath + ICfile);
Expand Down Expand Up @@ -574,7 +584,13 @@ moordyn::MoorDyn::Init(const double* x, const double* xd, bool skip_ic)
}

} else {
_t_integrator->Init();
try {
_t_integrator->Init();
}
MOORDYN_CATCHER(err, err_msg);
if (err != MOORDYN_SUCCESS)
return err;

if (ICfile != "") {
try {
_t_integrator->LoadState(_basepath + ICfile);
Expand Down
Loading