yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3416
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Wed 2014-05-07 15:29:17 +0200
message:
  -fix Line_Solid_Pore() in Network.
modified:
  lib/triangulation/Network.hpp
  lib/triangulation/Network.ipp


--
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/Network.hpp'
--- lib/triangulation/Network.hpp	2014-01-29 17:06:48 +0000
+++ lib/triangulation/Network.hpp	2014-05-07 13:29:17 +0000
@@ -85,7 +85,6 @@
 		double surface_solid_facet(Sphere ST1, Sphere ST2, Sphere ST3);
 		
 		void Line_Solid_Pore( Cell_handle cell, int j);
-		void Line_Solid_Pore( Cell_handle cell, int j, bool SLIP_ON_LATERALS, bool reuseFacetData=false);
 		double Line_solid_facet(Sphere ST1, Sphere ST2, Sphere ST3);
 
 		int facetF1, facetF2, facetRe1, facetRe2, facetRe3;

=== modified file 'lib/triangulation/Network.ipp'
--- lib/triangulation/Network.ipp	2014-01-31 12:46:31 +0000
+++ lib/triangulation/Network.ipp	2014-05-07 13:29:17 +0000
@@ -573,12 +573,7 @@
 template<class Tesselation>
 void Network<Tesselation>::Line_Solid_Pore(Cell_handle cell, int j)
 {
-  Line_Solid_Pore(cell, j, false, false);//FIXME:SLIP_ON_LATERALS, reuseFacetData ?? (Chao)
-}
-template<class Tesselation>
-void Network<Tesselation>::Line_Solid_Pore(Cell_handle cell, int j, bool SLIP_ON_LATERALS, bool reuseFacetData)
-{
-  if (!reuseFacetData)  facetNFictious=detectFacetFictiousVertices(cell,j);
+  facetNFictious=detectFacetFictiousVertices(cell,j);
   double solidLine = 0; //total of solidLine[j][0], solidLine[j][1], solidLine[j][2]. 
   Sphere v [3];
   Vertex_handle W [3];
@@ -613,15 +608,7 @@
 		Point AA(A[0],A[1],A[2]);
 		Point BB(B[0],B[1],B[2]);
 		Vecteur AB= AA-BB;
-
-//		Boundary &bi = boundary(SV3->info().id());
-//		Vecteur AB= SV1->point() - SV2->point();
-//		AB[bi.coordinate] = 0;//FIXME:can not assign read-only CGAL::Vector_3?
-
-		//FIXME::bi.flowCondition should be considered or not?(chao)
-		if (bi.flowCondition && ! SLIP_ON_LATERALS) {
-                        cell->info().solidLine[j][facetF1]=sqrt(AB.squared_length());
-                } else 	cell->info().solidLine[j][facetF1]=0;
+		cell->info().solidLine[j][facetF1]=sqrt(AB.squared_length());
     }; break;
      case (2) : {
 		Vertex_handle SV1 = cell->vertex(facetVertices[j][facetF1]);
@@ -635,13 +622,8 @@
 		
 		double d13 = bi1.p[bi1.coordinate] - (SV3->point())[bi1.coordinate];
 		double d23 = bi2.p[bi2.coordinate] - (SV3->point())[bi2.coordinate];
-		if (bi1.flowCondition && ! SLIP_ON_LATERALS) {
-			cell->info().solidLine[j][facetF1]= abs(d23); 
-                } else cell->info().solidLine[j][facetF1]=0;
-
-                if (bi2.flowCondition && ! SLIP_ON_LATERALS) {
-			cell->info().solidLine[j][facetF2]= abs(d13);
-                } else cell->info().solidLine[j][facetF2]=0;
+		cell->info().solidLine[j][facetF1]= abs(d23); 
+		cell->info().solidLine[j][facetF2]= abs(d13);
     }; break;
     }