------------------------------------------------------------
revno: 2133
committer: jduriez <jdur...@c1solimara-l>
branch nick: trunk
timestamp: Thu 2010-04-08 16:54:58 +0200
message:
Re-write of CohesiveFrictionalMat with YADE_BASE... macro.
It is not one of "my" files but I wanted to use it with Python, so I did it.
I hope noone will be offensed.
modified:
pkg/dem/DataClass/Material/CohesiveFrictionalMat.cpp
pkg/dem/DataClass/Material/CohesiveFrictionalMat.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/DataClass/Material/CohesiveFrictionalMat.cpp'
--- pkg/dem/DataClass/Material/CohesiveFrictionalMat.cpp 2010-01-10 09:09:32 +0000
+++ pkg/dem/DataClass/Material/CohesiveFrictionalMat.cpp 2010-04-08 14:54:58 +0000
@@ -8,12 +8,6 @@
#include "CohesiveFrictionalMat.hpp"
-CohesiveFrictionalMat::CohesiveFrictionalMat () : FrictMat()
-{
- createIndex();
- isBroken=true;
- isCohesive=true;
-}
CohesiveFrictionalMat::~CohesiveFrictionalMat()
{
=== modified file 'pkg/dem/DataClass/Material/CohesiveFrictionalMat.hpp'
--- pkg/dem/DataClass/Material/CohesiveFrictionalMat.hpp 2010-01-10 09:09:32 +0000
+++ pkg/dem/DataClass/Material/CohesiveFrictionalMat.hpp 2010-04-08 14:54:58 +0000
@@ -16,16 +16,14 @@
class CohesiveFrictionalMat : public FrictMat
{
public :
- bool isBroken;
- bool isCohesive;
-
- CohesiveFrictionalMat ();
virtual ~CohesiveFrictionalMat ();
/// Serialization
- REGISTER_CLASS_NAME(CohesiveFrictionalMat);
- REGISTER_BASE_CLASS_NAME(FrictMat);
- REGISTER_ATTRIBUTES(FrictMat,(isBroken)(isCohesive));
+ YADE_CLASS_BASE_DOC_ATTRS_CTOR(CohesiveFrictionalMat,FrictMat,"",
+ ((bool,isBroken,true,""))
+ ((bool,isCohesive,true,"")),
+ createIndex();
+ );
/// Indexable
REGISTER_CLASS_INDEX(CohesiveFrictionalMat,FrictMat);
};
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
