Skip to content

Commit

Permalink
Merge pull request #625 from alarshi/modify_assert
Browse files Browse the repository at this point in the history
Modify assert when using gwb-dat.
  • Loading branch information
gassmoeller authored Feb 16, 2024
2 parents 5c2bd66 + 251fd44 commit 217731f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions source/world_builder/world.cc
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ namespace WorldBuilder
WBAssert(this->limit_debug_consistency_checks || this->parameters.coordinate_system->natural_coordinate_system() == cartesian
|| approx(depth, this->parameters.coordinate_system->max_model_depth()-sqrt(point_[0]*point_[0]+point_[1]*point_[1]+point_[2]*point_[2])),
"Inconsistent input. Please check whether the radius in the sperhical coordinates is consistent with the radius of the planet as defined "
<< "in the program that uses the Geodynamic World Builder. "
<< "in the program that uses the Geodynamic World Builder. This is a debug check in GWB and can be disabled by setting "
<< "limit_debug_consistency_checks to true. "
<< "Depth = " << depth << ", radius = " << this->parameters.coordinate_system->max_model_depth()
<< ", point = " << point_[0] << " " << point_[1] << " " << point_[2]
<< ", radius-point.norm() = " << this->parameters.coordinate_system->max_model_depth()-sqrt(point_[0]*point_[0]+point_[1]*point_[1]+point_[2]*point_[2]));
Expand Down Expand Up @@ -455,10 +456,11 @@ namespace WorldBuilder
// We receive the cartesian points from the user.
const Point<3> point(point_,cartesian);

WBAssert(!this->limit_debug_consistency_checks || this->parameters.coordinate_system->natural_coordinate_system() == cartesian
WBAssert(this->limit_debug_consistency_checks || this->parameters.coordinate_system->natural_coordinate_system() == cartesian
|| approx(depth, this->parameters.coordinate_system->max_model_depth()-sqrt(point_[0]*point_[0]+point_[1]*point_[1]+point_[2]*point_[2])),
"Inconsistent input. Please check whether the radius in the sperhical coordinates is consistent with the radius of the planet as defined "
<< "in the program that uses the Geodynamic World Builder. "
<< "in the program that uses the Geodynamic World Builder. This is a debug check in GWB and can be disabled by setting "
<< "limit_debug_consistency_checks to true. "
<< "Depth = " << depth << ", radius = " << this->parameters.coordinate_system->max_model_depth()
<< ", point = " << point_[0] << " " << point_[1] << " " << point_[2]
<< ", radius-point.norm() = " << this->parameters.coordinate_system->max_model_depth()-sqrt(point_[0]*point_[0]+point_[1]*point_[1]+point_[2]*point_[2]));
Expand Down

0 comments on commit 217731f

Please sign in to comment.