yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #11556
[Branch ~yade-pkg/yade/git-trunk] Rev 3496: Fix typo in SPH.
------------------------------------------------------------
revno: 3496
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2014-10-21 09:58:55 +0200
message:
Fix typo in SPH.
modified:
pkg/common/SPHEngine.cpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/common/SPHEngine.cpp'
--- pkg/common/SPHEngine.cpp 2014-10-20 13:42:59 +0000
+++ pkg/common/SPHEngine.cpp 2014-10-21 07:58:55 +0000
@@ -146,7 +146,7 @@
fpressure = - Mass1 * Mass2 * (
bodies[id1]->press/(Rho1*Rho1) +
bodies[id2]->press/(Rho2*Rho2)
- )
+ )
* phys.kernelFunctionCurrentPressure(xixj.norm(), phys.h);
}
@@ -154,7 +154,7 @@
if (Rho1!=0.0 and Rho2!=0.0) {
// from [Morris1997], (22), multiply by Mass2, because we need a force, not du/dt
fvisc = phys.mu * Mass1 * Mass2 *
- (-normalVelocity*geom.normal)/(Rho1*Rho1) *
+ (-normalVelocity*geom.normal)/(Rho1*Rho2) *
1 / (xixj.norm()) *
phys.kernelFunctionCurrentPressure(xixj.norm(), phys.h);
//phys.kernelFunctionCurrentVisco(xixj.norm(), phys.h);