test-2

Xiangyu-Hu · Sep 9, 2024 · 9e54b64 · 9e54b64
1 parent 49fb0e6
commit 9e54b64
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 9 deletions.
diff --git a/...les/test_3d_aaa_taylor_bar/CMakeLists.txt → ...mples/test_0_taylor_bar_UL/CMakeLists.txt b/...les/test_3d_aaa_taylor_bar/CMakeLists.txt → ...mples/test_0_taylor_bar_UL/CMakeLists.txt
diff --git a/...ression_test_tool/MyObserver_Position.xml → ...ression_test_tool/MyObserver_Position.xml b/...ression_test_tool/MyObserver_Position.xml → ...ression_test_tool/MyObserver_Position.xml
diff --git a/...tool/MyObserver_Position_Run_0_result.xml → ...tool/MyObserver_Position_Run_0_result.xml b/...tool/MyObserver_Position_Run_0_result.xml → ...tool/MyObserver_Position_Run_0_result.xml
diff --git a/...tool/MyObserver_Position_Run_1_result.xml → ...tool/MyObserver_Position_Run_1_result.xml b/...tool/MyObserver_Position_Run_1_result.xml → ...tool/MyObserver_Position_Run_1_result.xml
diff --git a/...tool/MyObserver_Position_Run_2_result.xml → ...tool/MyObserver_Position_Run_2_result.xml b/...tool/MyObserver_Position_Run_2_result.xml → ...tool/MyObserver_Position_Run_2_result.xml
diff --git a/...tool/MyObserver_Position_Run_3_result.xml → ...tool/MyObserver_Position_Run_3_result.xml b/...tool/MyObserver_Position_Run_3_result.xml → ...tool/MyObserver_Position_Run_3_result.xml
diff --git a/...tool/MyObserver_Position_Run_4_result.xml → ...tool/MyObserver_Position_Run_4_result.xml b/...tool/MyObserver_Position_Run_4_result.xml → ...tool/MyObserver_Position_Run_4_result.xml
diff --git a/...tool/MyObserver_Position_Run_5_result.xml → ...tool/MyObserver_Position_Run_5_result.xml b/...tool/MyObserver_Position_Run_5_result.xml → ...tool/MyObserver_Position_Run_5_result.xml
diff --git a/..._tool/MyObserver_Position_dtwdistance.xml → ..._tool/MyObserver_Position_dtwdistance.xml b/..._tool/MyObserver_Position_dtwdistance.xml → ..._tool/MyObserver_Position_dtwdistance.xml
diff --git a/...est_tool/MyObserver_Position_runtimes.dat → ...est_tool/MyObserver_Position_runtimes.dat b/...est_tool/MyObserver_Position_runtimes.dat → ...est_tool/MyObserver_Position_runtimes.dat
diff --git a/...ression_test_tool/regression_test_tool.py → ...ression_test_tool/regression_test_tool.py b/...ression_test_tool/regression_test_tool.py → ...ression_test_tool/regression_test_tool.py
diff --git a/.../test_3d_aaa_taylor_bar/taylor_bar_UL.cpp → ...es/test_0_taylor_bar_UL/taylor_bar_UL.cpp b/.../test_3d_aaa_taylor_bar/taylor_bar_UL.cpp → ...es/test_0_taylor_bar_UL/taylor_bar_UL.cpp
@@ -4,16 +4,14 @@
  * @author Shuaihao Zhang, Dong Wu and Xiangyu Hu
  */
 #include "taylor_bar_UL.h"
-#include "sphinxsys.h"
-using namespace SPH;
 
 int main(int ac, char *av[])
 {
     /** Setup the system. Please the make sure the global domain bounds are correctly defined. */
     SPHSystem system(system_domain_bounds, particle_spacing_ref);
-    system.handleCommandlineOptions(ac, av)->setIOEnvironment();
     system.setRunParticleRelaxation(false);
     system.setReloadParticles(true);
+    system.handleCommandlineOptions(ac, av)->setIOEnvironment();
 
     RealBody column(system, makeShared<Column>("Column"));
     column.defineBodyLevelSetShape()->writeLevelSet(system);
@@ -49,7 +47,7 @@ int main(int ac, char *av[])
         /** Write the particle reload files. */
         ReloadParticleIO write_particle_reload_files(column);
         /** A  Physics relaxation step. */
-        RelaxationStepLevelSetCorrectionInner relaxation_step_inner(column_inner);
+        RelaxationStepLevelSetInner relaxation_step_inner(column_inner);
         /**
          * @brief 	Particle relaxation starts here.
          */

diff --git a/...es/test_3d_aaa_taylor_bar/taylor_bar_UL.h → ...ples/test_0_taylor_bar_UL/taylor_bar_UL.h b/...es/test_3d_aaa_taylor_bar/taylor_bar_UL.h → ...ples/test_0_taylor_bar_UL/taylor_bar_UL.h
@@ -3,7 +3,6 @@
  * @brief This is the case setup for plastic taylor bar using updated Lagragian SPH.
  * @author Shuaihao Zhang, Dong Wu and Xiangyu Hu
  */
-#pragma once
 #include "sphinxsys.h"
 using namespace SPH;
 //----------------------------------------------------------------------

diff --git a/tests/3d_examples/test_3d_taylor_bar_UL/taylor_bar_UL.cpp b/tests/3d_examples/test_3d_taylor_bar_UL/taylor_bar_UL.cpp
@@ -4,9 +4,6 @@
  * @author Shuaihao Zhang, Dong Wu and Xiangyu Hu
  */
 #include "taylor_bar_UL.h"
-#include "sphinxsys.h"
-using namespace SPH;
-
 int main(int ac, char *av[])
 {
     /** Setup the system. Please the make sure the global domain bounds are correctly defined. */
@@ -49,7 +46,7 @@ int main(int ac, char *av[])
         /** Write the particle reload files. */
         ReloadParticleIO write_particle_reload_files(column);
         /** A  Physics relaxation step. */
-        RelaxationStepLevelSetCorrectionInner relaxation_step_inner(column_inner);
+        RelaxationStepInner relaxation_step_inner(column_inner);
         /**
          * @brief 	Particle relaxation starts here.
          */