yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #10992
[Branch ~yade-pkg/yade/git-trunk] Rev 4034: Fix typo in previous commit.
------------------------------------------------------------
revno: 4034
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Fri 2014-06-20 19:48:57 +0200
message:
Fix typo in previous commit.
modified:
pkg/pfv/FlowEngine.cpp
pkg/pfv/PeriodicFlowEngine.cpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/pfv/FlowEngine.cpp'
--- pkg/pfv/FlowEngine.cpp 2014-06-20 15:28:21 +0000
+++ pkg/pfv/FlowEngine.cpp 2014-06-20 17:48:57 +0000
@@ -13,7 +13,7 @@
// To register properly, we need to first instantiate an intermediate class, then inherit from it with correct class names in YADE_CLASS macro
// The intermediate one would be seen with the name "TemplateFlowEngine" by python, thus it would not work when more than one class are derived, they would all
// be named "TemplateFlowEngine" ...
-typedef TemplateFlowEngine_FlowEngineT<FlowCellInfo_FlowEngineT,FlowVertexInfo_DummyFlowEngineT> FlowEngineT;
+typedef TemplateFlowEngine_FlowEngineT<FlowCellInfo_FlowEngineT,FlowVertexInfo_FlowEngineT> FlowEngineT;
REGISTER_SERIALIZABLE(FlowEngineT);
class FlowEngine : public FlowEngineT
=== modified file 'pkg/pfv/PeriodicFlowEngine.cpp'
--- pkg/pfv/PeriodicFlowEngine.cpp 2014-06-20 15:28:21 +0000
+++ pkg/pfv/PeriodicFlowEngine.cpp 2014-06-20 17:48:57 +0000
@@ -42,7 +42,7 @@
};
-class PeriodicVertexInfo : public FlowVertexInfo_DummyFlowEngineT {
+class PeriodicVertexInfo : public FlowVertexInfo_FlowEngine_PeriodicInfo {
public:
PeriodicVertexInfo& operator= (const CVector &u) { CVector::operator= (u); return *this; }
PeriodicVertexInfo& operator= (const float &scalar) { s=scalar; return *this; }