------------------------------------------------------------ revno: 3537 committer: Anton Gladky <[email protected]> timestamp: Mon 2014-11-17 15:04:32 +0100 message: Drop default inclusion of DFNFLOW. modified: pkg/pfv/DFNFlow.cpp pkg/pfv/DummyFlowEngine.cpp pkg/pfv/TwoPhaseFlowEngine.cpp pkg/pfv/TwoPhaseFlowEngine.hpp pkg/pfv/UnsaturatedEngine.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/DFNFlow.cpp' --- pkg/pfv/DFNFlow.cpp 2014-11-07 14:26:52 +0000 +++ pkg/pfv/DFNFlow.cpp 2014-11-17 14:04:32 +0000 @@ -13,7 +13,8 @@ //keep this #ifdef for commited versions unless you really have stable version that should be compiled by default //it will save compilation time for everyone else //when you want it compiled, you can pass -DDFNFLOW to cmake, or just uncomment the following line -#define DFNFLOW + +// #define DFNFLOW #ifdef DFNFLOW #include "FlowEngine_DFNFlowEngineT.hpp" === modified file 'pkg/pfv/DummyFlowEngine.cpp' --- pkg/pfv/DummyFlowEngine.cpp 2014-06-20 15:28:21 +0000 +++ pkg/pfv/DummyFlowEngine.cpp 2014-11-17 14:04:32 +0000 @@ -10,7 +10,7 @@ // Every functions of the base engine can be overloaded, and new functions can be added //keep this #ifdef as long as you don't really want to realize a final version publicly, it will save compilation time for everyone else -//when you want it compiled, you can pass -DDFNFLOW to cmake, or just uncomment the following line +//when you want it compiled, you can pass -DDUMMYFLOW to cmake, or just uncomment the following line // #define DUMMYFLOW #ifdef DUMMYFLOW === modified file 'pkg/pfv/TwoPhaseFlowEngine.cpp' --- pkg/pfv/TwoPhaseFlowEngine.cpp 2014-11-07 10:56:38 +0000 +++ pkg/pfv/TwoPhaseFlowEngine.cpp 2014-11-17 14:04:32 +0000 @@ -12,7 +12,7 @@ // Every functions of the base engine can be overloaded, and new functions can be added //keep this #ifdef as long as you don't really want to realize a final version publicly, it will save compilation time for everyone else -//when you want it compiled, you can pass -DDFNFLOW to cmake, or just uncomment the following line +//when you want it compiled, you can pass -DTWOPHASEFLOW to cmake, or just uncomment the following line #include "TwoPhaseFlowEngine.hpp" #ifdef TWOPHASEFLOW === modified file 'pkg/pfv/TwoPhaseFlowEngine.hpp' --- pkg/pfv/TwoPhaseFlowEngine.hpp 2014-11-07 10:56:38 +0000 +++ pkg/pfv/TwoPhaseFlowEngine.hpp 2014-11-17 14:04:32 +0000 @@ -12,7 +12,7 @@ // Every functions of the base engine can be overloaded, and new functions can be added //keep this #ifdef as long as you don't really want to realize a final version publicly, it will save compilation time for everyone else -//when you want it compiled, you can pass -DDFNFLOW to cmake, or just uncomment the following line +//when you want it compiled, you can pass -DTWOPHASEFLOW to cmake, or just uncomment the following line //#define TWOPHASEFLOW #ifdef TWOPHASEFLOW === modified file 'pkg/pfv/UnsaturatedEngine.cpp' --- pkg/pfv/UnsaturatedEngine.cpp 2014-11-03 18:59:34 +0000 +++ pkg/pfv/UnsaturatedEngine.cpp 2014-11-17 14:04:32 +0000 @@ -10,7 +10,7 @@ //keep this #ifdef for commited versions unless you really have stable version that should be compiled by default //it will save compilation time for everyone else -//when you want it compiled, you can pass -DDFNFLOW to cmake, or just uncomment the following line +//when you want it compiled, you can pass -DTWOPHASEFLOW to cmake, or just uncomment the following line #ifdef TWOPHASEFLOW class UnsaturatedEngine : public TwoPhaseFlowEngine @@ -1230,4 +1230,4 @@ } #endif //TWOPHASEFLOW -#endif //FLOW_ENGINE \ No newline at end of file +#endif //FLOW_ENGINE
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
