yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #12601
[Branch ~yade-pkg/yade/git-trunk] Rev 3829: Fix a tensor access in local displacement calculation.
------------------------------------------------------------
revno: 3829
committer: Francois <francois.kneib@xxxxxxxxx>
timestamp: Wed 2016-03-30 20:29:34 +0200
message:
Fix a tensor access in local displacement calculation.
modified:
lib/triangulation/KinematicLocalisationAnalyser.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 'lib/triangulation/KinematicLocalisationAnalyser.cpp'
--- lib/triangulation/KinematicLocalisationAnalyser.cpp 2014-07-03 17:20:40 +0000
+++ lib/triangulation/KinematicLocalisationAnalyser.cpp 2016-03-30 18:29:34 +0000
@@ -727,9 +727,9 @@
CVector meanFieldDisp =CVector(TS0->grain(id).sphere.point().x(), TS0->grain(id).sphere.point().y(), TS0->grain(id).sphere.point().z())-fixedPoint;
if (1){//fluctuations
meanFieldDisp = CVector(
- meanFieldDisp[0]*Delta_epsilon(0,0),
- meanFieldDisp[1]*Delta_epsilon(1,1),
- meanFieldDisp[2]*Delta_epsilon(2,2));
+ meanFieldDisp[0]*Delta_epsilon(1,1),
+ meanFieldDisp[1]*Delta_epsilon(2,2),
+ meanFieldDisp[2]*Delta_epsilon(3,3));
} else meanFieldDisp=CVector(0,0,0);
if (consecutive) v = v + TS1->grain(id).translation-meanFieldDisp;
else v = v + (TS1->grain(id).sphere.point() - TS0->grain(id).sphere.point()-meanFieldDisp);