From d270ed1e752c5685bc9efc610628232315f70038 Mon Sep 17 00:00:00 2001 From: dfds <3270462@qq.com> Date: Mon, 24 Jul 2023 22:01:31 +0200 Subject: [PATCH 1/2] decrease the domain size and resoultions --- .../2d_eulerian_flow_around_cylinder.h | 8 ++++---- .../2d_eulerian_flow_around_cylinder_LG.cpp | 2 +- .../2d_eulerian_flow_around_cylinder_LG.h | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/2d_examples/test_2d_eulerian_flow_around_cylinder/2d_eulerian_flow_around_cylinder.h b/tests/2d_examples/test_2d_eulerian_flow_around_cylinder/2d_eulerian_flow_around_cylinder.h index b1d83ee246..cbc56f97b6 100644 --- a/tests/2d_examples/test_2d_eulerian_flow_around_cylinder/2d_eulerian_flow_around_cylinder.h +++ b/tests/2d_examples/test_2d_eulerian_flow_around_cylinder/2d_eulerian_flow_around_cylinder.h @@ -12,12 +12,12 @@ using namespace SPH; //---------------------------------------------------------------------- // Basic geometry parameters and numerical setup. //---------------------------------------------------------------------- -Real DL = 20.0; /**< Channel length. */ -Real DH = 15.0; /**< Channel height. */ -Real resolution_ref = 1.0 / 5.0; /**< Initial reference particle spacing. */ +Real DL = 15.0; /**< Channel length. */ +Real DH = 10.0; /**< Channel height. */ +Real resolution_ref = 1.0 / 4.0; /**< Initial reference particle spacing. */ Real DL_sponge = resolution_ref * 2.0; /**< Sponge region to impose inflow condition. */ Real DH_sponge = resolution_ref * 2.0; /**< Sponge region to impose inflow condition. */ -Vec2d cylinder_center(6.0, DH / 2.0); /**< Location of the cylinder center. */ +Vec2d cylinder_center(4.0, DH / 2.0); /**< Location of the cylinder center. */ Real cylinder_radius = 1.0; /**< Radius of the cylinder. */ //---------------------------------------------------------------------- // Material properties of the fluid. diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.cpp b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.cpp index 9ce42db500..a344bb604e 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.cpp +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.cpp @@ -106,7 +106,7 @@ int main(int ac, char *av[]) InteractionWithUpdate pressure_relaxation(water_block_complex); InteractionWithUpdate density_relaxation(water_block_complex); InteractionDynamics viscous_acceleration(water_block_complex); - ReduceDynamics get_fluid_time_step_size(water_block, 0.3); + ReduceDynamics get_fluid_time_step_size(water_block, 0.5); InteractionWithUpdate surface_indicator(water_block_complex.getInnerRelation(), water_block_complex.getContactRelation()); Dynamics1Level variable_reset_in_boundary_condition(water_block_complex.getInnerRelation()); //---------------------------------------------------------------------- diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.h b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.h index 47e7040950..41bd19c632 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.h +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/2d_eulerian_flow_around_cylinder_LG.h @@ -12,12 +12,12 @@ using namespace SPH; //---------------------------------------------------------------------- // Basic geometry parameters and numerical setup. //---------------------------------------------------------------------- -Real DL = 20.0; /**< Channel length. */ -Real DH = 15.0; /**< Channel height. */ -Real resolution_ref = 1.0 / 5.0; /**< Initial reference particle spacing. */ +Real DL = 15.0; /**< Channel length. */ +Real DH = 10.0; /**< Channel height. */ +Real resolution_ref = 1.0 / 4.0; /**< Initial reference particle spacing. */ Real DL_sponge = resolution_ref * 2.0; /**< Sponge region to impose inflow condition. */ Real DH_sponge = resolution_ref * 2.0; /**< Sponge region to impose inflow condition. */ -Vec2d cylinder_center(6.0, DH / 2.0); /**< Location of the cylinder center. */ +Vec2d cylinder_center(4.0, DH / 2.0); /**< Location of the cylinder center. */ Real cylinder_radius = 1.0; /**< Radius of the cylinder. */ //---------------------------------------------------------------------- // Material properties of the fluid. From 4c943ee97b07e3c89891e7fc5b0441b5b8ca1426 Mon Sep 17 00:00:00 2001 From: dfds <3270462@qq.com> Date: Tue, 25 Jul 2023 11:45:47 +0200 Subject: [PATCH 2/2] change regression file in Eulerian case --- .../Cylinder_TotalViscousForceOnSolid.xml | 32 +++++++++---------- ..._TotalViscousForceOnSolid_Run_0_result.xml | 2 +- ...TotalViscousForceOnSolid_Run_10_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_11_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_12_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_13_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_14_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_15_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_16_result.xml | 9 ++++++ ...TotalViscousForceOnSolid_Run_17_result.xml | 9 ++++++ ..._TotalViscousForceOnSolid_Run_1_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_2_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_3_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_4_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_5_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_6_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_7_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_8_result.xml | 2 +- ..._TotalViscousForceOnSolid_Run_9_result.xml | 2 +- ...r_TotalViscousForceOnSolid_dtwdistance.xml | 2 +- ...nder_TotalViscousForceOnSolid_runtimes.dat | 2 +- 21 files changed, 100 insertions(+), 28 deletions(-) create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_10_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_11_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_12_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_13_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_14_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_15_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_16_result.xml create mode 100644 tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_17_result.xml diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid.xml index 9faf4810ab..2d6ec72825 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_0_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_0_result.xml index 408a47e4e7..695bfb1581 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_0_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_0_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_10_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_10_result.xml new file mode 100644 index 0000000000..3e6db9b20a --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_10_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_11_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_11_result.xml new file mode 100644 index 0000000000..67cda5732e --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_11_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_12_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_12_result.xml new file mode 100644 index 0000000000..2f766b6b78 --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_12_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_13_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_13_result.xml new file mode 100644 index 0000000000..ac2dade571 --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_13_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_14_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_14_result.xml new file mode 100644 index 0000000000..a4d1b39064 --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_14_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_15_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_15_result.xml new file mode 100644 index 0000000000..d75b772ddd --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_15_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_16_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_16_result.xml new file mode 100644 index 0000000000..297cfcec5e --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_16_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_17_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_17_result.xml new file mode 100644 index 0000000000..cf46b920c2 --- /dev/null +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_17_result.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_1_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_1_result.xml index 5a04e37bff..44d93a5365 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_1_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_1_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_2_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_2_result.xml index cb8c060886..71ba2f2bee 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_2_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_2_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_3_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_3_result.xml index 00a7d5b77a..e692f79589 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_3_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_3_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_4_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_4_result.xml index 529cc3ea5b..26628c2a2b 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_4_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_4_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_5_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_5_result.xml index 7109bd1a70..a4490e080a 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_5_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_5_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_6_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_6_result.xml index 19cf1198b0..1d97191a71 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_6_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_6_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_7_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_7_result.xml index 975299f820..4e4ce7e519 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_7_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_7_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_8_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_8_result.xml index fa97e06341..a30238a1b2 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_8_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_8_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_9_result.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_9_result.xml index c924174369..31795fe651 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_9_result.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_Run_9_result.xml @@ -4,6 +4,6 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_dtwdistance.xml b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_dtwdistance.xml index e871fbdada..ba1554858a 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_dtwdistance.xml +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_dtwdistance.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_runtimes.dat b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_runtimes.dat index a1578fa707..93f8695876 100644 --- a/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_runtimes.dat +++ b/tests/user_examples/test_2d_eulerian_flow_around_cylinder_LG/regression_test_tool/Cylinder_TotalViscousForceOnSolid_runtimes.dat @@ -1,3 +1,3 @@ true -10 +18 4 \ No newline at end of file