From 822b76f155b03553b9d55c5995d74d1f48d243f9 Mon Sep 17 00:00:00 2001
From: maiyetum95 <108422104+maiyetum95@users.noreply.github.com>
Date: Thu, 8 Jun 2023 22:52:25 +0200
Subject: [PATCH] fix pybind bug with regression test
---
tests/2d_examples/test_2d_dambreak_python/CMakeLists.txt | 2 +-
.../test_2d_dambreak_python/pybind_tool/pybind_test.py | 2 +-
.../FluidObserver_Pressure_Run_0_result.xml | 2 +-
.../FluidObserver_Pressure_Run_10_result.xml | 9 +++++++++
.../FluidObserver_Pressure_Run_14_result.xml | 9 ---------
.../FluidObserver_Pressure_Run_20_result.xml | 9 +++++++++
.../FluidObserver_Pressure_Run_7_result.xml | 9 ---------
.../FluidObserver_Pressure_dtwdistance.xml | 2 +-
.../FluidObserver_Pressure_runtimes.dat | 2 +-
.../WaterBody_TotalMechanicalEnergy_Run_0_result.xml | 2 +-
.../WaterBody_TotalMechanicalEnergy_Run_10_result.xml | 9 ---------
.../WaterBody_TotalMechanicalEnergy_Run_11_result.xml | 9 +++++++++
.../WaterBody_TotalMechanicalEnergy_Run_5_result.xml | 9 ---------
.../WaterBody_TotalMechanicalEnergy_Run_6_result.xml | 9 +++++++++
.../WaterBody_TotalMechanicalEnergy_runtimes.dat | 2 +-
.../regression_test_tool/regression_test_tool.py | 4 ++--
16 files changed, 45 insertions(+), 45 deletions(-)
create mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_10_result.xml
delete mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_14_result.xml
create mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_20_result.xml
delete mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_7_result.xml
delete mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml
create mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_11_result.xml
delete mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml
create mode 100644 tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml
diff --git a/tests/2d_examples/test_2d_dambreak_python/CMakeLists.txt b/tests/2d_examples/test_2d_dambreak_python/CMakeLists.txt
index df6b94dd68..61aa92b810 100644
--- a/tests/2d_examples/test_2d_dambreak_python/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_dambreak_python/CMakeLists.txt
@@ -30,5 +30,5 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "
target_link_libraries(${PROJECT_NAME} PRIVATE sphinxsys_2d)
add_test(NAME ${PROJECT_NAME} COMMAND ${Python3_EXECUTABLE} "${EXECUTABLE_OUTPUT_PATH}/bind/pybind_test.py")
-set_tests_properties(${PROJECT_NAME} PROPERTIES WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}/bind"
+set_tests_properties(${PROJECT_NAME} PROPERTIES WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}"
PASS_REGULAR_EXPRESSION "The result of Pressure is correct based on the dynamic time warping regression test!")
diff --git a/tests/2d_examples/test_2d_dambreak_python/pybind_tool/pybind_test.py b/tests/2d_examples/test_2d_dambreak_python/pybind_tool/pybind_test.py
index 58ed131f24..c018872c83 100755
--- a/tests/2d_examples/test_2d_dambreak_python/pybind_tool/pybind_test.py
+++ b/tests/2d_examples/test_2d_dambreak_python/pybind_tool/pybind_test.py
@@ -6,7 +6,7 @@
# add dynamic link library or shared object to python env
# attention: match current python version with the version exposing the cpp code
sys_str = platform.system()
-path_1 = os.path.abspath(os.path.join(os.getcwd(), '../..'))
+path_1 = os.path.abspath(os.path.join(os.getcwd(), '..'))
if sys_str == 'Windows':
path_2 = 'lib'
elif sys_str == 'Linux':
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_0_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_0_result.xml
index fe63aab918..8c7499408f 100644
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_0_result.xml
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_0_result.xml
@@ -4,6 +4,6 @@
-
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_10_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_10_result.xml
new file mode 100644
index 0000000000..30e1e009d6
--- /dev/null
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_10_result.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_14_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_14_result.xml
deleted file mode 100644
index 26f2c5636c..0000000000
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_14_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_20_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_20_result.xml
new file mode 100644
index 0000000000..4e82ba0c88
--- /dev/null
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_20_result.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_7_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_7_result.xml
deleted file mode 100644
index 6e76b39aa6..0000000000
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_7_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_dtwdistance.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_dtwdistance.xml
index a11b3bba5e..937895ceed 100644
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_dtwdistance.xml
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_dtwdistance.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_runtimes.dat b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_runtimes.dat
index 9c41804468..fd8ad08880 100644
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_runtimes.dat
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_runtimes.dat
@@ -1,3 +1,3 @@
true
-15
+21
4
\ No newline at end of file
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
index e3eefe99ba..040faac7d7 100644
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
@@ -4,6 +4,6 @@
-
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml
deleted file mode 100644
index b9e557093d..0000000000
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_11_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_11_result.xml
new file mode 100644
index 0000000000..a4f9d99f27
--- /dev/null
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_11_result.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml
deleted file mode 100644
index 859285cd4c..0000000000
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml
new file mode 100644
index 0000000000..2b0252d34c
--- /dev/null
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
index 452899ced3..5cc2fa0e29 100644
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
@@ -1,3 +1,3 @@
true
-16
+12
4
\ No newline at end of file
diff --git a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/regression_test_tool.py b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/regression_test_tool.py
index 8f3d795957..d9087964d4 100644
--- a/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/regression_test_tool.py
+++ b/tests/2d_examples/test_2d_dambreak_python/regression_test_tool/regression_test_tool.py
@@ -7,10 +7,10 @@
from regression_test_base_tool import SphinxsysRegressionTest
"""
-case name: test_2d_dambreak
+case name: test_2d_dambreak_python
"""
-case_name = "test_2d_dambreak"
+case_name = "test_2d_dambreak_python"
body_name = "WaterBody"
parameter_name = "TotalMechanicalEnergy"
body_name_1 = "FluidObserver"