From 0e813b9ade9a395cf05d0fb9bdefa9b069c4c4a9 Mon Sep 17 00:00:00 2001 From: Bo-Zhang1995 Date: Mon, 10 Jun 2024 01:16:55 +0800 Subject: [PATCH 1/4] change the correction to RKGC and using the WKGC1 for free surface particles. --- .../fluid_dynamics/fluid_integration.hpp | 16 ++++++++-------- .../general_dynamics/kernel_correction.cpp | 9 ++++++--- .../general_dynamics/kernel_correction.h | 4 ++++ .../particle_dynamics_algorithms.h | 2 +- .../test_2d_impact_patch/impact_patch.cpp | 3 ++- ...WaterBody_TotalKineticEnergy_Run_0_result.xml | 2 +- ...WaterBody_TotalKineticEnergy_Run_3_result.xml | 2 +- ...WaterBody_TotalKineticEnergy_Run_5_result.xml | 2 +- .../WaterBody_TotalKineticEnergy_dtwdistance.xml | 2 +- .../test_2d_rotation_patch/rotation_patch.cpp | 3 ++- ...erBody_TotalMechanicalEnergy_Run_0_result.xml | 2 +- ...rBody_TotalMechanicalEnergy_Run_10_result.xml | 9 +++++++++ ...rBody_TotalMechanicalEnergy_Run_18_result.xml | 9 --------- ...erBody_TotalMechanicalEnergy_Run_5_result.xml | 9 +++++++++ ...erBody_TotalMechanicalEnergy_Run_9_result.xml | 9 --------- ...terBody_TotalMechanicalEnergy_dtwdistance.xml | 2 +- .../WaterBody_TotalMechanicalEnergy_runtimes.dat | 2 +- .../WaveProbe_FreeSurfaceHeight_Run_0_result.xml | 2 +- ...WaveProbe_FreeSurfaceHeight_Run_11_result.xml | 9 +++++++++ ...WaveProbe_FreeSurfaceHeight_Run_14_result.xml | 9 --------- .../WaveProbe_FreeSurfaceHeight_Run_5_result.xml | 9 +++++++++ .../WaveProbe_FreeSurfaceHeight_Run_7_result.xml | 9 --------- .../WaveProbe_FreeSurfaceHeight_dtwdistance.xml | 2 +- .../WaveProbe_FreeSurfaceHeight_runtimes.dat | 2 +- .../test_2d_standing_wave/standing_wave.cpp | 6 ++++-- 25 files changed, 73 insertions(+), 62 deletions(-) create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_18_result.xml create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_9_result.xml create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_14_result.xml create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_7_result.xml diff --git a/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp b/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp index fdc2e14e8d..16930df79d 100644 --- a/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp +++ b/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp @@ -84,11 +84,11 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>::inter Real dW_ijV_j = inner_neighborhood.dW_ij_[n] * Vol_[index_j]; const Vecd &e_ij = inner_neighborhood.e_ij_[n]; - force -= (p_[index_i] * correction_(index_i) + p_[index_j] * correction_(index_j)) * dW_ijV_j * e_ij; + force -= (p_[index_i] * correction_(index_j) + p_[index_j] * correction_(index_i)) * dW_ijV_j * e_ij; rho_dissipation += riemann_solver_.DissipativeUJump(p_[index_i] - p_[index_j]) * dW_ijV_j; } force_[index_i] += force * Vol_[index_i]; - drho_dt_[index_i] = rho_dissipation * rho_[index_i]; + drho_dt_[index_i] = rho_dissipation * mass_[index_i] / Vol_[index_i]; } //=================================================================================================// template @@ -121,7 +121,7 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>: } } force_[index_i] += force * Vol_[index_i]; - drho_dt_[index_i] += rho_dissipation * rho_[index_i]; + drho_dt_[index_i] = rho_dissipation * mass_[index_i] / Vol_[index_i]; } //=================================================================================================// template @@ -159,13 +159,13 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>:: Vecd &e_ij = contact_neighborhood.e_ij_[n]; Real dW_ijV_j = contact_neighborhood.dW_ij_[n] * Vol_k[index_j]; - force -= riemann_solver_k.AverageP(this->p_[index_i] * correction_(index_i), p_k[index_j] * correction_k(index_j)) * + force -= riemann_solver_k.AverageP(this->p_[index_i] * correction_(index_j), p_k[index_j] * correction_k(index_i)) * 2.0 * e_ij * dW_ijV_j; rho_dissipation += riemann_solver_k.DissipativeUJump(this->p_[index_i] - p_k[index_j]) * dW_ijV_j; } } this->force_[index_i] += force * this->Vol_[index_i]; - this->drho_dt_[index_i] += rho_dissipation * this->rho_[index_i]; + this->drho_dt_[index_i] += rho_dissipation * this->mass_[index_i] / this->Vol_[index_i]; } //=================================================================================================// template @@ -203,7 +203,7 @@ void Integration2ndHalf, RiemannSolverType>::interaction(size_t index_i, density_change_rate += u_jump * dW_ijV_j; p_dissipation += riemann_solver_.DissipativePJump(u_jump) * dW_ijV_j * e_ij; } - drho_dt_[index_i] += density_change_rate * rho_[index_i]; + drho_dt_[index_i] += density_change_rate * mass_[index_i] / Vol_[index_i]; force_[index_i] = p_dissipation * Vol_[index_i]; }; //=================================================================================================// @@ -236,7 +236,7 @@ void Integration2ndHalf, RiemannSolverType>::interaction(size_t in p_dissipation += riemann_solver_.DissipativePJump(u_jump) * dW_ijV_j * n_k[index_j]; } } - drho_dt_[index_i] += density_change_rate * this->rho_[index_i]; + drho_dt_[index_i] += density_change_rate * this->mass_[index_i] / this->Vol_[index_i]; force_[index_i] += p_dissipation * this->Vol_[index_i]; } //=================================================================================================// @@ -277,7 +277,7 @@ void Integration2ndHalf, RiemannSolverType>::interaction(size_t index_ p_dissipation += riemann_solver_k.DissipativePJump(u_jump) * dW_ijV_j * e_ij; } } - this->drho_dt_[index_i] += density_change_rate * this->rho_[index_i]; + this->drho_dt_[index_i] += density_change_rate * this->mass_[index_i] / this->Vol_[index_i]; this->force_[index_i] += p_dissipation * this->Vol_[index_i]; } //=================================================================================================// diff --git a/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp b/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp index 19ee6e0372..532c0527c3 100644 --- a/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp +++ b/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp @@ -10,7 +10,8 @@ void LinearGradientCorrectionMatrix>::interaction(size_t index_i, Real d const Neighborhood &inner_neighborhood = inner_configuration_[index_i]; for (size_t n = 0; n != inner_neighborhood.current_size_; ++n) { - Vecd gradW_ij = inner_neighborhood.dW_ij_[n] * Vol_[index_i] * inner_neighborhood.e_ij_[n]; + size_t index_j = inner_neighborhood.j_[n]; + Vecd gradW_ij = inner_neighborhood.dW_ij_[n] * Vol_[index_j] * inner_neighborhood.e_ij_[n]; Vecd r_ji = inner_neighborhood.r_ij_[n] * inner_neighborhood.e_ij_[n]; local_configuration -= r_ji * gradW_ij.transpose(); } @@ -19,9 +20,11 @@ void LinearGradientCorrectionMatrix>::interaction(size_t index_i, Real d //=================================================================================================// void LinearGradientCorrectionMatrix>::update(size_t index_i, Real dt) { + Real det_sqr = SMAX(alpha_ - B_[index_i].determinant(), 0.0); Matd inverse = B_[index_i].inverse(); - Real weight = alpha_ / (B_[index_i].determinant() + alpha_); - B_[index_i] = weight * Matd::Identity() + (1.0 - weight) * inverse; + Real weight1_ = B_[index_i].determinant() / (B_[index_i].determinant() + det_sqr); + Real weight2_ = det_sqr / (B_[index_i].determinant() + det_sqr); + B_[index_i] = weight1_ * inverse + weight2_ * Matd::Identity(); } //=================================================================================================// LinearGradientCorrectionMatrix>:: diff --git a/src/shared/particle_dynamics/general_dynamics/kernel_correction.h b/src/shared/particle_dynamics/general_dynamics/kernel_correction.h index 321c5c2fb7..caf4ba7b6e 100644 --- a/src/shared/particle_dynamics/general_dynamics/kernel_correction.h +++ b/src/shared/particle_dynamics/general_dynamics/kernel_correction.h @@ -38,6 +38,10 @@ namespace SPH template class LinearGradientCorrectionMatrix; + +// WKGC1 will be used for calculate the KGC matrix. +// The difference between WKGC1 and WKGC2 can refer to https://doi.org/10.1016/j.cma.2023.116460 + template class LinearGradientCorrectionMatrix : public LocalDynamics, public DataDelegationType diff --git a/src/shared/particle_dynamics/particle_dynamics_algorithms.h b/src/shared/particle_dynamics/particle_dynamics_algorithms.h index 0cdfd78c49..9098ec1d11 100644 --- a/src/shared/particle_dynamics/particle_dynamics_algorithms.h +++ b/src/shared/particle_dynamics/particle_dynamics_algorithms.h @@ -128,6 +128,7 @@ template class ReduceDynamics : public LocalDynamicsType, public BaseDynamics { + using ReturnType = typename LocalDynamicsType::ReturnType; public: template ReduceDynamics(DynamicsIdentifier &identifier, Args &&...args) @@ -135,7 +136,6 @@ class ReduceDynamics : public LocalDynamicsType, BaseDynamics(identifier.getSPHBody()){}; virtual ~ReduceDynamics(){}; - using ReturnType = typename LocalDynamicsType::ReturnType; std::string QuantityName() { return this->quantity_name_; }; std::string DynamicsIdentifierName() { return this->identifier_.getName(); }; diff --git a/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp b/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp index f29b4eee18..a81673cafe 100644 --- a/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp +++ b/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp @@ -100,6 +100,7 @@ int main(int ac, char *av[]) //---------------------------------------------------------------------- BoundingBox system_domain_bounds(Vec2d(-LH, -LH), Vec2d(LL + BW, LH + BW)); SPHSystem sph_system(system_domain_bounds, particle_spacing_ref); + sph_system.setGenerateRegressionData(true); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. @@ -122,7 +123,7 @@ int main(int ac, char *av[]) // Define the numerical methods used in the simulation. // Note that there may be data dependence on the sequence of constructions. //---------------------------------------------------------------------- - InteractionWithUpdate corrected_configuration_fluid(water_body_inner, 0.3); + InteractionWithUpdate corrected_configuration_fluid(water_body_inner, 0.5); InteractionWithUpdate free_surface_indicator(water_body_inner); Dynamics1Level fluid_pressure_relaxation_correct(water_body_inner); diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml index 923308746e..e51f43fee7 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml index c5acff86c7..7a9dc8dd5f 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml index 4f35bcb40a..7e8dbcaf3b 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml index 3d3787632a..fbd66fc676 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp b/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp index 44ffc4cc8f..f6ff82a323 100644 --- a/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp +++ b/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp @@ -114,6 +114,7 @@ int main(int ac, char *av[]) //---------------------------------------------------------------------- BoundingBox system_domain_bounds(Vec2d(-LL, -LL), Vec2d(LL + 10 * BW, LH + 10 * BW)); SPHSystem sph_system(system_domain_bounds, particle_spacing_ref); + //sph_system.setGenerateRegressionData(true); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. @@ -145,7 +146,7 @@ int main(int ac, char *av[]) // boundary condition and other constraints should be defined. //---------------------------------------------------------------------- InteractionWithUpdate free_surface_indicator(water_body_inner); - InteractionWithUpdate corrected_configuration_fluid(water_body_inner, 0.3); + InteractionWithUpdate corrected_configuration_fluid(water_body_inner, 0.5); Dynamics1Level fluid_pressure_relaxation_correct(water_body_inner); Dynamics1Level fluid_density_relaxation(water_body_inner); InteractionWithUpdate update_density_by_summation(water_body_inner); diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml index 5cfbcf4db4..c8f10482eb 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml new file mode 100644 index 0000000000..f9c6e7d944 --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_18_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_18_result.xml deleted file mode 100644 index e1d75940c2..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_18_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml new file mode 100644 index 0000000000..313749faf9 --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_9_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_9_result.xml deleted file mode 100644 index 87d08b3fad..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_9_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml index 0067554d1a..477a241944 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat index 57574ea953..b33a499cce 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat @@ -1,3 +1,3 @@ true -19 +11 4 \ No newline at end of file diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml index b36dce8223..d624cd41ac 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml new file mode 100644 index 0000000000..b39ff06db8 --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_14_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_14_result.xml deleted file mode 100644 index 53fd8b1cce..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_14_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml new file mode 100644 index 0000000000..a0ad638dea --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_7_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_7_result.xml deleted file mode 100644 index ba0fa59b51..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_7_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml index f0bcd8e4d3..6a3bd9af94 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat index 9c41804468..5cc2fa0e29 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat @@ -1,3 +1,3 @@ true -15 +12 4 \ No newline at end of file diff --git a/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp b/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp index bbdac1f199..b16b2ea496 100644 --- a/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp +++ b/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp @@ -1,7 +1,8 @@ /** * @file standing_wave.cpp * @brief 2D standing_wave example. - * @author Yaru Ren, Chi Zhang and Xiangyu Hu + * @author Bo Zhang, Yaru Ren, Chi Zhang and Xiangyu Hu + * The correction method is RKGC, more details referring to arXiv:2406.0257. */ #include "sphinxsys.h" //SPHinXsys Library. using namespace SPH; // Namespace cite here. @@ -111,6 +112,7 @@ int main(int ac, char *av[]) sph_system.setRunParticleRelaxation(false); /** Tag for computation start with relaxed body fitted particles distribution. */ sph_system.setReloadParticles(false); + //sph_system.setGenerateRegressionData(true); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. @@ -198,7 +200,7 @@ int main(int ac, char *av[]) Gravity gravity(Vecd(0.0, -gravity_g)); SimpleDynamics constant_gravity(water_block, gravity); SimpleDynamics wall_boundary_normal_direction(wall_boundary); - InteractionWithUpdate corrected_configuration_fluid(ConstructorArgs(water_block_inner, 0.3), water_wall_contact); + InteractionWithUpdate corrected_configuration_fluid(ConstructorArgs(water_block_inner, 0.5), water_wall_contact); Dynamics1Level fluid_pressure_relaxation_correct(water_block_inner, water_wall_contact); Dynamics1Level fluid_density_relaxation(water_block_inner, water_wall_contact); InteractionWithUpdate fluid_density_by_summation(water_block_inner, water_wall_contact); From 53a4b33a54890587fade15f4be841af7e2a27a92 Mon Sep 17 00:00:00 2001 From: Bo-Zhang1995 Date: Mon, 10 Jun 2024 02:18:33 +0800 Subject: [PATCH 2/4] correct the bugs in dissipation --- .../particle_dynamics/fluid_dynamics/fluid_integration.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp b/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp index 16930df79d..2f01eb5fa8 100644 --- a/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp +++ b/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp @@ -121,7 +121,7 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>: } } force_[index_i] += force * Vol_[index_i]; - drho_dt_[index_i] = rho_dissipation * mass_[index_i] / Vol_[index_i]; + drho_dt_[index_i] += rho_dissipation * mass_[index_i] / Vol_[index_i]; } //=================================================================================================// template From 48f4b39c32d2bd555bf029acedd869b1a5860a35 Mon Sep 17 00:00:00 2001 From: Bo-Zhang1995 Date: Mon, 10 Jun 2024 22:49:48 +0800 Subject: [PATCH 3/4] except the standing wave --- .../fluid_dynamics/fluid_integration.hpp | 12 ++++++------ .../general_dynamics/kernel_correction.cpp | 2 +- .../test_2d_impact_patch/impact_patch.cpp | 1 - .../test_2d_rotation_patch/rotation_patch.cpp | 1 - .../test_2d_standing_wave/standing_wave.cpp | 3 +-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp b/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp index 2f01eb5fa8..c7a4eb2b57 100644 --- a/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp +++ b/src/shared/particle_dynamics/fluid_dynamics/fluid_integration.hpp @@ -88,7 +88,7 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>::inter rho_dissipation += riemann_solver_.DissipativeUJump(p_[index_i] - p_[index_j]) * dW_ijV_j; } force_[index_i] += force * Vol_[index_i]; - drho_dt_[index_i] = rho_dissipation * mass_[index_i] / Vol_[index_i]; + drho_dt_[index_i] = rho_dissipation * rho_[index_i]; } //=================================================================================================// template @@ -121,7 +121,7 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>: } } force_[index_i] += force * Vol_[index_i]; - drho_dt_[index_i] += rho_dissipation * mass_[index_i] / Vol_[index_i]; + drho_dt_[index_i] += rho_dissipation * rho_[index_i]; } //=================================================================================================// template @@ -165,7 +165,7 @@ void Integration1stHalf, RiemannSolverType, KernelCorrectionType>:: } } this->force_[index_i] += force * this->Vol_[index_i]; - this->drho_dt_[index_i] += rho_dissipation * this->mass_[index_i] / this->Vol_[index_i]; + this->drho_dt_[index_i] += rho_dissipation * this->rho_[index_i]; } //=================================================================================================// template @@ -203,7 +203,7 @@ void Integration2ndHalf, RiemannSolverType>::interaction(size_t index_i, density_change_rate += u_jump * dW_ijV_j; p_dissipation += riemann_solver_.DissipativePJump(u_jump) * dW_ijV_j * e_ij; } - drho_dt_[index_i] += density_change_rate * mass_[index_i] / Vol_[index_i]; + drho_dt_[index_i] += density_change_rate * rho_[index_i]; force_[index_i] = p_dissipation * Vol_[index_i]; }; //=================================================================================================// @@ -236,7 +236,7 @@ void Integration2ndHalf, RiemannSolverType>::interaction(size_t in p_dissipation += riemann_solver_.DissipativePJump(u_jump) * dW_ijV_j * n_k[index_j]; } } - drho_dt_[index_i] += density_change_rate * this->mass_[index_i] / this->Vol_[index_i]; + drho_dt_[index_i] += density_change_rate * this->rho_[index_i]; force_[index_i] += p_dissipation * this->Vol_[index_i]; } //=================================================================================================// @@ -277,7 +277,7 @@ void Integration2ndHalf, RiemannSolverType>::interaction(size_t index_ p_dissipation += riemann_solver_k.DissipativePJump(u_jump) * dW_ijV_j * e_ij; } } - this->drho_dt_[index_i] += density_change_rate * this->mass_[index_i] / this->Vol_[index_i]; + this->drho_dt_[index_i] += density_change_rate * this->rho_[index_i]; this->force_[index_i] += p_dissipation * this->Vol_[index_i]; } //=================================================================================================// diff --git a/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp b/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp index 532c0527c3..a749eecae1 100644 --- a/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp +++ b/src/shared/particle_dynamics/general_dynamics/kernel_correction.cpp @@ -20,7 +20,7 @@ void LinearGradientCorrectionMatrix>::interaction(size_t index_i, Real d //=================================================================================================// void LinearGradientCorrectionMatrix>::update(size_t index_i, Real dt) { - Real det_sqr = SMAX(alpha_ - B_[index_i].determinant(), 0.0); + Real det_sqr = SMAX(alpha_ - B_[index_i].determinant(), Real(0)); Matd inverse = B_[index_i].inverse(); Real weight1_ = B_[index_i].determinant() / (B_[index_i].determinant() + det_sqr); Real weight2_ = det_sqr / (B_[index_i].determinant() + det_sqr); diff --git a/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp b/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp index a81673cafe..9e620dd933 100644 --- a/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp +++ b/tests/2d_examples/test_2d_impact_patch/impact_patch.cpp @@ -100,7 +100,6 @@ int main(int ac, char *av[]) //---------------------------------------------------------------------- BoundingBox system_domain_bounds(Vec2d(-LH, -LH), Vec2d(LL + BW, LH + BW)); SPHSystem sph_system(system_domain_bounds, particle_spacing_ref); - sph_system.setGenerateRegressionData(true); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. diff --git a/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp b/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp index f6ff82a323..3225fabb03 100644 --- a/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp +++ b/tests/2d_examples/test_2d_rotation_patch/rotation_patch.cpp @@ -114,7 +114,6 @@ int main(int ac, char *av[]) //---------------------------------------------------------------------- BoundingBox system_domain_bounds(Vec2d(-LL, -LL), Vec2d(LL + 10 * BW, LH + 10 * BW)); SPHSystem sph_system(system_domain_bounds, particle_spacing_ref); - //sph_system.setGenerateRegressionData(true); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. diff --git a/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp b/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp index b16b2ea496..a87a0ee61c 100644 --- a/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp +++ b/tests/2d_examples/test_2d_standing_wave/standing_wave.cpp @@ -112,7 +112,6 @@ int main(int ac, char *av[]) sph_system.setRunParticleRelaxation(false); /** Tag for computation start with relaxed body fitted particles distribution. */ sph_system.setReloadParticles(false); - //sph_system.setGenerateRegressionData(true); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. @@ -271,7 +270,7 @@ int main(int ac, char *av[]) { /** outer loop for dual-time criteria time-stepping. */ time_instance = TickCount::now(); - Real advection_dt = fluid_advection_time_step.exec(); + Real advection_dt = 0.3 * fluid_advection_time_step.exec(); fluid_density_by_summation.exec(); corrected_configuration_fluid.exec(); interval_computing_time_step += TickCount::now() - time_instance; From dc9f1f338042e234b759a7c2d09064f56a00ef5b Mon Sep 17 00:00:00 2001 From: Bo-Zhang1995 Date: Tue, 11 Jun 2024 03:41:00 +0800 Subject: [PATCH 4/4] all cases should be passed now. --- .../WaterBody_TotalKineticEnergy_Run_0_result.xml | 2 +- .../WaterBody_TotalKineticEnergy_Run_3_result.xml | 2 +- .../WaterBody_TotalKineticEnergy_Run_5_result.xml | 2 +- .../WaterBody_TotalKineticEnergy_dtwdistance.xml | 2 +- .../WaterBody_TotalMechanicalEnergy_Run_0_result.xml | 4 ++-- .../WaterBody_TotalMechanicalEnergy_Run_10_result.xml | 9 --------- .../WaterBody_TotalMechanicalEnergy_Run_12_result.xml | 9 +++++++++ .../WaterBody_TotalMechanicalEnergy_Run_5_result.xml | 9 --------- .../WaterBody_TotalMechanicalEnergy_Run_6_result.xml | 9 +++++++++ .../WaterBody_TotalMechanicalEnergy_dtwdistance.xml | 2 +- .../WaterBody_TotalMechanicalEnergy_runtimes.dat | 2 +- .../WaveProbe_FreeSurfaceHeight_Run_0_result.xml | 4 ++-- .../WaveProbe_FreeSurfaceHeight_Run_11_result.xml | 4 ++-- .../WaveProbe_FreeSurfaceHeight_Run_22_result.xml | 9 +++++++++ .../WaveProbe_FreeSurfaceHeight_Run_5_result.xml | 9 --------- .../WaveProbe_FreeSurfaceHeight_dtwdistance.xml | 2 +- .../WaveProbe_FreeSurfaceHeight_runtimes.dat | 2 +- .../mixed_poiseuille_flow.cpp | 1 - .../VelocityObserver_Velocity_Run_0_result.xml | 9 +++++++++ .../VelocityObserver_Velocity_Run_1_result.xml | 9 --------- .../VelocityObserver_Velocity_Run_3_result.xml | 2 +- .../VelocityObserver_Velocity_Run_5_result.xml | 9 --------- .../VelocityObserver_Velocity_Run_6_result.xml | 9 +++++++++ .../VelocityObserver_Velocity_dtwdistance.xml | 2 +- .../VelocityObserver_Velocity_runtimes.dat | 2 +- 25 files changed, 62 insertions(+), 63 deletions(-) delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml create mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml delete mode 100644 tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml create mode 100644 tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml delete mode 100644 tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml delete mode 100644 tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml create mode 100644 tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_6_result.xml diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml index e51f43fee7..923308746e 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml index 7a9dc8dd5f..c5acff86c7 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml index 7e8dbcaf3b..4f35bcb40a 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml index fbd66fc676..3d3787632a 100644 --- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml +++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml index c8f10482eb..b6f912d682 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml @@ -1,9 +1,9 @@ - + - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml deleted file mode 100644 index f9c6e7d944..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml new file mode 100644 index 0000000000..da1a5a746c --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml deleted file mode 100644 index 313749faf9..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml new file mode 100644 index 0000000000..7a92c88b84 --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml index 477a241944..5088bd56b4 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat index b33a499cce..19c6fe5aad 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat @@ -1,3 +1,3 @@ true -11 +13 4 \ No newline at end of file diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml index d624cd41ac..556b7b7971 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml @@ -1,9 +1,9 @@ - + - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml index b39ff06db8..7b55b02b46 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml @@ -1,9 +1,9 @@ - + - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml new file mode 100644 index 0000000000..0ec8bfefb2 --- /dev/null +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml deleted file mode 100644 index a0ad638dea..0000000000 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml index 6a3bd9af94..1e75241590 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat index 5cc2fa0e29..5be9660a9d 100644 --- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat +++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat @@ -1,3 +1,3 @@ true -12 +23 4 \ No newline at end of file diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp index 57b9f7d19b..1986476132 100644 --- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp +++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp @@ -146,7 +146,6 @@ int main(int ac, char *av[]) // Build up an SPHSystem and IO environment. //---------------------------------------------------------------------- SPHSystem sph_system(system_domain_bounds, resolution_ref); - sph_system.setGenerateRegressionData(false); sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment(); //---------------------------------------------------------------------- // Creating bodies with corresponding materials and particles. diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml new file mode 100644 index 0000000000..3df98e7925 --- /dev/null +++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml deleted file mode 100644 index 46f4875cea..0000000000 --- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml index 483543204d..c579e1c11b 100644 --- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml +++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml deleted file mode 100644 index 5145414a95..0000000000 --- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_6_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_6_result.xml new file mode 100644 index 0000000000..f05a38a36e --- /dev/null +++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_6_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml index c038657b7a..aaf5de9683 100644 --- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml +++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat index de07de18db..34de7daedb 100644 --- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat +++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat @@ -1,3 +1,3 @@ true -6 +7 4 \ No newline at end of file