yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3716
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Fri 2013-08-30 15:07:40 +0200
message:
  add #ifdef LINSOLV guards in appropriate places in case someone (e.g. buildbot) compiles without cholmod
modified:
  pkg/dem/FlowEngine.cpp
  pkg/dem/FlowEngine.hpp


--
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/dem/FlowEngine.cpp'
--- pkg/dem/FlowEngine.cpp	2013-08-30 12:15:17 +0000
+++ pkg/dem/FlowEngine.cpp	2013-08-30 13:07:40 +0000
@@ -220,7 +220,7 @@
         flow->x_min = 1000.0, flow->x_max = -10000.0, flow->y_min = 1000.0, flow->y_max = -10000.0, flow->z_min = 1000.0, flow->z_max = -10000.0;
 }
 
-
+#ifdef LINSOLV
 template<class Solver>
 void FlowEngine::setForceMetis ( Solver& flow, bool force )
 {
@@ -232,6 +232,7 @@
 
 template<class Solver>
 bool FlowEngine::getForceMetis ( Solver& flow ) {return (flow->eSolver.cholmod().nmethods==1);}
+#endif
 
 template<class Solver>
 void FlowEngine::Build_Triangulation ( Solver& flow )

=== modified file 'pkg/dem/FlowEngine.hpp'
--- pkg/dem/FlowEngine.hpp	2013-08-30 11:10:45 +0000
+++ pkg/dem/FlowEngine.hpp	2013-08-30 13:07:40 +0000
@@ -59,8 +59,10 @@
 		int ReTrg;
 		int ellapsedIter;
 		TPL void initSolver (Solver& flow);
+		#ifdef LINSOLV
 		TPL void setForceMetis (Solver& flow, bool force);
 		TPL bool getForceMetis (Solver& flow);
+		#endif
 		TPL void Triangulate (Solver& flow);
 		TPL void AddBoundary (Solver& flow);
 		TPL void Build_Triangulation (double P_zero, Solver& flow);