Author: eudoxos
Date: 2009-03-29 22:43:38 +0200 (Sun, 29 Mar 2009)
New Revision: 1737
Modified:
trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp
trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.hpp
Log:
1. Hotfix for 2 issues with ElasticContactLaw
Modified: trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp 2009-03-29
15:17:31 UTC (rev 1736)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp 2009-03-29
20:43:38 UTC (rev 1737)
@@ -94,6 +94,9 @@
if(!functor) functor=shared_ptr<ef2_Spheres_Elastic_ElasticLaw>(new
ef2_Spheres_Elastic_ElasticLaw);
functor->momentRotationLaw=momentRotationLaw;
functor->sdecGroupMask=sdecGroupMask;
+ #ifndef BEX_CONTAINER
+ functor->actionForceIndex=actionForceIndex;
functor->actionMomentumIndex=actionMomentumIndex;
+ #endif
#ifdef SCG_SHEAR
functor->useShear=useShear;
#endif
@@ -119,7 +122,7 @@
if(currentContactGeometry->penetrationDepth<0){
contact->isReal=false; return; }
BodyMacroParameters* de1
=
YADE_CAST<BodyMacroParameters*>(Body::byId(id1,ncb)->physicalParameters.get());
- BodyMacroParameters* de2
=
YADE_CAST<BodyMacroParameters*>(Body::byId(id1,ncb)->physicalParameters.get());
+ BodyMacroParameters* de2
=
YADE_CAST<BodyMacroParameters*>(Body::byId(id2,ncb)->physicalParameters.get());
Vector3r& shearForce =
currentContactPhysics->shearForce;
Modified: trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.hpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.hpp 2009-03-29
15:17:31 UTC (rev 1736)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.hpp 2009-03-29
20:43:38 UTC (rev 1737)
@@ -42,6 +42,9 @@
virtual void go(shared_ptr<InteractionGeometry>& _geom,
shared_ptr<InteractionPhysics>& _phys, Interaction* I, MetaBody* rootBody);
int sdecGroupMask;
bool momentRotationLaw;
+ #ifndef BEX_CONTAINER
+ int actionForceIndex,actionMomentumIndex;
+ #endif
#ifdef SCG_SHEAR
bool useShear;
#endif
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
_______________________________________________
yade-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/yade-dev
