diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml
index e51f43fee7..923308746e 100644
--- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml
+++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml
@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="22" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.08332500171934297" snapshot_1="0.083292840315775704" snapshot_2="0.083463929084656358" snapshot_3="0.083583207571209087" snapshot_4="0.083553750777365085" snapshot_5="0.083411625996977601" snapshot_6="0.083254622587673063" snapshot_7="0.083082021188958577" snapshot_8="0.08291403107269836" snapshot_9="0.082758307809029652" snapshot_10="0.082627928360969188" snapshot_11="0.082510865037175155" snapshot_12="0.082416628129264216" snapshot_13="0.082334179007728436" snapshot_14="0.082262099018560797" snapshot_15="0.082201633911728744" snapshot_16="0.082150575195897871" snapshot_17="0.082111239597143351" snapshot_18="0.082081533769316553" snapshot_19="0.082056826577132563" snapshot_20="0.082041160017858328" snapshot_21="0.082029222687153486" />
+        <Particle_0 snapshot_0="0.083325001533256088" snapshot_1="0.083294786621970679" snapshot_2="0.083564115326357255" snapshot_3="0.08368917255864905" snapshot_4="0.083722690227958918" snapshot_5="0.083717931408020321" snapshot_6="0.083682503123651719" snapshot_7="0.083602151187063323" snapshot_8="0.083508601562899937" snapshot_9="0.083429962168932836" snapshot_10="0.083342886124791127" snapshot_11="0.08327960266392101" snapshot_12="0.083220311892635568" snapshot_13="0.083171308040949771" snapshot_14="0.083130983119593119" snapshot_15="0.083099741227054991" snapshot_16="0.083070471485656952" snapshot_17="0.08304182540797557" snapshot_18="0.083021297512843539" snapshot_19="0.083004809663942081" snapshot_20="0.082988082604510197" snapshot_21="0.082972227910379059" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml
index 7a9dc8dd5f..c5acff86c7 100644
--- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml
+++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml
@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="22" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.083325001719342998" snapshot_1="0.083292840315775732" snapshot_2="0.083463929084656385" snapshot_3="0.083583207571208462" snapshot_4="0.083553750777368124" snapshot_5="0.083411625996959962" snapshot_6="0.083254622587501409" snapshot_7="0.083082021192869143" snapshot_8="0.0829140307372115" snapshot_9="0.082758257457380469" snapshot_10="0.082628482688009458" snapshot_11="0.082510815866111989" snapshot_12="0.082415760154971457" snapshot_13="0.082332701277684939" snapshot_14="0.082260430443939075" snapshot_15="0.082197998368317232" snapshot_16="0.08214930445525595" snapshot_17="0.082109415295576374" snapshot_18="0.082078081800274899" snapshot_19="0.082054404693931354" snapshot_20="0.082038967560419007" snapshot_21="0.082027364202790692" />
+        <Particle_0 snapshot_0="0.083325001533256088" snapshot_1="0.083294786621970651" snapshot_2="0.083564115326357227" snapshot_3="0.083689172558649161" snapshot_4="0.083722690227955365" snapshot_5="0.083717931408025192" snapshot_6="0.083682503123765253" snapshot_7="0.083602151187067569" snapshot_8="0.083508601565132068" snapshot_9="0.08342996222268334" snapshot_10="0.083342886090822021" snapshot_11="0.08327964285648673" snapshot_12="0.0832202327826497" snapshot_13="0.083172866054039868" snapshot_14="0.083130720643954742" snapshot_15="0.083096171712600309" snapshot_16="0.083065551891298495" snapshot_17="0.083039669749299827" snapshot_18="0.083017537692932478" snapshot_19="0.083000295003112595" snapshot_20="0.082984559495638377" snapshot_21="0.082970814224290937" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml
index 7e8dbcaf3b..4f35bcb40a 100644
--- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml
+++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml
@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="22" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.083325001719342998" snapshot_1="0.083292840315775774" snapshot_2="0.08346392908465633" snapshot_3="0.083583207571209364" snapshot_4="0.083553750777373023" snapshot_5="0.08341162599695004" snapshot_6="0.083254622587991031" snapshot_7="0.083082021183985943" snapshot_8="0.082914030879455702" snapshot_9="0.082758212080997401" snapshot_10="0.08262833434205584" snapshot_11="0.08251178762502534" snapshot_12="0.082416592735033239" snapshot_13="0.082334874635383859" snapshot_14="0.082265158845614139" snapshot_15="0.08219891377137295" snapshot_16="0.082145944437791857" snapshot_17="0.082106279868284504" snapshot_18="0.082076258737268676" snapshot_19="0.082052890366310915" snapshot_20="0.082036852489553849" snapshot_21="0.082026128714564356" />
+        <Particle_0 snapshot_0="0.083325001533256088" snapshot_1="0.083294786621970651" snapshot_2="0.083564115326357213" snapshot_3="0.083689172558649036" snapshot_4="0.083722690227954713" snapshot_5="0.083717931408026913" snapshot_6="0.083682503123784807" snapshot_7="0.083602151186726245" snapshot_8="0.083508601566086055" snapshot_9="0.08342996031684359" snapshot_10="0.083342868613011128" snapshot_11="0.083279640458419832" snapshot_12="0.083220109756188335" snapshot_13="0.083171191512504405" snapshot_14="0.083131049574928034" snapshot_15="0.08309796867059098" snapshot_16="0.083067358636916347" snapshot_17="0.083041064866735237" snapshot_18="0.083021390670215009" snapshot_19="0.083002737166153306" snapshot_20="0.082986840701579606" snapshot_21="0.082973741528403769" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml
index fbd66fc676..3d3787632a 100644
--- a/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml
+++ b/tests/2d_examples/test_2d_rotation_patch/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance TotalKineticEnergy_0="6.292e-05" />
+    <DTWDistance TotalKineticEnergy_0="0.005" />
 </dtw_distance>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
index c8f10482eb..b6f912d682 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <result>
     <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="41" />
