yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3374
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Mon 2013-06-10 19:06:07 +0200
message:
  -add isWaterReservoir, isAirReservoir.
modified:
  lib/triangulation/def_types.h


--
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 'lib/triangulation/def_types.h'
--- lib/triangulation/def_types.h	2013-05-30 16:26:39 +0000
+++ lib/triangulation/def_types.h	2013-06-10 17:06:07 +0000
@@ -88,6 +88,8 @@
 	unsigned int index;
 	int volumeSign;
 	bool Pcondition;
+	bool isWaterReservoir;
+	bool isAirReservoir;
 	Real invVoidV;
 	Real t;
 	int fict;
@@ -107,14 +109,14 @@
 	std::vector<double> RayHydr;
 // 	std::vector<double> flow_rate;
 	std::vector<double> module_permeability;
-	std::vector<double> pore_radius;
+	std::vector<double> poreRadius;
 	// Partial surfaces of spheres in the double-tetrahedron linking two voronoi centers. [i][j] is for sphere facet "i" and sphere facetVertices[i][j]. Last component for 1/sum_surfaces in the facet.
 	double solidSurfaces [4][4];
 
 	FlowCellInfo (void)
 	{
 		module_permeability.resize(4, 0);
-		pore_radius.resize(4, 0);
+		poreRadius.resize(4, 0);
 		cell_force.resize(4);
 		facetSurfaces.resize(4);
 		facetFluidSurfacesRatio.resize(4);
@@ -124,7 +126,7 @@
 		RayHydr.resize(4, 0);
 // 		isInside = false;
 		inv_sum_k=0;
-		isFictious=false; Pcondition = false; isGhost = false;
+		isFictious=false; Pcondition = false; isGhost = false; isWaterReservoir = false; isAirReservoir = false;
 // 		isInferior = false; isSuperior = false; isLateral = false; isExternal=false;
 		isvisited = false;
 		index=0;