Merge pull request #330 from maiyetum95/master

fix the pybind bug with regression test

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!")

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':

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_0_result.xml

@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="23" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0" snapshot_1="0" snapshot_2="0" snapshot_3="-0.13699861895221194" snapshot_4="0.66875493329557956" snapshot_5="0.65401034435332672" snapshot_6="0.72908912886437194" snapshot_7="1.0512526053484281" snapshot_8="0.46128313271291171" snapshot_9="0.56675695120175773" snapshot_10="0.44540055554295649" snapshot_11="0.25617248411227783" snapshot_12="-0.003249001166592522" snapshot_13="0.10523038958185808" snapshot_14="0.16320432597659754" snapshot_15="0.19910375906577082" snapshot_16="0.25691923483933715" snapshot_17="0.12461394967644794" snapshot_18="0.16091860601155483" snapshot_19="0.098155969145707081" snapshot_20="0.027022011921878215" snapshot_21="0.24081043342963754" snapshot_22="0.32811805483588635" />
+        <Particle_0 snapshot_0="0" snapshot_1="0" snapshot_2="0" snapshot_3="0.26824761949884235" snapshot_4="0.4730243946282956" snapshot_5="0.74587925241894071" snapshot_6="0.72242583246899739" snapshot_7="1.0870796359291397" snapshot_8="0.5682468472962563" snapshot_9="0.080383330251895799" snapshot_10="0.28951507448785041" snapshot_11="0.19503809881383863" snapshot_12="0.072247067621478339" snapshot_13="0.035605086322673521" snapshot_14="0.078924044748357097" snapshot_15="0.24978032310464621" snapshot_16="0.28252482137663387" snapshot_17="0.15952092372783219" snapshot_18="0.15307918833519168" snapshot_19="0.095080477191072876" snapshot_20="0.044194752631769751" snapshot_21="0.025363818478689421" snapshot_22="0.4551060768497584" />
     </Result_Element>
 </result>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_10_result.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="23" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="0" snapshot_1="0" snapshot_2="0" snapshot_3="0.26824761956935955" snapshot_4="0.47302439486463893" snapshot_5="0.74588067344078801" snapshot_6="0.72193405874996353" snapshot_7="1.1261790827731351" snapshot_8="0.59383508816735919" snapshot_9="0.25240999590614466" snapshot_10="0.30566895950967043" snapshot_11="0.17371303994787599" snapshot_12="0.10493709564791738" snapshot_13="0.040965428157454159" snapshot_14="0.073776302344906536" snapshot_15="0.25387079940163582" snapshot_16="0.2777096055007699" snapshot_17="0.18727559494591406" snapshot_18="0.15023074525997723" snapshot_19="0.094780833589947933" snapshot_20="0.049784791524005098" snapshot_21="0.028947481780696508" snapshot_22="0.77785682130437295" />
+    </Result_Element>
+</result>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_Run_20_result.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="23" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="0" snapshot_1="0" snapshot_2="0" snapshot_3="0.2682476195412844" snapshot_4="0.47302448444365897" snapshot_5="0.74588226196639718" snapshot_6="0.72228266702877364" snapshot_7="1.1256682005482554" snapshot_8="0.44350066049561476" snapshot_9="0.24926134935006949" snapshot_10="0.39149771463015298" snapshot_11="0.22487722496839638" snapshot_12="0.042894954501629716" snapshot_13="0.069398823961160275" snapshot_14="0.033657753591351001" snapshot_15="0.25189361494282553" snapshot_16="0.26230617619410124" snapshot_17="0.19596774244520693" snapshot_18="0.14535307307625736" snapshot_19="0.11183689814420757" snapshot_20="0.076086793367831168" snapshot_21="0.02834455916269147" snapshot_22="0.37818345401739356" />
+    </Result_Element>
+</result>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_dtwdistance.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance Pressure_0="0.6277965458399517" />
+    <DTWDistance Pressure_0="1.078460056924573" />
 </dtw_distance>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/FluidObserver_Pressure_runtimes.dat

@@ -1,3 +1,3 @@
 true