+        <Snapshot number_of_snapshot_for_local_result_="102" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9857.1264665204617" snapshot_2="9856.8125684651277" snapshot_3="9855.4623485744305" snapshot_4="9852.9655195609685" snapshot_5="9849.4955907666699" snapshot_6="9853.8411204341264" snapshot_7="9855.7431020424792" snapshot_8="9852.9746676542054" snapshot_9="9853.4009947911891" snapshot_10="9850.8162046334837" snapshot_11="9856.9975647327083" snapshot_12="9856.6046253345157" snapshot_13="9857.8305470366249" snapshot_14="9854.9356665233336" snapshot_15="9854.3432701607271" snapshot_16="9860.6476647857926" snapshot_17="9857.2613597105355" snapshot_18="9852.9807910159652" snapshot_19="9854.0174051638569" snapshot_20="9851.8292282505354" snapshot_21="9854.5013153905566" snapshot_22="9854.2773188962383" snapshot_23="9854.2022273652183" snapshot_24="9851.6090954312931" snapshot_25="9855.6928351333136" snapshot_26="9853.7697748243609" snapshot_27="9851.6177418389088" snapshot_28="9851.891761122075" snapshot_29="9851.940056744912" snapshot_30="9854.9965113590806" snapshot_31="9849.525792112574" snapshot_32="9850.8175189713402" snapshot_33="9852.90049511303" snapshot_34="9852.9008647718019" snapshot_35="9850.9836085919924" snapshot_36="9849.6807739136257" snapshot_37="9850.0824269606128" snapshot_38="9849.0678257533036" snapshot_39="9851.4934136719494" snapshot_40="9852.1311958282458" />
+        <Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9828.8997905246997" snapshot_2="9862.5179988723685" snapshot_3="9840.7925036461093" snapshot_4="9862.1819867580925" snapshot_5="9853.1389528027066" snapshot_6="9852.0675918951001" snapshot_7="9852.433546090424" snapshot_8="9847.7487452810929" snapshot_9="9850.0789024654077" snapshot_10="9847.5887050234069" snapshot_11="9851.0449560811958" snapshot_12="9845.6001174880439" snapshot_13="9850.7533000893982" snapshot_14="9844.4479725072233" snapshot_15="9849.1394783432388" snapshot_16="9849.5207131532607" snapshot_17="9852.6879574472532" snapshot_18="9850.6656390418102" snapshot_19="9847.7143097333174" snapshot_20="9849.4034669404646" snapshot_21="9852.7900969713464" snapshot_22="9851.7400025743518" snapshot_23="9853.0688964105102" snapshot_24="9850.9956838431026" snapshot_25="9852.4360327762915" snapshot_26="9852.9732212349591" snapshot_27="9856.845869693012" snapshot_28="9852.660614958806" snapshot_29="9855.4890015262081" snapshot_30="9855.7093207147664" snapshot_31="9853.2305948369285" snapshot_32="9853.2715768211183" snapshot_33="9852.2762002387699" snapshot_34="9854.0332405817826" snapshot_35="9851.3957354719969" snapshot_36="9852.5285124512702" snapshot_37="9851.7432275521442" snapshot_38="9853.107142176028" snapshot_39="9855.4396377657649" snapshot_40="9856.1790856338848" snapshot_41="9855.6472334555983" snapshot_42="9855.3369055312232" snapshot_43="9853.8234705066225" snapshot_44="9854.5663755893838" snapshot_45="9856.6889988865005" snapshot_46="9854.6328625285532" snapshot_47="9855.1769328121172" snapshot_48="9853.4866089616626" snapshot_49="9853.6775508104784" snapshot_50="9854.8162057270711" snapshot_51="9857.2587833787475" snapshot_52="9855.387675199745" snapshot_53="9856.7966887010716" snapshot_54="9852.1774626628885" snapshot_55="9853.0449757232454" snapshot_56="9855.9752112903079" snapshot_57="9853.4564564202792" snapshot_58="9854.2401147061992" snapshot_59="9854.0429977537879" snapshot_60="9854.85512820855" snapshot_61="9852.7209961391345" snapshot_62="9854.8597948848546" snapshot_63="9855.0229404406946" snapshot_64="9856.0771094564079" snapshot_65="9855.8680544270374" snapshot_66="9855.2733246616444" snapshot_67="9855.3164114027531" snapshot_68="9856.5724514489884" snapshot_69="9855.4699901189742" snapshot_70="9857.8941861669045" snapshot_71="9852.1982870389547" snapshot_72="9856.5639668581753" snapshot_73="9855.6343315172453" snapshot_74="9855.2812961257405" snapshot_75="9855.8426062812741" snapshot_76="9856.1850872894447" snapshot_77="9854.6603248731863" snapshot_78="9856.933256591823" snapshot_79="9856.0894863442336" snapshot_80="9859.4470530862163" snapshot_81="9855.1993195417908" snapshot_82="9853.9797512540936" snapshot_83="9854.6020387077697" snapshot_84="9854.7262741568447" snapshot_85="9856.0166502193679" snapshot_86="9857.1786820471789" snapshot_87="9857.4903420515766" snapshot_88="9859.3382328846201" snapshot_89="9857.2928559855136" snapshot_90="9854.5132990763341" snapshot_91="9859.1692309447717" snapshot_92="9857.3448367682086" snapshot_93="9855.5492009887239" snapshot_94="9854.9818261717046" snapshot_95="9854.1457151838295" snapshot_96="9853.8257534962286" snapshot_97="9856.9609096189197" snapshot_98="9855.8643688386837" snapshot_99="9855.4842658789094" snapshot_100="9857.2175359565626" snapshot_101="9855.2181441207249" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml
deleted file mode 100644
index f9c6e7d944..0000000000
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_10_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<result>
-    <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="41" />
-    </Snapshot_Element>
-    <Result_Element>
-        <Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9857.1264686669019" snapshot_2="9856.8046405287496" snapshot_3="9855.8483696512994" snapshot_4="9852.1708278831902" snapshot_5="9852.1416257776873" snapshot_6="9851.0310636524555" snapshot_7="9854.3634996606434" snapshot_8="9854.6793393915941" snapshot_9="9855.6910714380501" snapshot_10="9852.8451862951806" snapshot_11="9856.2766451748284" snapshot_12="9853.605897993275" snapshot_13="9857.8566616232602" snapshot_14="9854.2721747003525" snapshot_15="9851.9188080974109" snapshot_16="9857.3262863574964" snapshot_17="9857.0571508445355" snapshot_18="9855.1407899789629" snapshot_19="9852.32395440849" snapshot_20="9855.9439135668763" snapshot_21="9852.8922246864822" snapshot_22="9852.9395382037583" snapshot_23="9850.2235885643604" snapshot_24="9850.0562934354184" snapshot_25="9854.7383777489267" snapshot_26="9852.1903661706965" snapshot_27="9850.9662276495983" snapshot_28="9851.6644326204696" snapshot_29="9850.25104838691" snapshot_30="9851.2737519189577" snapshot_31="9851.5082700706516" snapshot_32="9850.7042239852017" snapshot_33="9847.2422058827524" snapshot_34="9851.4481246779214" snapshot_35="9851.274775291844" snapshot_36="9847.2463428567025" snapshot_37="9847.0484611351476" snapshot_38="9846.2886890390291" snapshot_39="9849.0189454501215" snapshot_40="9847.9916684803902" />
-    </Result_Element>
-</result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml
new file mode 100644
index 0000000000..da1a5a746c
--- /dev/null
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="102" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9828.8997905246979" snapshot_2="9862.5179988723685" snapshot_3="9840.7925036461238" snapshot_4="9862.1819867580434" snapshot_5="9853.1389528028285" snapshot_6="9852.0675918942143" snapshot_7="9852.4335460866787" snapshot_8="9847.748745304445" snapshot_9="9850.0789052651162" snapshot_10="9847.5894438112846" snapshot_11="9851.040340869833" snapshot_12="9845.6087743796888" snapshot_13="9850.7932524862081" snapshot_14="9844.7556659748097" snapshot_15="9849.0394025425667" snapshot_16="9850.0763074843198" snapshot_17="9852.5003246927499" snapshot_18="9850.451829028616" snapshot_19="9850.3527993938915" snapshot_20="9850.2987316105246" snapshot_21="9851.5727296134319" snapshot_22="9853.6293290909962" snapshot_23="9853.5897875910468" snapshot_24="9850.8703415713426" snapshot_25="9852.3969250466034" snapshot_26="9851.703660769741" snapshot_27="9852.9021778067909" snapshot_28="9855.9979757585133" snapshot_29="9853.6974714166699" snapshot_30="9852.3076773523644" snapshot_31="9852.0975812121433" snapshot_32="9853.5504630622454" snapshot_33="9852.6026468718101" snapshot_34="9854.8479192754457" snapshot_35="9851.1293136409113" snapshot_36="9853.7768125920375" snapshot_37="9850.4440329034551" snapshot_38="9855.180451737433" snapshot_39="9856.6109625778481" snapshot_40="9858.4752139494558" snapshot_41="9855.4524851732185" snapshot_42="9855.0073297310228" snapshot_43="9854.0889103650625" snapshot_44="9854.9571416244253" snapshot_45="9854.075376394776" snapshot_46="9854.6389344908675" snapshot_47="9856.1072650576207" snapshot_48="9851.8266214168216" snapshot_49="9854.3894602366054" snapshot_50="9855.8564678346156" snapshot_51="9854.7103784122119" snapshot_52="9857.7697353963995" snapshot_53="9855.532088849297" snapshot_54="9853.3881577582833" snapshot_55="9857.0605679448272" snapshot_56="9854.9558934810884" snapshot_57="9853.9200919362811" snapshot_58="9852.577453673608" snapshot_59="9853.1841928391586" snapshot_60="9854.5449751542037" snapshot_61="9853.1187096693793" snapshot_62="9857.7460801049292" snapshot_63="9855.8707840408551" snapshot_64="9855.8676308690374" snapshot_65="9853.674429344961" snapshot_66="9856.5459096957147" snapshot_67="9855.5917687395631" snapshot_68="9855.0703362008062" snapshot_69="9855.3454574725365" snapshot_70="9855.131519069666" snapshot_71="9854.7283482249732" snapshot_72="9853.9678554609873" snapshot_73="9854.6551267758696" snapshot_74="9854.8220805641067" snapshot_75="9858.6747314740605" snapshot_76="9858.6389017357942" snapshot_77="9854.1263029875881" snapshot_78="9856.4738468640608" snapshot_79="9856.159554810245" snapshot_80="9853.9713960820718" snapshot_81="9853.2323378452584" snapshot_82="9854.5389167363046" snapshot_83="9850.9974913181268" snapshot_84="9853.0603548953331" snapshot_85="9853.5958392741668" snapshot_86="9856.7378084765332" snapshot_87="9857.4022664167624" snapshot_88="9857.5287940287053" snapshot_89="9855.61820929225" snapshot_90="9853.5401645419952" snapshot_91="9858.2264928470304" snapshot_92="9855.6650492149347" snapshot_93="9856.0847445541949" snapshot_94="9856.6923092204906" snapshot_95="9852.6222513224748" snapshot_96="9858.4213795132382" snapshot_97="9858.0283412679892" snapshot_98="9856.8098784988342" snapshot_99="9857.0182124901621" snapshot_100="9855.3067614137617" snapshot_101="9854.8165601482451" />
+    </Result_Element>
+</result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml
deleted file mode 100644
index 313749faf9..0000000000
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_5_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<result>
-    <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="41" />
-    </Snapshot_Element>
-    <Result_Element>
-        <Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9857.1264664511946" snapshot_2="9856.8119002330641" snapshot_3="9855.3924560594769" snapshot_4="9852.9284668460823" snapshot_5="9849.1146694377494" snapshot_6="9852.3939719483678" snapshot_7="9855.9175430305768" snapshot_8="9853.2114046561146" snapshot_9="9853.4552548767897" snapshot_10="9852.7788522523551" snapshot_11="9855.9182021550187" snapshot_12="9855.7687925718856" snapshot_13="9855.0014436894871" snapshot_14="9852.186037671856" snapshot_15="9852.2689460605379" snapshot_16="9857.5615457206532" snapshot_17="9854.181982977123" snapshot_18="9851.8146958613997" snapshot_19="9850.2913503999062" snapshot_20="9854.9345103926134" snapshot_21="9854.9195406551225" snapshot_22="9853.7952143715775" snapshot_23="9852.3546526495156" snapshot_24="9852.4158933180588" snapshot_25="9852.7468147664949" snapshot_26="9852.1779262269556" snapshot_27="9849.3728928806268" snapshot_28="9849.7786883650951" snapshot_29="9849.2877458195326" snapshot_30="9854.2906854277026" snapshot_31="9850.9661315551421" snapshot_32="9849.6325158510426" snapshot_33="9846.9371307429319" snapshot_34="9848.9281881210482" snapshot_35="9850.7670679901275" snapshot_36="9851.0083769889061" snapshot_37="9847.5909341633851" snapshot_38="9846.56238965179" snapshot_39="9846.9686859622343" snapshot_40="9845.5958486633936" />
-    </Result_Element>
-</result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml
new file mode 100644
index 0000000000..7a92c88b84
--- /dev/null
+++ b/tests/2d_examples/test_2d_standing_wave/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_="102" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9828.8997905246979" snapshot_2="9862.5179988723648" snapshot_3="9840.7925036461202" snapshot_4="9862.1819867581144" snapshot_5="9853.1389528025411" snapshot_6="9852.0675918949873" snapshot_7="9852.4335460932307" snapshot_8="9847.7487451707821" snapshot_9="9850.0789297589472" snapshot_10="9847.7029515477006" snapshot_11="9851.5910538218213" snapshot_12="9845.3829885840896" snapshot_13="9851.4789911276093" snapshot_14="9844.4647615990216" snapshot_15="9849.6116621629262" snapshot_16="9848.0591723389807" snapshot_17="9853.6562056066796" snapshot_18="9849.9771345781446" snapshot_19="9850.1125965498613" snapshot_20="9849.925718323535" snapshot_21="9852.2915309050022" snapshot_22="9854.2085777586944" snapshot_23="9851.3318390573149" snapshot_24="9851.9980845192658" snapshot_25="9852.9718276363383" snapshot_26="9851.0204337196737" snapshot_27="9855.0156052594284" snapshot_28="9854.7704201501838" snapshot_29="9857.4202359060619" snapshot_30="9854.1139132084936" snapshot_31="9853.5341016729435" snapshot_32="9851.3495205003419" snapshot_33="9852.5332757803335" snapshot_34="9854.4279389080148" snapshot_35="9852.5166109888596" snapshot_36="9854.8792010715351" snapshot_37="9850.9824581484663" snapshot_38="9855.8965288527143" snapshot_39="9855.3489350971977" snapshot_40="9857.1102798930151" snapshot_41="9857.7093606873277" snapshot_42="9855.6708620105601" snapshot_43="9853.8234341695897" snapshot_44="9858.2454564796772" snapshot_45="9855.129958455811" snapshot_46="9852.5852050458398" snapshot_47="9853.7933881650479" snapshot_48="9853.5151491140496" snapshot_49="9852.4085591552721" snapshot_50="9855.5635270847524" snapshot_51="9856.0865608656914" snapshot_52="9859.1701705130472" snapshot_53="9856.4059848820762" snapshot_54="9856.4247909783699" snapshot_55="9855.0156436174348" snapshot_56="9852.7263918362496" snapshot_57="9856.3122459666101" snapshot_58="9853.1480905809967" snapshot_59="9853.0680471801861" snapshot_60="9851.0497793558097" snapshot_61="9853.6537143919377" snapshot_62="9855.1640737626603" snapshot_63="9856.3176545735005" snapshot_64="9856.9512156523815" snapshot_65="9853.8708099957475" snapshot_66="9855.7218555001164" snapshot_67="9854.2075108788049" snapshot_68="9857.7731744774883" snapshot_69="9853.5590999027791" snapshot_70="9857.9034798988996" snapshot_71="9854.1010733090861" snapshot_72="9855.1137347333479" snapshot_73="9854.5518270876273" snapshot_74="9858.3024041102581" snapshot_75="9854.5295997047251" snapshot_76="9858.4817532345896" snapshot_77="9854.9737750572531" snapshot_78="9858.4210991712571" snapshot_79="9853.5649701706097" snapshot_80="9857.2396958269965" snapshot_81="9855.8471411214687" snapshot_82="9854.4984617206683" snapshot_83="9855.3325191225831" snapshot_84="9854.2873700684886" snapshot_85="9856.2752664762993" snapshot_86="9858.9557925388217" snapshot_87="9859.01478791105" snapshot_88="9857.7592196335227" snapshot_89="9857.1195573180557" snapshot_90="9856.9927002538097" snapshot_91="9858.972795591224" snapshot_92="9857.9996250628028" snapshot_93="9856.3427362436687" snapshot_94="9855.854211255375" snapshot_95="9855.2957926045765" snapshot_96="9857.9976300116086" snapshot_97="9857.7723226046292" snapshot_98="9861.3574314921152" snapshot_99="9858.0564437743633" snapshot_100="9858.8893756943562" snapshot_101="9856.312978323218" />
+    </Result_Element>
+</result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml
index 477a241944..5088bd56b4 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance TotalMechanicalEnergy_0="20.994990397866786" />
+    <DTWDistance TotalMechanicalEnergy_0="10.501987640196603" />
 </dtw_distance>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
