Correct regression test.

Xiangyu-Hu · Feb 13, 2023 · ae66a37 · ae66a37
1 parent 65a2ac4
commit ae66a37
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/SPHINXsys/src/shared/particle_dynamics/solid_dynamics/contact_dynamics.cpp b/SPHINXsys/src/shared/particle_dynamics/solid_dynamics/contact_dynamics.cpp
@@ -98,9 +98,7 @@ namespace SPH
 					Real temp = three_gaussian_points_[l] * average_spacing_k * 0.5 + average_spacing_k * 0.5;
 					contact_temp = 2.0 * (kernel_->W(h_ratio_k, temp, ZeroVecd) - offset_W_ij_[l]) *
 						average_spacing_k * 0.5 * three_gaussian_weights_[l];
-					contact_max += contact_temp;
-					if (Dimensions == 3)
-						contact_max += contact_temp * Pi * temp;
+					contact_max += Dimensions == 2 ? contact_temp : contact_temp * Pi * temp;
 				}
 				/** a calibration factor to avoid particle penetration into shell structure */
 				calibration_factor_.push_back(solid_.ReferenceDensity() / (contact_max + Eps));

diff --git a/tests/3d_examples/test_3d_elasticSolid_shell_collision/3d_elasticSolid_shell_collision.cpp b/tests/3d_examples/test_3d_elasticSolid_shell_collision/3d_elasticSolid_shell_collision.cpp
@@ -234,7 +234,7 @@ int main(int ac, char *av[])
 
 	if (sph_system.generate_regression_data_)
 	{
-		write_ball_center_displacement.generateDataBase(1.0e-2);
+		write_ball_center_displacement.generateDataBase(0.05);
 	}
 	else
 	{

diff --git a/..._elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_Run_0_result.xml b/..._elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_Run_0_result.xml
diff --git a/..._elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_Run_3_result.xml b/..._elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_Run_3_result.xml
diff --git a/..._elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_Run_5_result.xml b/..._elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_Run_5_result.xml
diff --git a/...d_elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_dtwdistance.xml b/...d_elasticSolid_shell_collision/regression_test_tool/BallObserver_Position_dtwdistance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance Position_0="0.0086099999999995624" />
+    <DTWDistance Position_0="0.016639999999999988" />
 </dtw_distance>