yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #01940
[Branch ~yade-dev/yade/trunk] Rev 1742: Blocked some warnings in RockPM.cpp
------------------------------------------------------------
revno: 1742
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-08-27 16:03:05 +0200
message:
Blocked some warnings in RockPM.cpp
modified:
pkg/dem/meta/RockPM.cpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
=== modified file 'pkg/dem/meta/RockPM.cpp'
--- pkg/dem/meta/RockPM.cpp 2009-08-26 09:10:54 +0000
+++ pkg/dem/meta/RockPM.cpp 2009-08-27 14:03:05 +0000
@@ -48,14 +48,15 @@
Real& Fn=phys->Fn;
Vector3r& Fs=phys->Fs;
-
+ /*
+ *************Blocked for a while
const shared_ptr<Body>& body1=Body::byId(contact->getId1(),rootBody);
const shared_ptr<Body>& body2=Body::byId(contact->getId2(),rootBody);
assert(body1);
assert(body2);
const shared_ptr<RpmMat>& rbp1=YADE_PTR_CAST<RpmMat>(body1->physicalParameters);
const shared_ptr<RpmMat>& rbp2=YADE_PTR_CAST<RpmMat>(body2->physicalParameters);
-
+ */
if(displN<=0){
/**Normal Interaction*/