index b33a499cce..19c6fe5aad 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
@@ -1,3 +1,3 @@
 true
-11
+13
 4
\ No newline at end of file
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml
index d624cd41ac..556b7b7971 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_0_result.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <result>
     <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="41" />
+        <Snapshot number_of_snapshot_for_local_result_="102" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.89000000000000001" snapshot_1="0.98252836686445144" snapshot_2="1.1080295220983891" snapshot_3="1.0529382693332139" snapshot_4="0.94567507864038614" snapshot_5="0.92144252755504408" snapshot_6="1.0083357412791778" snapshot_7="1.101034795449122" snapshot_8="1.0302989767750632" snapshot_9="0.91577389328861769" snapshot_10="0.93233354390491618" snapshot_11="1.0743911975678222" snapshot_12="1.0982633447673689" snapshot_13="0.96508336614439727" snapshot_14="0.91354711889890827" snapshot_15="0.98045306871930693" snapshot_16="1.0830674359448011" snapshot_17="1.0490231488811903" snapshot_18="0.94211680658968022" snapshot_19="0.91477866033580835" snapshot_20="1.0205983721481633" snapshot_21="1.1129335557579956" snapshot_22="1.0045510647202835" snapshot_23="0.91401161531874564" snapshot_24="0.94876121310646577" snapshot_25="1.0581456652353491" snapshot_26="1.0676342088726041" snapshot_27="0.96717923683783036" snapshot_28="0.91699297625194165" snapshot_29="0.97556206446887039" snapshot_30="1.0867303563058466" snapshot_31="1.0414172882948423" snapshot_32="0.93250120868514452" snapshot_33="0.92529094176023552" snapshot_34="1.0307114789146463" snapshot_35="1.0842020549673141" snapshot_36="0.99798765455669314" snapshot_37="0.92402455389287774" snapshot_38="0.95715103680280256" snapshot_39="1.0562803669725205" snapshot_40="1.0614681466574025" />
+        <Particle_0 snapshot_0="0.89000000000000001" snapshot_1="0.91111186882182638" snapshot_2="0.95304754263215774" snapshot_3="1.0157052215704592" snapshot_4="1.0743177502661763" snapshot_5="1.1134464643557425" snapshot_6="1.107071711373395" snapshot_7="1.0699862169703911" snapshot_8="1.0240455371814279" snapshot_9="0.97334364429944964" snapshot_10="0.93754624930821617" snapshot_11="0.91478880273594965" snapshot_12="0.91471228062420384" snapshot_13="0.93191101889564776" snapshot_14="0.96535015849372874" snapshot_15="1.0090426031430884" snapshot_16="1.05715098803373" snapshot_17="1.0914278459218092" snapshot_18="1.0998106951207027" snapshot_19="1.0731340891315511" snapshot_20="1.023963354369535" snapshot_21="0.97031805197783116" snapshot_22="0.92911063348815626" snapshot_23="0.90576594933392396" snapshot_24="0.90597196887752285" snapshot_25="0.93178876174406844" snapshot_26="0.98027456725712181" snapshot_27="1.0463239604560064" snapshot_28="1.1052320445616013" snapshot_29="1.1305970087656561" snapshot_30="1.1034416325363421" snapshot_31="1.0433140269290797" snapshot_32="0.98445490946399461" snapshot_33="0.93704131260279411" snapshot_34="0.91282170779355176" snapshot_35="0.9154389176568215" snapshot_36="0.9308318007085512" snapshot_37="0.9614972158507703" snapshot_38="1.0050452614622145" snapshot_39="1.0482045053892943" snapshot_40="1.080239906239489" snapshot_41="1.0887391520126797" snapshot_42="1.0711039270163545" snapshot_43="1.0322178168801188" snapshot_44="0.98187486142066005" snapshot_45="0.94117945382710411" snapshot_46="0.9128240248812306" snapshot_47="0.90673812366145967" snapshot_48="0.92906735679194818" snapshot_49="0.9646482313769037" snapshot_50="1.0167502956568601" snapshot_51="1.077649332880241" snapshot_52="1.1146602122509701" snapshot_53="1.1124001689408474" snapshot_54="1.0674775365088316" snapshot_55="1.0022676373119455" snapshot_56="0.95533996423232759" snapshot_57="0.91715508345236374" snapshot_58="0.90667264408729742" snapshot_59="0.91755251094305956" snapshot_60="0.95255927812587426" snapshot_61="0.99602788364373795" snapshot_62="1.0468113002359509" snapshot_63="1.0843811267664356" snapshot_64="1.0903075484076734" snapshot_65="1.0692954635026979" snapshot_66="1.0318411467884314" snapshot_67="0.98509500153123852" snapshot_68="0.94987690192976326" snapshot_69="0.92616604056762741" snapshot_70="0.9148145324900534" snapshot_71="0.92566898645359752" snapshot_72="0.95542407924248951" snapshot_73="1.0010840734388373" snapshot_74="1.0525613570485195" snapshot_75="1.0977215267915512" snapshot_76="1.1107095304098189" snapshot_77="1.0797190679060442" snapshot_78="1.0242513801278557" snapshot_79="0.97003897310774501" snapshot_80="0.92860100549528246" snapshot_81="0.90911153037150438" snapshot_82="0.913060753201827" snapshot_83="0.93716409775984899" snapshot_84="0.98315603950218389" snapshot_85="1.03659206004028" snapshot_86="1.0774659612119502" snapshot_87="1.1005178221756435" snapshot_88="1.0846578284749684" snapshot_89="1.0431218467674417" snapshot_90="0.99495882260002377" snapshot_91="0.95084587997783609" snapshot_92="0.92431093493690086" snapshot_93="0.91945911668487779" snapshot_94="0.92859106749685072" snapshot_95="0.95095442515028539" snapshot_96="0.99206334423764497" snapshot_97="1.0391733865342307" snapshot_98="1.0775531947358004" snapshot_99="1.0942528170777117" snapshot_100="1.0779329063637648" snapshot_101="1.0364913166866963" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml
index b39ff06db8..7b55b02b46 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_11_result.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <result>
     <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="41" />