-15
+21
 4

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml

@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="23" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="1.0000000000000009" snapshot_1="0.99882097507188006" snapshot_2="0.99620692099419095" snapshot_3="0.98805033527347086" snapshot_4="0.97959664632361221" snapshot_5="0.97610840918056752" snapshot_6="0.97216847414448515" snapshot_7="0.94699885499934711" snapshot_8="0.91099290861638393" snapshot_9="0.88533736147005737" snapshot_10="0.82073370452620142" snapshot_11="0.69385179340943803" snapshot_12="0.64445000341099767" snapshot_13="0.56496210894777621" snapshot_14="0.52340562883748065" snapshot_15="0.50280033391896084" snapshot_16="0.48876920469126084" snapshot_17="0.46959608141504688" snapshot_18="0.4559816737698027" snapshot_19="0.44220654885968236" snapshot_20="0.43272946611673785" snapshot_21="0.42555193421997001" snapshot_22="0.41704138838109728" />
+        <Particle_0 snapshot_0="1.0000000000000016" snapshot_1="0.99908073979547907" snapshot_2="0.9972535745709904" snapshot_3="0.97934908582374036" snapshot_4="0.96681779377513877" snapshot_5="0.9609435530819791" snapshot_6="0.95483654608254354" snapshot_7="0.91693034033482201" snapshot_8="0.89034597029198026" snapshot_9="0.82298470556549053" snapshot_10="0.77388107898670888" snapshot_11="0.64359526718536286" snapshot_12="0.59284102898789648" snapshot_13="0.54316549181859042" snapshot_14="0.52693679182409836" snapshot_15="0.50910549193526555" snapshot_16="0.49098941767463433" snapshot_17="0.47418058373116045" snapshot_18="0.45910910872711319" snapshot_19="0.44671211083616774" snapshot_20="0.43914896846695872" snapshot_21="0.43020444713463862" snapshot_22="0.42109977970773788" />
     </Result_Element>
 </result>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_11_result.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="23" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="1.0000000000000013" snapshot_1="0.99908073979547884" snapshot_2="0.99725357457060326" snapshot_3="0.97934908582084113" snapshot_4="0.96681779390432554" snapshot_5="0.96094354739906396" snapshot_6="0.95483667401992078" snapshot_7="0.91700198965761337" snapshot_8="0.890298343167784" snapshot_9="0.82347793544468728" snapshot_10="0.77411350801162282" snapshot_11="0.64661134753812921" snapshot_12="0.59474259967521981" snapshot_13="0.54242004915481623" snapshot_14="0.52660072249066781" snapshot_15="0.51246729660496948" snapshot_16="0.4933639974490498" snapshot_17="0.47463211305291358" snapshot_18="0.46251664631840911" snapshot_19="0.45283168245170557" snapshot_20="0.44519260475260247" snapshot_21="0.43611794304528545" snapshot_22="0.42560609742829392" />
+    </Result_Element>
+</result>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="23" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="1.0000000000000013" snapshot_1="0.99908073979548129" snapshot_2="0.99725357457195196" snapshot_3="0.97934908582514835" snapshot_4="0.9668177937724618" snapshot_5="0.96094355935347275" snapshot_6="0.95483644361309716" snapshot_7="0.9168952018698473" snapshot_8="0.89045591055620532" snapshot_9="0.82226712645025335" snapshot_10="0.7740482143577585" snapshot_11="0.64372878458122351" snapshot_12="0.59197947331431133" snapshot_13="0.53896777564558884" snapshot_14="0.52361514426760103" snapshot_15="0.50585369010145087" snapshot_16="0.48669689464087029" snapshot_17="0.47110675895795073" snapshot_18="0.45475361279453147" snapshot_19="0.44335740932927675" snapshot_20="0.43355538864165893" snapshot_21="0.42704792183618945" snapshot_22="0.41940662237264842" />
+    </Result_Element>
+</result>

tests/2d_examples/test_2d_dambreak_python/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat

@@ -1,3 +1,3 @@
 true
-16
+12
 4

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"