Skip to content

Commit

Permalink
change formulation
Browse files Browse the repository at this point in the history
  • Loading branch information
yaru0818 committed Sep 5, 2023
1 parent 227e08b commit fcc8c6f
Show file tree
Hide file tree
Showing 23 changed files with 169 additions and 45 deletions.
2 changes: 1 addition & 1 deletion src/shared/particle_dynamics/general_dynamics/general_interaction.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void CorrectedConfigurationInner::interaction(size_t index_i, Real dt)
//=================================================================================================//
void CorrectedConfigurationInner::update(size_t index_i, Real dt)
{
Real det_sqr = SMAX((alpha_ - B_[index_i].determinant()), Real(0));
Real det_sqr = alpha_;
Matd inverse = B_[index_i].inverse();
Real weight1_ = B_[index_i].determinant() / (B_[index_i].determinant() + det_sqr);
Real weight2_ = det_sqr / (B_[index_i].determinant() + det_sqr);
Expand Down
44 changes: 44 additions & 0 deletions ...d_examples/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<TotalMechanicalEnergy>
<Snapshot_0 TotalMechanicalEnergy_0="9860.5411200000017" />
<Snapshot_200 TotalMechanicalEnergy_0="9854.3377912566211" />
<Snapshot_400 TotalMechanicalEnergy_0="9856.4125217955607" />
<Snapshot_600 TotalMechanicalEnergy_0="9849.9745631325459" />
<Snapshot_800 TotalMechanicalEnergy_0="9849.8758817360376" />
<Snapshot_1000 TotalMechanicalEnergy_0="9848.0485177454775" />
<Snapshot_1200 TotalMechanicalEnergy_0="9849.6635740457841" />
<Snapshot_1400 TotalMechanicalEnergy_0="9850.8825812537343" />
<Snapshot_1600 TotalMechanicalEnergy_0="9848.9871357715128" />
<Snapshot_1800 TotalMechanicalEnergy_0="9848.5025277937202" />
<Snapshot_2000 TotalMechanicalEnergy_0="9844.9463678840693" />
<Snapshot_2200 TotalMechanicalEnergy_0="9850.5261512150828" />
<Snapshot_2400 TotalMechanicalEnergy_0="9851.4718427745884" />
<Snapshot_2600 TotalMechanicalEnergy_0="9850.7691405176938" />
<Snapshot_2800 TotalMechanicalEnergy_0="9847.1915890584914" />
<Snapshot_3000 TotalMechanicalEnergy_0="9848.627057312231" />
<Snapshot_3200 TotalMechanicalEnergy_0="9850.8485979503821" />
<Snapshot_3400 TotalMechanicalEnergy_0="9850.5304489982445" />
<Snapshot_3600 TotalMechanicalEnergy_0="9850.2276740944253" />
<Snapshot_3800 TotalMechanicalEnergy_0="9846.4125539781253" />
<Snapshot_4000 TotalMechanicalEnergy_0="9850.5548140120736" />
<Snapshot_4200 TotalMechanicalEnergy_0="9849.6408308983791" />
<Snapshot_4400 TotalMechanicalEnergy_0="9848.6588084302421" />
<Snapshot_4600 TotalMechanicalEnergy_0="9848.2140356841737" />
<Snapshot_4800 TotalMechanicalEnergy_0="9844.1652903832637" />
<Snapshot_5000 TotalMechanicalEnergy_0="9851.7877770182768" />
<Snapshot_5200 TotalMechanicalEnergy_0="9848.5974083173369" />
<Snapshot_5400 TotalMechanicalEnergy_0="9846.3489667379308" />
<Snapshot_5600 TotalMechanicalEnergy_0="9842.8687076149872" />
<Snapshot_5800 TotalMechanicalEnergy_0="9843.1957803726582" />
<Snapshot_6000 TotalMechanicalEnergy_0="9846.7795559006081" />
<Snapshot_6200 TotalMechanicalEnergy_0="9844.3676801064303" />
<Snapshot_6400 TotalMechanicalEnergy_0="9844.3118676361446" />
<Snapshot_6600 TotalMechanicalEnergy_0="9842.3120374774189" />
<Snapshot_6800 TotalMechanicalEnergy_0="9845.0314630876546" />
<Snapshot_7000 TotalMechanicalEnergy_0="9845.5097380630323" />
<Snapshot_7200 TotalMechanicalEnergy_0="9843.7350331853631" />
<Snapshot_7400 TotalMechanicalEnergy_0="9842.9403754022296" />
<Snapshot_7600 TotalMechanicalEnergy_0="9841.2999779666279" />
<Snapshot_7800 TotalMechanicalEnergy_0="9846.0752320722149" />
<Snapshot_8000 TotalMechanicalEnergy_0="9845.6264028751993" />
</TotalMechanicalEnergy>
2 changes: 1 addition & 1 deletion ...st_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_0_result.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<Snapshot number_of_snapshot_for_local_result_="41" />
</Snapshot_Element>
<Result_Element>
<Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9854.1466499953785" snapshot_2="9855.7581726547105" snapshot_3="9850.05150107804" snapshot_4="9849.4018744311215" snapshot_5="9847.4364981629842" snapshot_6="9849.6867687744307" snapshot_7="9851.6220080756757" snapshot_8="9847.1742949091113" snapshot_9="9848.5615434034898" snapshot_10="9847.7468529656526" snapshot_11="9852.7188593693172" snapshot_12="9850.7645761542644" snapshot_13="9848.7736108036006" snapshot_14="9847.7119396299422" snapshot_15="9845.8831329151271" snapshot_16="9853.8652652122837" snapshot_17="9848.4762844655488" snapshot_18="9847.4163085120963" snapshot_19="9845.8308657477974" snapshot_20="9847.7042092910524" snapshot_21="9851.1049746852204" snapshot_22="9849.1589375557942" snapshot_23="9844.3078765639748" snapshot_24="9843.3579822474785" snapshot_25="9847.0419403766373" snapshot_26="9845.9365415315751" snapshot_27="9845.3260230399392" snapshot_28="9842.9264923473711" snapshot_29="9843.9477969692416" snapshot_30="9846.2436682829684" snapshot_31="9844.4318711660489" snapshot_32="9843.8779100013162" snapshot_33="9842.2405907536431" snapshot_34="9843.550538547679" snapshot_35="9844.7704457686159" snapshot_36="9841.7610612851677" snapshot_37="9841.9020334930137" snapshot_38="9836.9429715431797" snapshot_39="9842.4348160601548" snapshot_40="9839.952478435669" />
<Particle_0 snapshot_0="9860.5411200000017" snapshot_1="9854.3377912566175" snapshot_2="9856.4125217954461" snapshot_3="9849.9745631344595" snapshot_4="9849.8758818193292" snapshot_5="9848.0485177725677" snapshot_6="9849.6636242004097" snapshot_7="9850.8825728222928" snapshot_8="9848.9785770319995" snapshot_9="9848.2494737752422" snapshot_10="9844.606460320836" snapshot_11="9849.6718387458368" snapshot_12="9849.2592913271037" snapshot_13="9852.3107820973328" snapshot_14="9849.9512284659431" snapshot_15="9847.0516200078691" snapshot_16="9851.7703032173977" snapshot_17="9847.5302229301742" snapshot_18="9848.1971260362025" snapshot_19="9847.1961781003847" snapshot_20="9848.6075658498503" snapshot_21="9849.3678674882685" snapshot_22="9848.9163029086121" snapshot_23="9848.2701781222295" snapshot_24="9844.9092222077034" snapshot_25="9848.5006101332383" snapshot_26="9846.8312605642332" snapshot_27="9845.4435904715338" snapshot_28="9844.2021144300415" snapshot_29="9847.614578960689" snapshot_30="9846.5653195737978" snapshot_31="9844.4355334299798" snapshot_32="9845.318999063189" snapshot_33="9845.9607957369153" snapshot_34="9845.4484837556865" snapshot_35="9845.6358765263121" snapshot_36="9844.1141894059638" snapshot_37="9840.5563744775991" snapshot_38="9839.5465936534547" snapshot_39="9845.7418856053846" snapshot_40="9845.1784698102965" />
</Result_Element>
</result>
9 changes: 0 additions & 9 deletions ...t_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_12_result.xml
View file

This file was deleted.

9 changes: 9 additions & 0 deletions ...st_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_1_result.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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.5411199999999" snapshot_1="9854.3377912566157" snapshot_2="9856.4125217962355" snapshot_3="9849.9745631343376" snapshot_4="9849.8758818139031" snapshot_5="9848.0485136853349" snapshot_6="9849.6634187447034" snapshot_7="9850.9302786793833" snapshot_8="9848.9158529822143" snapshot_9="9847.6026882154874" snapshot_10="9845.202072328666" snapshot_11="9851.5748534377763" snapshot_12="9850.9021658354359" snapshot_13="9850.8635310362533" snapshot_14="9847.7687574208976" snapshot_15="9849.623399991764" snapshot_16="9852.9744245720904" snapshot_17="9851.0900434810428" snapshot_18="9849.3917683223717" snapshot_19="9845.8855914568958" snapshot_20="9847.7324789892882" snapshot_21="9851.4137257317307" snapshot_22="9847.2923597559529" snapshot_23="9848.7436678121103" snapshot_24="9844.4033374152605" snapshot_25="9847.4288780139614" snapshot_26="9848.150066208831" snapshot_27="9846.8156038544439" snapshot_28="9843.2572973110764" snapshot_29="9845.3871649045323" snapshot_30="9847.4840541791091" snapshot_31="9844.5981763469717" snapshot_32="9845.6479699729098" snapshot_33="9841.5339917938472" snapshot_34="9844.2134558685138" snapshot_35="9846.889098921838" snapshot_36="9842.6145260842859" snapshot_37="9842.5949542233957" snapshot_38="9843.3630262029837" snapshot_39="9846.9969432364014" snapshot_40="9845.1798805122526" />
</Result_Element>
</result>
9 changes: 9 additions & 0 deletions ...st_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_2_result.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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="9854.337791256612" snapshot_2="9856.4125217946093" snapshot_3="9849.9745631290898" snapshot_4="9849.8758816470836" snapshot_5="9848.0485196927857" snapshot_6="9849.6637635032639" snapshot_7="9850.8387670089087" snapshot_8="9849.086743174892" snapshot_9="9849.988783598732" snapshot_10="9844.4494687077295" snapshot_11="9849.9068815754963" snapshot_12="9850.2310790077427" snapshot_13="9851.7305690820904" snapshot_14="9847.1055082599814" snapshot_15="9847.0202039014912" snapshot_16="9851.7822750460437" snapshot_17="9848.9862355008991" snapshot_18="9848.6132184856724" snapshot_19="9847.1655449939572" snapshot_20="9848.6787226719025" snapshot_21="9847.8319163861452" snapshot_22="9847.3720923823166" snapshot_23="9847.2211742237196" snapshot_24="9843.3678922080217" snapshot_25="9848.5531050513873" snapshot_26="9849.9498546508657" snapshot_27="9844.2035808844576" snapshot_28="9846.0847889127726" snapshot_29="9847.9288462863133" snapshot_30="9847.5931748057083" snapshot_31="9846.5149660486568" snapshot_32="9845.2293326692889" snapshot_33="9844.6485159206986" snapshot_34="9847.8752940242739" snapshot_35="9847.1129618540854" snapshot_36="9845.4013781416579" snapshot_37="9843.7240283904594" snapshot_38="9839.1763266694797" snapshot_39="9846.293951314492" snapshot_40="9843.6760979099799" />
</Result_Element>
</result>
9 changes: 9 additions & 0 deletions ...st_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_3_result.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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.5411200000053" snapshot_1="9854.3377912566175" snapshot_2="9856.4125217969977" snapshot_3="9849.9745631409241" snapshot_4="9849.8758816489662" snapshot_5="9848.0485236726163" snapshot_6="9849.6638373820115" snapshot_7="9850.80798118456" snapshot_8="9849.1610997164735" snapshot_9="9848.1809124556676" snapshot_10="9844.2315167512606" snapshot_11="9849.6161028569641" snapshot_12="9851.4390534635677" snapshot_13="9849.8340166708076" snapshot_14="9850.1189371779074" snapshot_15="9847.7323070795701" snapshot_16="9852.5698099176334" snapshot_17="9848.1584476767966" snapshot_18="9847.144156183238" snapshot_19="9842.5556544309311" snapshot_20="9845.7664669081041" snapshot_21="9849.6747518821157" snapshot_22="9850.6328578411212" snapshot_23="9847.2045024598665" snapshot_24="9845.4711898569003" snapshot_25="9849.1318644228068" snapshot_26="9847.8545794997808" snapshot_27="9846.1470387228655" snapshot_28="9842.5210997923132" snapshot_29="9844.4298808027306" snapshot_30="9844.8892128640309" snapshot_31="9844.8574877061801" snapshot_32="9844.6374556772971" snapshot_33="9842.5843381374634" snapshot_34="9843.698098351666" snapshot_35="9844.9965646358887" snapshot_36="9843.8227546474773" snapshot_37="9842.1094973160416" snapshot_38="9841.6601329195109" snapshot_39="9844.3284914501019" snapshot_40="9843.2636596957054" />
</Result_Element>
</result>
9 changes: 9 additions & 0 deletions ...st_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_4_result.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?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="9854.3377912566211" snapshot_2="9856.4125217955607" snapshot_3="9849.9745631325459" snapshot_4="9849.8758817360376" snapshot_5="9848.0485177454775" snapshot_6="9849.6635740457841" snapshot_7="9850.8825812537343" snapshot_8="9848.9871357715128" snapshot_9="9848.5025277937202" snapshot_10="9844.9463678840693" snapshot_11="9850.5261512150828" snapshot_12="9851.4718427745884" snapshot_13="9850.7691405176938" snapshot_14="9847.1915890584914" snapshot_15="9848.627057312231" snapshot_16="9850.8485979503821" snapshot_17="9850.5304489982445" snapshot_18="9850.2276740944253" snapshot_19="9846.4125539781253" snapshot_20="9850.5548140120736" snapshot_21="9849.6408308983791" snapshot_22="9848.6588084302421" snapshot_23="9848.2140356841737" snapshot_24="9844.1652903832637" snapshot_25="9851.7877770182768" snapshot_26="9848.5974083173369" snapshot_27="9846.3489667379308" snapshot_28="9842.8687076149872" snapshot_29="9843.1957803726582" snapshot_30="9846.7795559006081" snapshot_31="9844.3676801064303" snapshot_32="9844.3118676361446" snapshot_33="9842.3120374774189" snapshot_34="9845.0314630876546" snapshot_35="9845.5097380630323" snapshot_36="9843.7350331853631" snapshot_37="9842.9403754022296" snapshot_38="9841.2999779666279" snapshot_39="9846.0752320722149" snapshot_40="9845.6264028751993" />
</Result_Element>
</result>
9 changes: 0 additions & 9 deletions ...st_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_Run_6_result.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...est_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_dtwdistance.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dtw_distance>
<DTWDistance TotalMechanicalEnergy_0="20.0" />
<DTWDistance TotalMechanicalEnergy_0="10.637884956915514" />
</dtw_distance>
6 changes: 3 additions & 3 deletions ...s/test_2d_standing_wave/regression_test_tool/WaterBody_TotalMechanicalEnergy_runtimes.dat
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
true
13
4
false
6
1
44 changes: 44 additions & 0 deletions tests/2d_examples/test_2d_standing_wave/regression_test_tool/WaveProbe_FreeSurfaceHeight.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<FreeSurfaceHeight>
<Snapshot_0 FreeSurfaceHeight_0="0.89000000000000001" />
<Snapshot_200 FreeSurfaceHeight_0="0.98514414841385001" />
<Snapshot_400 FreeSurfaceHeight_0="1.1106007917062282" />
<Snapshot_600 FreeSurfaceHeight_0="1.0473411509620756" />
<Snapshot_800 FreeSurfaceHeight_0="0.93802385238380837" />
<Snapshot_1000 FreeSurfaceHeight_0="0.92691220087507431" />
<Snapshot_1200 FreeSurfaceHeight_0="1.0138857250775197" />
<Snapshot_1400 FreeSurfaceHeight_0="1.0995494526716711" />
<Snapshot_1600 FreeSurfaceHeight_0="1.0226171761426492" />
<Snapshot_1800 FreeSurfaceHeight_0="0.91799455959842036" />
<Snapshot_2000 FreeSurfaceHeight_0="0.93730952968420711" />
<Snapshot_2200 FreeSurfaceHeight_0="1.078769207514487" />
<Snapshot_2400 FreeSurfaceHeight_0="1.107898223465789" />
<Snapshot_2600 FreeSurfaceHeight_0="0.95900026831182184" />
<Snapshot_2800 FreeSurfaceHeight_0="0.91938193304566251" />
<Snapshot_3000 FreeSurfaceHeight_0="0.99416916752915552" />
<Snapshot_3200 FreeSurfaceHeight_0="1.0772641086238655" />
<Snapshot_3400 FreeSurfaceHeight_0="1.0562467039550776" />
<Snapshot_3600 FreeSurfaceHeight_0="0.94338605156576605" />
<Snapshot_3800 FreeSurfaceHeight_0="0.92340302681372444" />
<Snapshot_4000 FreeSurfaceHeight_0="1.0239197460952016" />
<Snapshot_4200 FreeSurfaceHeight_0="1.118091067721285" />
<Snapshot_4400 FreeSurfaceHeight_0="1.0048176279789929" />
<Snapshot_4600 FreeSurfaceHeight_0="0.91581743533963489" />
<Snapshot_4800 FreeSurfaceHeight_0="0.96180172166027245" />
<Snapshot_5000 FreeSurfaceHeight_0="1.0746112760418056" />
<Snapshot_5200 FreeSurfaceHeight_0="1.0662191631196896" />
<Snapshot_5400 FreeSurfaceHeight_0="0.96492961261556187" />
<Snapshot_5600 FreeSurfaceHeight_0="0.9286327410212083" />
<Snapshot_5800 FreeSurfaceHeight_0="0.98543568067764831" />
<Snapshot_6000 FreeSurfaceHeight_0="1.0930304925728898" />
<Snapshot_6200 FreeSurfaceHeight_0="1.0580974458668713" />
<Snapshot_6400 FreeSurfaceHeight_0="0.92774039650192119" />
<Snapshot_6600 FreeSurfaceHeight_0="0.93717083729613559" />
<Snapshot_6800 FreeSurfaceHeight_0="1.0446662438246259" />
<Snapshot_7000 FreeSurfaceHeight_0="1.0903710649027545" />
<Snapshot_7200 FreeSurfaceHeight_0="0.98893140434320281" />
<Snapshot_7400 FreeSurfaceHeight_0="0.92859188620138733" />
<Snapshot_7600 FreeSurfaceHeight_0="0.97367782478077147" />
<Snapshot_7800 FreeSurfaceHeight_0="1.0609923152514369" />
<Snapshot_8000 FreeSurfaceHeight_0="1.0701390497502437" />
</FreeSurfaceHeight>
Loading

0 comments on commit fcc8c6f

Please sign in to comment.