+        <Snapshot number_of_snapshot_for_local_result_="102" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.89000000000000001" snapshot_1="0.98252836564939272" snapshot_2="1.1072183850437944" snapshot_3="1.0587665781858029" snapshot_4="0.9427754903322132" snapshot_5="0.92217376616034796" snapshot_6="1.0077499649722643" snapshot_7="1.1039773967422095" snapshot_8="1.0248838740480328" snapshot_9="0.91705433921160251" snapshot_10="0.93555614803557652" snapshot_11="1.075711015888172" snapshot_12="1.0985212314707524" snapshot_13="0.96934038927481214" snapshot_14="0.91150153558108327" snapshot_15="0.98055442070543686" snapshot_16="1.0782098856570228" snapshot_17="1.0495892406448728" snapshot_18="0.94161508990003562" snapshot_19="0.91519558825756475" snapshot_20="1.022973876245638" snapshot_21="1.108259228817877" snapshot_22="1.0092909248403878" snapshot_23="0.91706461268520134" snapshot_24="0.95073118326289319" snapshot_25="1.0645300652617682" snapshot_26="1.0652989361359582" snapshot_27="0.96503924367906246" snapshot_28="0.91633908309694978" snapshot_29="0.97570618747282933" snapshot_30="1.0828020684843329" snapshot_31="1.0433061462549693" snapshot_32="0.93455413500926443" snapshot_33="0.93280907561454685" snapshot_34="1.0311444899787119" snapshot_35="1.0822881667716393" snapshot_36="0.99365048630970443" snapshot_37="0.92656194807139436" snapshot_38="0.95190217830317037" snapshot_39="1.0506735373572222" snapshot_40="1.0650809604118952" />
+        <Particle_0 snapshot_0="0.89000000000000001" snapshot_1="0.91111186882182627" snapshot_2="0.95304754263215652" snapshot_3="1.0157052215704647" snapshot_4="1.0743177502661316" snapshot_5="1.1134464643558069" snapshot_6="1.1070717113731536" snapshot_7="1.0699862169589953" snapshot_8="1.0240455368116641" snapshot_9="0.97334366366131486" snapshot_10="0.93753987735716249" snapshot_11="0.91479467450824925" snapshot_12="0.91462885171373776" snapshot_13="0.93190766020286109" snapshot_14="0.96520644038104686" snapshot_15="1.0094314810889735" snapshot_16="1.0569200303580355" snapshot_17="1.0907309609876603" snapshot_18="1.0984240494817397" snapshot_19="1.0721868219452668" snapshot_20="1.0227858438284128" snapshot_21="0.96873830644517744" snapshot_22="0.92666826399506785" snapshot_23="0.90511587641227609" snapshot_24="0.90320069148139437" snapshot_25="0.9293822292789492" snapshot_26="0.97865421864486724" snapshot_27="1.0444799562671587" snapshot_28="1.1075903991081391" snapshot_29="1.1298608442478324" snapshot_30="1.0991469453335245" snapshot_31="1.0437696979804163" snapshot_32="0.98391610478467506" snapshot_33="0.93567601845034032" snapshot_34="0.91482042794789342" snapshot_35="0.91227372571464771" snapshot_36="0.93010401399124043" snapshot_37="0.96276656361194823" snapshot_38="1.0059868476184102" snapshot_39="1.0472349359319664" snapshot_40="1.0808823411906137" snapshot_41="1.0919509100016147" snapshot_42="1.0710217033053024" snapshot_43="1.0286340482704162" snapshot_44="0.98135059140841097" snapshot_45="0.93916725593970962" snapshot_46="0.91568460269513086" snapshot_47="0.9115753741906919" snapshot_48="0.92330101239191265" snapshot_49="0.96361162453074878" snapshot_50="1.0169792991751054" snapshot_51="1.0767888898522939" snapshot_52="1.1129574768324761" snapshot_53="1.1095141989976944" snapshot_54="1.0635706933089084" snapshot_55="1.0024418465911855" snapshot_56="0.95367149713272004" snapshot_57="0.92235992987311477" snapshot_58="0.90640667884931936" snapshot_59="0.91686507985297394" snapshot_60="0.95127707690238683" snapshot_61="0.99991528730426493" snapshot_62="1.0460839349218445" snapshot_63="1.0817896053318816" snapshot_64="1.0909816832194512" snapshot_65="1.0708738368479289" snapshot_66="1.0329675548902426" snapshot_67="0.9870748544145338" snapshot_68="0.94929966005773792" snapshot_69="0.92638853328074666" snapshot_70="0.91511306872719922" snapshot_71="0.92582322559683261" snapshot_72="0.95310250459706913" snapshot_73="1.0024324627803562" snapshot_74="1.054592434192162" snapshot_75="1.1008883409268371" snapshot_76="1.1069984652948932" snapshot_77="1.0772236036918683" snapshot_78="1.0219272920468399" snapshot_79="0.96752386840571958" snapshot_80="0.92693210168957574" snapshot_81="0.90767519842208577" snapshot_82="0.91168538851035996" snapshot_83="0.93869030909131268" snapshot_84="0.98346450888887915" snapshot_85="1.0351728153423019" snapshot_86="1.0824256098596652" snapshot_87="1.1002278170813227" snapshot_88="1.0841806334315292" snapshot_89="1.0419555081962868" snapshot_90="0.99463260432256173" snapshot_91="0.95324066971107557" snapshot_92="0.9271124636654664" snapshot_93="0.9191991013553501" snapshot_94="0.92592143838554364" snapshot_95="0.95650306695714782" snapshot_96="0.99352986664198661" snapshot_97="1.0416534774638648" snapshot_98="1.0818361300473485" snapshot_99="1.0981088522013958" snapshot_100="1.0806578432940133" snapshot_101="1.0347444589831454" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml
new file mode 100644
index 0000000000..0ec8bfefb2
--- /dev/null
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_22_result.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="102" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="0.89000000000000001" snapshot_1="0.91111186882182649" snapshot_2="0.95304754263215985" snapshot_3="1.0157052215704625" snapshot_4="1.0743177502661649" snapshot_5="1.1134464643557482" snapshot_6="1.1070717113728754" snapshot_7="1.069986216967598" snapshot_8="1.0240455370301846" snapshot_9="0.97334365469554407" snapshot_10="0.93754403769356076" snapshot_11="0.91478514356956753" snapshot_12="0.91467889088336973" snapshot_13="0.93190564878357796" snapshot_14="0.96515200861324923" snapshot_15="1.009221980597329" snapshot_16="1.0568085012645776" snapshot_17="1.0919178369796729" snapshot_18="1.0993464267891353" snapshot_19="1.0729933666228979" snapshot_20="1.0243466290827559" snapshot_21="0.96811007071285882" snapshot_22="0.92501490484301885" snapshot_23="0.90567275037374406" snapshot_24="0.90614006164530558" snapshot_25="0.93428917089149566" snapshot_26="0.97980883259870688" snapshot_27="1.0456508144266969" snapshot_28="1.1067921560133198" snapshot_29="1.1243719150754528" snapshot_30="1.1024140227061243" snapshot_31="1.046129589512254" snapshot_32="0.98234756776370591" snapshot_33="0.94013005648760262" snapshot_34="0.91845616238859906" snapshot_35="0.91133639573838177" snapshot_36="0.93065538835765604" snapshot_37="0.96408325673966966" snapshot_38="1.0044576367273357" snapshot_39="1.0467406197120019" snapshot_40="1.0811421528163045" snapshot_41="1.0895282489219174" snapshot_42="1.0734388602988114" snapshot_43="1.0311585754521135" snapshot_44="0.98045634162017725" snapshot_45="0.94036092974265018" snapshot_46="0.91184703447041837" snapshot_47="0.9073099189660091" snapshot_48="0.92430075719468863" snapshot_49="0.965628401884846" snapshot_50="1.0184573311911764" snapshot_51="1.0749170856261272" snapshot_52="1.115974872105105" snapshot_53="1.1097216378236263" snapshot_54="1.0654440426865914" snapshot_55="1.0060606297045958" snapshot_56="0.95390556441646213" snapshot_57="0.91750598784963233" snapshot_58="0.90708646542040039" snapshot_59="0.91964153676244265" snapshot_60="0.95005658318622377" snapshot_61="0.99802862752173715" snapshot_62="1.0464889512914932" snapshot_63="1.0841548185208352" snapshot_64="1.0915102172243614" snapshot_65="1.0711584106249359" snapshot_66="1.0323877662061409" snapshot_67="0.9871189672456866" snapshot_68="0.9475597332619522" snapshot_69="0.92522564604422719" snapshot_70="0.91806754502781052" snapshot_71="0.92746821323936013" snapshot_72="0.95378897909689131" snapshot_73="0.99916316526859639" snapshot_74="1.0540899410338525" snapshot_75="1.0958668859617644" snapshot_76="1.1076729441643847" snapshot_77="1.0789071233234573" snapshot_78="1.0259322226724885" snapshot_79="0.9670585722645374" snapshot_80="0.93117600034066383" snapshot_81="0.90735604808193093" snapshot_82="0.9115937435901923" snapshot_83="0.9391846702383011" snapshot_84="0.98352970820409436" snapshot_85="1.0380602103353342" snapshot_86="1.0844025470547403" snapshot_87="1.0995662067384853" snapshot_88="1.085745887437588" snapshot_89="1.0414164941424082" snapshot_90="0.99396068176922037" snapshot_91="0.95353571707713525" snapshot_92="0.92754148837737105" snapshot_93="0.9171276532786059" snapshot_94="0.9267037884683168" snapshot_95="0.95083994574610731" snapshot_96="0.98990346884757696" snapshot_97="1.0386623217410562" snapshot_98="1.0779710838710754" snapshot_99="1.095842301680571" snapshot_100="1.0773208946459925" snapshot_101="1.0358724837124262" />
+    </Result_Element>
+</result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml
deleted file mode 100644
index a0ad638dea..0000000000
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_Run_5_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<result>
-    <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="41" />
-    </Snapshot_Element>
-    <Result_Element>
-        <Particle_0 snapshot_0="0.89000000000000001" snapshot_1="0.98252836685036371" snapshot_2="1.1080387278516091" snapshot_3="1.0532507889398373" snapshot_4="0.94303953286054243" snapshot_5="0.91960236131058004" snapshot_6="1.0103552737594732" snapshot_7="1.0993483905723453" snapshot_8="1.0246418970026494" snapshot_9="0.91601869026994742" snapshot_10="0.93366345361856196" snapshot_11="1.0750881477170551" snapshot_12="1.0950292389563729" snapshot_13="0.96272726539511466" snapshot_14="0.91036603504470692" snapshot_15="0.97930660923587032" snapshot_16="1.0772511378301659" snapshot_17="1.0511349517415485" snapshot_18="0.94041551291103798" snapshot_19="0.91465160638039378" snapshot_20="1.0187391846525999" snapshot_21="1.1083277361374779" snapshot_22="1.0107561897562969" snapshot_23="0.91312494709705661" snapshot_24="0.94835494125660647" snapshot_25="1.0589976334232163" snapshot_26="1.0687631346979738" snapshot_27="0.96726772273641271" snapshot_28="0.92404565045482512" snapshot_29="0.9773194227698917" snapshot_30="1.0798910300417064" snapshot_31="1.0450754675439102" snapshot_32="0.93964377083211736" snapshot_33="0.928400178489591" snapshot_34="1.0293758396117172" snapshot_35="1.082751804348278" snapshot_36="0.99261767382030752" snapshot_37="0.92514600004058523" snapshot_38="0.95306236960550539" snapshot_39="1.0539990055844184" snapshot_40="1.058789055700095" />
-    </Result_Element>
-</result>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml
index 6a3bd9af94..1e75241590 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_dtwdistance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance FreeSurfaceHeight_0="0.1484505959358231" />
+    <DTWDistance FreeSurfaceHeight_0="0.12850949294493497" />
 </dtw_distance>
