yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #06903
[Branch ~yade-dev/yade/trunk] Rev 2704: - remove FrictPhysTransitory
------------------------------------------------------------
revno: 2704
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: yade
timestamp: Mon 2011-01-31 17:39:11 +0100
message:
- remove FrictPhysTransitory
modified:
pkg/dem/FrictPhys.cpp
pkg/dem/FrictPhys.hpp
--
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/FrictPhys.cpp'
--- pkg/dem/FrictPhys.cpp 2010-12-31 14:35:21 +0000
+++ pkg/dem/FrictPhys.cpp 2011-01-31 16:39:11 +0000
@@ -1,4 +1,3 @@
#include "FrictPhys.hpp"
FrictPhys::~FrictPhys(){}
-FrictPhysTransitory::~FrictPhysTransitory(){}
-YADE_PLUGIN((FrictPhys)(FrictPhysTransitory));
+YADE_PLUGIN((FrictPhys));
=== modified file 'pkg/dem/FrictPhys.hpp'
--- pkg/dem/FrictPhys.hpp 2010-12-31 14:35:21 +0000
+++ pkg/dem/FrictPhys.hpp 2011-01-31 16:39:11 +0000
@@ -20,16 +20,3 @@
REGISTER_CLASS_INDEX(FrictPhys,NormShearPhys);
};
REGISTER_SERIALIZABLE(FrictPhys);
-
-class FrictPhysTransitory: public FrictPhys
-{
- public :
- Real frictionAngle;
- virtual ~FrictPhysTransitory();
- YADE_CLASS_BASE_DOC_ATTRS_CTOR(FrictPhysTransitory,FrictPhys,"Temporary version of :yref:`FrictPhys` for compatibility with e.g. :yref:`Law2_ScGeom6D_NormalInelasticityPhys_NormalInelasticity`",
- ((Vector3r,prevNormal,Vector3r::Zero(),,"unit normal of the contact plane in previous step")),
- createIndex()
- );
- REGISTER_CLASS_INDEX(FrictPhysTransitory,FrictPhys);
-};
-REGISTER_SERIALIZABLE(FrictPhysTransitory);
\ No newline at end of file