From d495f8ee8b2651646ed9a935eda070d637b46e8a Mon Sep 17 00:00:00 2001 From: Winterless Date: Sun, 3 Sep 2023 23:15:30 +0200 Subject: [PATCH] check cases --- .../test_2d_ball_shell_collision/ball_shell_collision.cpp | 3 +-- .../src/shell_beam_collision.cpp | 7 +++---- .../test_3d_roof_parametric_cvt.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/2d_examples/test_2d_ball_shell_collision/ball_shell_collision.cpp b/tests/2d_examples/test_2d_ball_shell_collision/ball_shell_collision.cpp index 4399691b14..765623903e 100644 --- a/tests/2d_examples/test_2d_ball_shell_collision/ball_shell_collision.cpp +++ b/tests/2d_examples/test_2d_ball_shell_collision/ball_shell_collision.cpp @@ -112,8 +112,7 @@ int main(int ac, char *av[]) // Define the methods for particle relaxation for wall boundary. //---------------------------------------------------------------------- SimpleDynamics wall_boundary_random_particles(wall_boundary); - relax_dynamics::ShellRelaxationStepInner - relaxation_step_wall_boundary_inner(wall_boundary_inner, thickness, level_set_refinement_ratio); + relax_dynamics::ShellRelaxationStepInner relaxation_step_wall_boundary_inner(wall_boundary_inner); relax_dynamics::ShellNormalDirectionPrediction shell_normal_prediction(wall_boundary_inner, thickness, cos(Pi / 3.75)); wall_boundary.addBodyStateForRecording("UpdatedIndicator"); //---------------------------------------------------------------------- diff --git a/tests/2d_examples/test_2d_shell_beam_collision/src/shell_beam_collision.cpp b/tests/2d_examples/test_2d_shell_beam_collision/src/shell_beam_collision.cpp index d54bdfb510..bb6653f574 100644 --- a/tests/2d_examples/test_2d_shell_beam_collision/src/shell_beam_collision.cpp +++ b/tests/2d_examples/test_2d_shell_beam_collision/src/shell_beam_collision.cpp @@ -83,9 +83,9 @@ int main(int ac, char *av[]) //---------------------------------------------------------------------- SPHSystem sph_system(system_domain_bounds, resolution_ref); /** Tag for running particle relaxation for the initially body-fitted distribution */ - sph_system.setRunParticleRelaxation(true); + sph_system.setRunParticleRelaxation(false); /** Tag for starting with relaxed body-fitted particles distribution */ - sph_system.setReloadParticles(false); + sph_system.setReloadParticles(true); sph_system.handleCommandlineOptions(ac, av); IOEnvironment io_environment(sph_system); //---------------------------------------------------------------------- @@ -135,8 +135,7 @@ int main(int ac, char *av[]) // Define the methods for particle relaxation for wall boundary. //---------------------------------------------------------------------- SimpleDynamics shell_random_particles(shell); - relax_dynamics::ShellRelaxationStepInner - relaxation_step_shell_inner(shell_inner, thickness, level_set_refinement_ratio); + relax_dynamics::ShellRelaxationStepInner relaxation_step_shell_inner(shell_inner); relax_dynamics::ShellNormalDirectionPrediction shell_normal_prediction(shell_inner, thickness, cos(Pi / 3.75)); shell.addBodyStateForRecording("UpdatedIndicator"); //---------------------------------------------------------------------- diff --git a/tests/3d_examples/test_3d_roof_parametric_cvt/test_3d_roof_parametric_cvt.cpp b/tests/3d_examples/test_3d_roof_parametric_cvt/test_3d_roof_parametric_cvt.cpp index 9f4d502d18..a9ea64c9b4 100644 --- a/tests/3d_examples/test_3d_roof_parametric_cvt/test_3d_roof_parametric_cvt.cpp +++ b/tests/3d_examples/test_3d_roof_parametric_cvt/test_3d_roof_parametric_cvt.cpp @@ -14,13 +14,13 @@ using namespace SPH; Real to_rad(Real angle) { return angle * Pi / 180; } -void relax_shell(RealBody &plate_body, Real thickness, Real level_set_refinement_ratio) +void relax_shell(RealBody &plate_body, Real thickness) { // BUG: apparently only works if dp > thickness, otherwise ShellNormalDirectionPrediction::correctNormalDirection() throws error InnerRelation imported_model_inner(plate_body); SimpleDynamics random_imported_model_particles(plate_body); - relax_dynamics::ShellRelaxationStepInner relaxation_step_inner(imported_model_inner, thickness, level_set_refinement_ratio); + relax_dynamics::ShellRelaxationStepInner relaxation_step_inner(imported_model_inner); relax_dynamics::ShellNormalDirectionPrediction shell_normal_prediction(imported_model_inner, thickness); //---------------------------------------------------------------------- // Particle relaxation starts here.