diff --git a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat
index 5cc2fa0e29..5be9660a9d 100644
--- a/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat
+++ b/tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight_runtimes.dat
@@ -1,3 +1,3 @@
 true
-12
+23
 4
\ No newline at end of file
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp
index 57b9f7d19b..1986476132 100644
--- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp
+++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/mixed_poiseuille_flow.cpp
@@ -146,7 +146,6 @@ int main(int ac, char *av[])
     //	Build up an SPHSystem and IO environment.
     //----------------------------------------------------------------------
     SPHSystem sph_system(system_domain_bounds, resolution_ref);
-    sph_system.setGenerateRegressionData(false);
     sph_system.handleCommandlineOptions(ac, av)->setIOEnvironment();
     //----------------------------------------------------------------------
     //	Creating bodies with corresponding materials and particles.
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml
new file mode 100644
index 0000000000..3df98e7925
--- /dev/null
+++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_0_result.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="36" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="~[0,0]" snapshot_1="~[0.01233,2.11814e-06]" snapshot_2="~[0.00998716,-3.3971e-06]" snapshot_3="~[0.0121773,-4.59414e-17]" snapshot_4="~[0.0121067,-3.8334e-07]" snapshot_5="~[0.010742,-4.15406e-06]" snapshot_6="~[0.0120644,2.88911e-06]" snapshot_7="~[0.012172,3.88839e-06]" snapshot_8="~[0.0121281,-1.00097e-07]" snapshot_9="~[0.0120608,-6.69826e-07]" snapshot_10="~[0.0121541,1.60126e-07]" snapshot_11="~[0.0120976,2.10713e-07]" snapshot_12="~[0.0120001,-5.30473e-06]" snapshot_13="~[0.0121461,-8.17647e-06]" snapshot_14="~[0.0119636,1.18673e-06]" snapshot_15="~[0.0120696,4.19944e-07]" snapshot_16="~[0.00930297,5.37463e-06]" snapshot_17="~[0.011934,7.21514e-07]" snapshot_18="~[0.0121951,-1.59523e-06]" snapshot_19="~[0.0118851,7.34694e-06]" snapshot_20="~[0.0121539,7.68649e-07]" snapshot_21="~[0.0120484,-1.76004e-06]" snapshot_22="~[0.0119752,-1.12457e-05]" snapshot_23="~[0.0120718,1.37937e-05]" snapshot_24="~[0.0118479,4.57779e-06]" snapshot_25="~[0.012134,1.10572e-06]" snapshot_26="~[0.0121283,-4.3082e-06]" snapshot_27="~[0.0121518,6.11264e-06]" snapshot_28="~[0.0118768,-7.60152e-06]" snapshot_29="~[0.0120552,5.81959e-07]" snapshot_30="~[0.0119067,-3.84383e-06]" snapshot_31="~[0.012054,-3.61493e-06]" snapshot_32="~[0.0103427,6.04782e-06]" snapshot_33="~[0.0118703,-1.75233e-06]" snapshot_34="~[0.0117815,7.52609e-06]" snapshot_35="~[0.011635,8.98834e-06]" />
+    </Result_Element>
+</result>
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml
deleted file mode 100644
index 46f4875cea..0000000000
--- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_1_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<result>
-    <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="36" />
-    </Snapshot_Element>
-    <Result_Element>
-        <Particle_0 snapshot_0="~[0,0]" snapshot_1="~[0.0123284,-5.33007e-07]" snapshot_2="~[0.0117576,1.3115e-05]" snapshot_3="~[0.0122254,-2.49849e-07]" snapshot_4="~[0.0118886,3.44709e-06]" snapshot_5="~[0.0121801,5.72264e-08]" snapshot_6="~[0.0121851,5.99453e-07]" snapshot_7="~[0.0122088,-4.93894e-08]" snapshot_8="~[0.0122104,3.9518e-08]" snapshot_9="~[0.0122106,9.61436e-09]" snapshot_10="~[0.01225,-6.28773e-09]" snapshot_11="~[0.0121292,-2.92667e-08]" snapshot_12="~[0.0122234,-1.56719e-06]" snapshot_13="~[0.0122362,-2.02432e-06]" snapshot_14="~[0.0121922,-1.0288e-07]" snapshot_15="~[0.0119733,1.29155e-05]" snapshot_16="~[0.0115242,-1.21559e-05]" snapshot_17="~[0.0122134,-1.70477e-10]" snapshot_18="~[0.0121573,-1.5231e-06]" snapshot_19="~[0.0121867,1.52978e-06]" snapshot_20="~[0.0121203,-7.38367e-08]" snapshot_21="~[0.0122011,-1.46229e-07]" snapshot_22="~[0.0121825,1.15987e-05]" snapshot_23="~[0.0120998,1.052e-06]" snapshot_24="~[0.0121552,-1.3212e-07]" snapshot_25="~[0.0122748,-5.60238e-09]" snapshot_26="~[0.0121261,3.82014e-06]" snapshot_27="~[0.0122393,-9.2548e-06]" snapshot_28="~[0.0120776,1.95153e-05]" snapshot_29="~[0.0121695,-1.47354e-06]" snapshot_30="~[0.0120675,-1.74232e-05]" snapshot_31="~[0.0118556,4.07623e-06]" snapshot_32="~[0.0121396,9.38545e-06]" snapshot_33="~[0.0121992,-6.39731e-07]" snapshot_34="~[0.0120913,2.04365e-06]" snapshot_35="~[0.0120925,-2.02467e-07]" />
-    </Result_Element>
-</result>
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml
index 483543204d..c579e1c11b 100644
--- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml
+++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_3_result.xml
@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="36" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="~[0,0]" snapshot_1="~[0.0123954,-6.07447e-07]" snapshot_2="~[0.0118066,1.15727e-05]" snapshot_3="~[0.0119912,-4.83019e-10]" snapshot_4="~[0.0121088,-7.41053e-08]" snapshot_5="~[0.0122453,-5.10958e-06]" snapshot_6="~[0.0121412,3.90861e-06]" snapshot_7="~[0.0120658,2.07848e-08]" snapshot_8="~[0.0121833,-1.07697e-08]" snapshot_9="~[0.0122501,-4.76078e-06]" snapshot_10="~[0.0121661,-1.12843e-06]" snapshot_11="~[0.0121799,9.67514e-09]" snapshot_12="~[0.0121737,1.57703e-09]" snapshot_13="~[0.0122089,-1.30516e-07]" snapshot_14="~[0.0119792,7.62995e-06]" snapshot_15="~[0.012156,-8.76475e-07]" snapshot_16="~[0.0120443,1.93816e-07]" snapshot_17="~[0.0122311,5.91096e-07]" snapshot_18="~[0.0122417,-6.55509e-08]" snapshot_19="~[0.0119656,4.74629e-06]" snapshot_20="~[0.0122203,5.95576e-06]" snapshot_21="~[0.0121711,8.50816e-08]" snapshot_22="~[0.0119354,-2.0611e-06]" snapshot_23="~[0.0119913,7.24526e-06]" snapshot_24="~[0.0122762,3.31778e-06]" snapshot_25="~[0.012157,-1.27356e-06]" snapshot_26="~[0.0122815,1.02274e-07]" snapshot_27="~[0.0120563,1.13435e-05]" snapshot_28="~[0.0121702,1.88328e-07]" snapshot_29="~[0.0122896,-1.33281e-06]" snapshot_30="~[0.011932,1.4519e-05]" snapshot_31="~[0.0118788,6.93523e-06]" snapshot_32="~[0.011859,-1.01416e-06]" snapshot_33="~[0.0122442,-1.15337e-07]" snapshot_34="~[0.0121227,1.94625e-06]" snapshot_35="~[0.0121134,7.65078e-09]" />
+        <Particle_0 snapshot_0="~[0,0]" snapshot_1="~[0.0122075,6.78185e-06]" snapshot_2="~[0.0100096,-5.04708e-06]" snapshot_3="~[0.0121773,3.16071e-18]" snapshot_4="~[0.0118883,1.8047e-06]" snapshot_5="~[0.0117028,3.92994e-06]" snapshot_6="~[0.0119973,-2.30208e-06]" snapshot_7="~[0.0121482,1.50071e-06]" snapshot_8="~[0.0121878,6.89416e-09]" snapshot_9="~[0.011435,3.52466e-06]" snapshot_10="~[0.0120838,-6.98354e-07]" snapshot_11="~[0.012107,4.98114e-08]" snapshot_12="~[0.0119723,-1.89367e-06]" snapshot_13="~[0.0121856,3.49185e-07]" snapshot_14="~[0.0120705,3.34944e-07]" snapshot_15="~[0.0120818,1.56204e-06]" snapshot_16="~[0.0081428,5.82725e-06]" snapshot_17="~[0.0116812,-1.1698e-06]" snapshot_18="~[0.0121693,2.01252e-06]" snapshot_19="~[0.0120051,5.25564e-06]" snapshot_20="~[0.0117804,8.8835e-07]" snapshot_21="~[0.0112625,-5.97261e-06]" snapshot_22="~[0.0120901,-1.20576e-05]" snapshot_23="~[0.0120784,1.55626e-05]" snapshot_24="~[0.011325,-2.07945e-06]" snapshot_25="~[0.0119658,-2.49187e-06]" snapshot_26="~[0.0121625,-3.43941e-06]" snapshot_27="~[0.0120019,5.42972e-06]" snapshot_28="~[0.0118335,-5.51479e-06]" snapshot_29="~[0.0121299,7.56585e-06]" snapshot_30="~[0.0122431,-1.83585e-06]" snapshot_31="~[0.0118717,-5.07995e-06]" snapshot_32="~[0.0122221,1.27308e-06]" snapshot_33="~[0.0120642,-1.20338e-05]" snapshot_34="~[0.0119155,1.33281e-05]" snapshot_35="~[0.0120964,7.16285e-06]" />
     </Result_Element>
 </result>
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml
deleted file mode 100644
index 5145414a95..0000000000
--- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_5_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<result>
-    <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="36" />
-    </Snapshot_Element>
-    <Result_Element>
-        <Particle_0 snapshot_0="~[0,0]" snapshot_1="~[0.0122961,5.07511e-07]" snapshot_2="~[0.0118911,3.89301e-06]" snapshot_3="~[0.0121677,4.53428e-07]" snapshot_4="~[0.0121638,-6.69438e-06]" snapshot_5="~[0.0121108,9.72094e-06]" snapshot_6="~[0.0121271,3.37258e-06]" snapshot_7="~[0.0121681,-2.68666e-07]" snapshot_8="~[0.0121505,-4.92694e-08]" snapshot_9="~[0.0121536,4.79497e-06]" snapshot_10="~[0.0117661,-1.26063e-06]" snapshot_11="~[0.0121181,2.4196e-06]" snapshot_12="~[0.0119696,-5.51547e-06]" snapshot_13="~[0.0122015,2.19898e-06]" snapshot_14="~[0.0122829,-2.06725e-07]" snapshot_15="~[0.0121632,3.33508e-06]" snapshot_16="~[0.0122943,-1.3691e-06]" snapshot_17="~[0.0121965,6.10452e-07]" snapshot_18="~[0.0120986,-4.93251e-06]" snapshot_19="~[0.0120841,3.77892e-06]" snapshot_20="~[0.0122705,1.44414e-08]" snapshot_21="~[0.0122043,1.56708e-06]" snapshot_22="~[0.012184,9.21402e-06]" snapshot_23="~[0.0122482,1.48558e-06]" snapshot_24="~[0.0119513,3.14721e-05]" snapshot_25="~[0.0121614,-1.90046e-06]" snapshot_26="~[0.0120359,3.99378e-06]" snapshot_27="~[0.0121028,-2.41471e-07]" snapshot_28="~[0.0121572,-5.26734e-08]" snapshot_29="~[0.0121447,-2.06537e-05]" snapshot_30="~[0.0121809,-1.84074e-07]" snapshot_31="~[0.0123008,-1.03178e-08]" snapshot_32="~[0.0122246,-1.9146e-06]" snapshot_33="~[0.0121156,7.35545e-06]" snapshot_34="~[0.0121265,4.66545e-06]" snapshot_35="~[0.0120587,6.42196e-06]" />
-    </Result_Element>
-</result>
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_6_result.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_Run_6_result.xml
new file mode 100644
index 0000000000..f05a38a36e
--- /dev/null
+++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_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_="36" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="~[0,0]" snapshot_1="~[0.012202,2.46306e-07]" snapshot_2="~[0.0101028,-4.39604e-06]" snapshot_3="~[0.0121773,-4.22355e-17]" snapshot_4="~[0.0120569,-5.61707e-07]" snapshot_5="~[0.0102642,-5.45722e-06]" snapshot_6="~[0.011552,-2.29583e-06]" snapshot_7="~[0.0121504,4.47319e-06]" snapshot_8="~[0.0121983,1.54052e-07]" snapshot_9="~[0.0115973,2.27539e-06]" snapshot_10="~[0.0118069,2.51543e-06]" snapshot_11="~[0.0120715,1.31744e-06]" snapshot_12="~[0.0121635,-2.46156e-06]" snapshot_13="~[0.0121465,-2.10989e-06]" snapshot_14="~[0.0120765,-1.06159e-07]" snapshot_15="~[0.0121197,-8.42522e-07]" snapshot_16="~[0.00654167,1.28311e-05]" snapshot_17="~[0.0116282,-4.55031e-07]" snapshot_18="~[0.012127,-3.46914e-06]" snapshot_19="~[0.0122365,8.47928e-07]" snapshot_20="~[0.0121317,-8.47255e-07]" snapshot_21="~[0.0108382,-3.48349e-06]" snapshot_22="~[0.0120953,-1.21603e-05]" snapshot_23="~[0.0121183,1.04103e-05]" snapshot_24="~[0.0115719,-1.83689e-06]" snapshot_25="~[0.0115571,-1.75677e-06]" snapshot_26="~[0.0121866,-6.47185e-07]" snapshot_27="~[0.0120466,6.26143e-06]" snapshot_28="~[0.0117797,-3.4938e-06]" snapshot_29="~[0.0120572,5.81939e-06]" snapshot_30="~[0.0121242,7.0829e-10]" snapshot_31="~[0.0120315,-6.98394e-06]" snapshot_32="~[0.0120922,7.24267e-06]" snapshot_33="~[0.0117705,-1.46185e-05]" snapshot_34="~[0.0119937,-2.21454e-06]" snapshot_35="~[0.0117181,-1.84352e-05]" />
+    </Result_Element>
+</result>
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml
index c038657b7a..aaf5de9683 100644
--- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml
+++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_dtwdistance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance Velocity_0="0.00069251637341803196" />
+    <DTWDistance Velocity_0="0.0019695095152534158" />
 </dtw_distance>
diff --git a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat
index de07de18db..34de7daedb 100644
--- a/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat
+++ b/tests/extra_source_and_tests/test_2d_mixed_poiseuille_flow/regression_test_tool/VelocityObserver_Velocity_runtimes.dat
@@ -1,3 +1,3 @@
 true
-6
+7
 4
\ No newline at end of file