[Yade-dev] removing PhysicalAction

[Václav Šmilauer]

Hello,

after converting all code in trunk to use both BexContainer and
PhysicalActionContainer, I will now remove PhysicalActionContainer and
all related things, to be able to clean the code from ugly #ifdefs.

Other classes that will be removed are

* GlobalStiffnessCounter (not used anymore)
* MakeItFlat (replaced by PhysicalParameters::blockedDOFs).

Let me know if there are any problems on your side.

Vaclav


___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp

[Yade-dev] [svn] r1737 - trunk/pkg/dem/Engine/StandAloneEngine

[eudoxos at BerliOS]

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_ptref2_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-penetrationDepth0){ 
contact-isReal=false; return; }

BodyMacroParameters* de1
= 
YADE_CASTBodyMacroParameters*(Body::byId(id1,ncb)-physicalParameters.get());
-   BodyMacroParameters* de2
= 
YADE_CASTBodyMacroParameters*(Body::byId(id1,ncb)-physicalParameters.get());
+   BodyMacroParameters* de2
= 
YADE_CASTBodyMacroParameters*(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_ptrInteractionGeometry _geom, 
shared_ptrInteractionPhysics _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 : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp