yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3479
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Wed 2014-10-15 10:46:23 +0200
message:
  better #def/#ifdef logic for TwoPhaseFlowEngine
modified:
  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/TwoPhaseFlowEngine.cpp'
--- pkg/pfv/TwoPhaseFlowEngine.cpp	2014-10-14 09:07:54 +0000
+++ pkg/pfv/TwoPhaseFlowEngine.cpp	2014-10-15 08:46:23 +0000
@@ -13,11 +13,10 @@
 
 //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
-#define TWOPHASEFLOW
+
+#include "TwoPhaseFlowEngine.hpp"
 #ifdef TWOPHASEFLOW
 
-#include "TwoPhaseFlowEngine.hpp"
-
 YADE_PLUGIN((TwoPhaseFlowEngineT));
 YADE_PLUGIN((TwoPhaseFlowEngine));
 

=== modified file 'pkg/pfv/TwoPhaseFlowEngine.hpp'
--- pkg/pfv/TwoPhaseFlowEngine.hpp	2014-10-15 08:43:47 +0000
+++ pkg/pfv/TwoPhaseFlowEngine.hpp	2014-10-15 08:46:23 +0000
@@ -13,6 +13,7 @@
 
 //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
+#define TWOPHASEFLOW
 #ifdef TWOPHASEFLOW
 
 #include "FlowEngine_TwoPhaseFlowEngineT.hpp"

=== modified file 'pkg/pfv/UnsaturatedEngine.cpp'
--- pkg/pfv/UnsaturatedEngine.cpp	2014-10-15 08:43:47 +0000
+++ pkg/pfv/UnsaturatedEngine.cpp	2014-10-15 08:46:23 +0000
@@ -6,16 +6,13 @@
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
 #ifdef FLOW_ENGINE
+#include "TwoPhaseFlowEngine.hpp"
 
 //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 UNSATURATED_FLOW
-#ifdef UNSATURATED_FLOW
+#ifdef TWOPHASEFLOW
 
-#define TWOPHASEFLOW
-#include "TwoPhaseFlowEngine.hpp"
-// #include "FlowEngine_TwoPhaseFlowEngineT.hpp"
 
 // /// We can add data to the Info types by inheritance
 // class UnsatCellInfo : public FlowCellInfo_UnsaturatedEngineT {