yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2503
committer: ecatalano <ecatalano@dt-rv019>
branch nick: yade
timestamp: Wed 2010-10-20 13:28:25 +0200
message:
  - Added missing #ifdef FlowEngine condition
modified:
  lib/triangulation/FlowBoundingSphere.cpp
  lib/triangulation/FlowBoundingSphere.h
  lib/triangulation/Network.cpp
  lib/triangulation/Network.h
  pkg/dem/FlowEngine.cpp
  pkg/dem/FlowEngine.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 'lib/triangulation/FlowBoundingSphere.cpp'
--- lib/triangulation/FlowBoundingSphere.cpp	2010-10-19 15:09:03 +0000
+++ lib/triangulation/FlowBoundingSphere.cpp	2010-10-20 11:28:25 +0000
@@ -4,6 +4,7 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
+#ifdef FLOW_ENGINE
 
 #include "def_types.h"
 // #include "def_flow_types.h"
@@ -27,7 +28,6 @@
 // #include "Vue3D.h" //FIXME implicit dependencies will look for this class (out of tree) even ifndef XVIEW
 #endif
 
-#ifdef FLOW_ENGINE
 
 #define FAST
 #define TESS_BASED_FORCES

=== modified file 'lib/triangulation/FlowBoundingSphere.h'
--- lib/triangulation/FlowBoundingSphere.h	2010-10-19 15:09:03 +0000
+++ lib/triangulation/FlowBoundingSphere.h	2010-10-20 11:28:25 +0000
@@ -4,6 +4,7 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
+#ifdef FLOW_ENGINE
 
 #ifndef _FLOWBOUNDINGSPHERE_H
 #define _FLOWBOUNDINGSPHERE_H
@@ -21,7 +22,7 @@
 #include "Vue3D.h" //FIXME implicit dependencies will look for this class (out of tree) even ifndef XVIEW
 #endif
 
-#ifdef FLOW_ENGINE
+
 
 using namespace std;
 

=== modified file 'lib/triangulation/Network.cpp'
--- lib/triangulation/Network.cpp	2010-10-19 15:09:03 +0000
+++ lib/triangulation/Network.cpp	2010-10-20 11:28:25 +0000
@@ -1,3 +1,5 @@
+#ifdef FLOW_ENGINE
+
 #include "def_types.h"
 #include "CGAL/constructions/constructions_on_weighted_points_cartesian_3.h"
 #include <CGAL/Width_3.h>
@@ -12,6 +14,8 @@
 
 #include "Network.h"
 
+
+
 #define FAST
 
 const double ONE_THIRD = 1.0/3.0;
@@ -569,6 +573,7 @@
 	vtk_infinite_cells = Fictious;
 }
 
+#endif //FLOW_ENGINE
 
 // double Network::spherical_triangle_area ( Sphere STA1, Sphere STA2, Sphere STA3, Point PTA1 )
 // {

=== modified file 'lib/triangulation/Network.h'
--- lib/triangulation/Network.h	2010-10-19 15:09:03 +0000
+++ lib/triangulation/Network.h	2010-10-20 11:28:25 +0000
@@ -4,6 +4,7 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
+#ifdef FLOW_ENGINE
 
 #ifndef _NETWORK_H
 #define _NETWORK_H
@@ -16,6 +17,8 @@
 #include "stdafx.h"
 #include "Empilement.h"
 
+
+
 namespace CGT{
 
 struct Boundary
@@ -80,4 +83,6 @@
 
 } //namespaceCGT
 
-#endif
\ No newline at end of file
+#endif
+
+#endif //FLOW_ENGINE
\ No newline at end of file

=== modified file 'pkg/dem/FlowEngine.cpp'
--- pkg/dem/FlowEngine.cpp	2010-10-19 15:09:03 +0000
+++ pkg/dem/FlowEngine.cpp	2010-10-20 11:28:25 +0000
@@ -5,6 +5,7 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
+#ifdef FLOW_ENGINE
 
 #include "FlowEngine.hpp"
 #include<yade/core/Scene.hpp>
@@ -17,7 +18,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#ifdef FLOW_ENGINE
 
 YADE_REQUIRE_FEATURE (CGAL);
 CREATE_LOGGER (FlowEngine);

=== modified file 'pkg/dem/FlowEngine.hpp'
--- pkg/dem/FlowEngine.hpp	2010-10-19 15:09:03 +0000
+++ pkg/dem/FlowEngine.hpp	2010-10-20 11:28:25 +0000
@@ -5,14 +5,14 @@
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
 *************************************************************************/
-
+#ifdef FLOW_ENGINE
 #pragma once
 
 #include<yade/core/PartialEngine.hpp>
 #include<yade/pkg-dem/TriaxialCompressionEngine.hpp>
 #include<yade/lib-triangulation/FlowBoundingSphere.h>
 
-#ifdef FLOW_ENGINE
+
 
 class FlowEngine : public PartialEngine
 {