yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2026
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Sun 2010-02-14 23:32:05 +0100
message:
  - Fix compile errors with cgal in features.
modified:
  lib/triangulation/FlowBoundingSphere.cpp
  lib/triangulation/FlowBoundingSphere.h
  lib/triangulation/Tesselation.cpp
  pkg/dem/Engine/PartialEngine/FlowEngine.cpp
  pkg/dem/Engine/PartialEngine/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-02-10 15:37:31 +0000
+++ lib/triangulation/FlowBoundingSphere.cpp	2010-02-14 22:32:05 +0000
@@ -17,7 +17,7 @@
 #ifdef XVIEW
 #include "Vue3D.h"
 #endif
-#define FLOW_ENGINE
+
 #ifdef FLOW_ENGINE
 
 using namespace std;

=== modified file 'lib/triangulation/FlowBoundingSphere.h'
--- lib/triangulation/FlowBoundingSphere.h	2010-02-10 15:37:31 +0000
+++ lib/triangulation/FlowBoundingSphere.h	2010-02-14 22:32:05 +0000
@@ -12,7 +12,7 @@
 #ifdef XVIEW
 #include "Vue3D.h"
 #endif
-#define FLOW_ENGINE
+
 #ifdef FLOW_ENGINE
 
 

=== modified file 'lib/triangulation/Tesselation.cpp'
--- lib/triangulation/Tesselation.cpp	2010-02-09 00:43:48 +0000
+++ lib/triangulation/Tesselation.cpp	2010-02-14 22:32:05 +0000
@@ -80,7 +80,7 @@
 	if ( !redirected )
 	{
 		//Set size of the redirection vector
-		if ( ( max_id+1 ) != vertexHandles.size() ) vertexHandles.resize ( max_id+1 );
+		if ( (unsigned int)max_id+1 != vertexHandles.size() ) vertexHandles.resize ( max_id+1 );
 		//cout << "!redirected" << endl;
 		max_id = 0;
 		Finite_vertices_iterator vertices_end = Tri->finite_vertices_end ();
@@ -91,7 +91,7 @@
 			//if ( ! ( V_it->info().isFictious ) ) vertexHandles[V_it->info().id() ]= V_it;
 			//std::cout<< "Cell " << V_it->info().id() << ": v=" << V_it->info().v() << std::endl;
 		}
-		if ( ( max_id+1 ) != vertexHandles.size() ) vertexHandles.resize ( max_id+1 );
+		if ( (unsigned int)max_id+1 != vertexHandles.size() ) vertexHandles.resize ( max_id+1 );
 		redirected = true;
 	} else return false;
 	return true;

=== modified file 'pkg/dem/Engine/PartialEngine/FlowEngine.cpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.cpp	2010-02-10 15:37:31 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.cpp	2010-02-14 22:32:05 +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>
@@ -14,13 +15,8 @@
 #include<yade/pkg-common/Wall.hpp>
 #include<yade/pkg-common/Box.hpp>
 
-#include<yade/pkg-dem/TriaxialCompressionEngine.hpp>
-
-#include<yade/lib-triangulation/KinematicLocalisationAnalyser.hpp>
-#include<yade/lib-triangulation/FlowBoundingSphere.h>
-
 YADE_REQUIRE_FEATURE (CGAL);
-CREATE_LOGGER ( FlowEngine );
+CREATE_LOGGER (FlowEngine);
 
 std::ofstream plotFile ( "plot2",std::ios::out );
 
@@ -35,7 +31,7 @@
 	compute_K=true;
 	unload=false;
 	tess_based_force=true;
-	flow = shared_ptr<CGT::FlowBoundingSphere> ( new CGT::FlowBoundingSphere );
+	flow = shared_ptr<CGT::FlowBoundingSphere> (new CGT::FlowBoundingSphere);
 }
 
 
@@ -574,6 +570,8 @@
 }
 
 YADE_PLUGIN ( ( FlowEngine ) );
+#endif //FLOW_ENGINE
+
 // YADE_REQUIRE_FEATURE(PHYSPAR);
 
 // 		if ( !cell->info().isFictious )

=== modified file 'pkg/dem/Engine/PartialEngine/FlowEngine.hpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.hpp	2010-02-10 15:37:31 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.hpp	2010-02-14 22:32:05 +0000
@@ -12,10 +12,6 @@
 #include<yade/pkg-dem/TriaxialCompressionEngine.hpp>
 #include<yade/lib-triangulation/FlowBoundingSphere.h>
 
-// class TriaxialCompressionEngine;
-// class FlowBoundingSphere;
-// class Tesselation;
-
 class FlowEngine : public PartialEngine
 {
 	private: