yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2686
committer: Emanuele Catalano <catalano@xxxxxxxxxxx
branch nick: yade
timestamp: Thu 2011-01-27 16:59:39 +0100
message:
  - Fixed compilation errors
modified:
  lib/triangulation/FlowBoundingSphere.cpp
  pkg/dem/FlowEngine.cpp


--
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	2011-01-27 15:25:09 +0000
+++ lib/triangulation/FlowBoundingSphere.cpp	2011-01-27 15:59:39 +0000
@@ -299,13 +299,7 @@
 }
 
 void FlowBoundingSphere::Average_Cell_Velocity()
-{
-	double ranchx = (x_max - x_min)/3;
-	double ranchy = (y_max - y_min)/3;
-	double ranchz = (z_max - z_min)/3;
-  
-	bool yes = false;
-	
+{  
         RTriangulation& Tri = T[currentTes].Triangulation();
         Point pos_av_facet;
         int num_cells = 0;
@@ -363,8 +357,7 @@
 	
 	for (Finite_vertices_iterator V_it = Tri.finite_vertices_begin(); V_it !=  vertices_end; V_it++) {
 	  VelocityVolumes[V_it->info().id()]=CGAL::NULL_VECTOR;
-	  Volumes[V_it->info().id()]=0.f;
-	  correction[V_it->info().id()]=false;}
+	  Volumes[V_it->info().id()]=0.f;}
 	
 	Finite_cells_iterator cell_end = Tri.finite_cells_end();
 	for ( Finite_cells_iterator cell = Tri.finite_cells_begin(); cell != cell_end; cell++ )

=== modified file 'pkg/dem/FlowEngine.cpp'
--- pkg/dem/FlowEngine.cpp	2011-01-27 15:25:09 +0000
+++ pkg/dem/FlowEngine.cpp	2011-01-27 15:59:39 +0000
@@ -129,7 +129,7 @@
 		Update_Triangulation = false;
 	}
 
-	if (velocity_profile) /*flow->FluidVelocityProfile();*/flow->Average_Grain_Velocity();
+	if (velocity_profile) /*flow->FluidVelocityProfile();*/flow->Average_Fluid_Velocity();
 	if (liquefaction) bottom_seabed_pressure=flow->Measure_bottom_Pore_Pressure();
 
 	first=false;