yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3424
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Fri 2014-05-23 16:03:16 +0200
message:
  -test. no big change.
modified:
  lib/triangulation/Network.ipp
  pkg/pfv/UnsaturatedEngine.cpp


--
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.ipp'
--- lib/triangulation/Network.ipp	2014-05-09 14:24:08 +0000
+++ lib/triangulation/Network.ipp	2014-05-23 14:03:16 +0000
@@ -565,7 +565,7 @@
 void Network<Tesselation>::lineSolidPore(CellHandle cell, int j)
 {
   facetNFictious=detectFacetFictiousVertices(cell,j);
-  double solidLine = 0; //total of solidLine[j][0], solidLine[j][1], solidLine[j][2]. 
+  double lSolid = 0; //total of solidLine[j][0], solidLine[j][1], solidLine[j][2]. 
   Sphere v [3];
   VertexHandle W [3];
 
@@ -618,7 +618,7 @@
     }; break;
     }
 
-    double lSolid = cell->info().solidLine[j][0] + cell->info().solidLine[j][1] + cell->info().solidLine[j][2];
+    lSolid = cell->info().solidLine[j][0] + cell->info().solidLine[j][1] + cell->info().solidLine[j][2];
     if (lSolid)
 	cell->info().solidLine[j][3]=1.0/lSolid;
     else cell->info().solidLine[j][3]=0;

=== modified file 'pkg/pfv/UnsaturatedEngine.cpp'
--- pkg/pfv/UnsaturatedEngine.cpp	2014-05-19 17:56:51 +0000
+++ pkg/pfv/UnsaturatedEngine.cpp	2014-05-23 14:03:16 +0000
@@ -1043,10 +1043,9 @@
     FiniteCellsIterator cellEnd = tri.finite_cells_end();
     for ( FiniteCellsIterator cell = tri.finite_cells_begin(); cell != cellEnd; cell++ ) {
         if (tri.is_infinite(cell)) continue;
-	file << cell->info().index << "  " <<cell->info().poreRadius[0]<<" "<<getRadiusMin(cell,0)<<" "<<abs(solver->computeEffectiveRadius(cell, 0))<<endl;
-	file << cell->info().index << "  " <<cell->info().poreRadius[1]<<" "<<getRadiusMin(cell,1)<<" "<<abs(solver->computeEffectiveRadius(cell, 1))<<endl;
-	file << cell->info().index << "  " <<cell->info().poreRadius[2]<<" "<<getRadiusMin(cell,2)<<" "<<abs(solver->computeEffectiveRadius(cell, 2))<<endl;
-	file << cell->info().index << "  " <<cell->info().poreRadius[3]<<" "<<getRadiusMin(cell,3)<<" "<<abs(solver->computeEffectiveRadius(cell, 3))<<endl;
+        for(int i=0; i<4; i++) {
+            file << cell->info().index << "  " <<cell->info().solidLine[i][0]<<"  " <<cell->info().solidLine[i][1]<<"  " <<cell->info().solidLine[i][2]<<"  " <<cell->info().solidLine[i][3]<<endl;
+        }
     }
     file.close();
 }//----------end temp function for Vahid Joekar-Niasar's data (clear later)---------------------
@@ -1143,12 +1142,12 @@
             solver->lineSolidPore(cell, j);
         }
     }
+    if(solver->debugOut) {cout<<"----computeSolidLine-----."<<endl;}
 }
 
 void UnsaturatedEngine::computeFacetPoreForcesWithCache(bool onlyCache)
 {
-	RTriangulation& Tri = solver->T[solver->currentTes].Triangulation();
-	FiniteCellsIterator cellEnd = Tri.finite_cells_end();
+	RTriangulation& Tri = solver->T[currentTes].Triangulation();
 	CVector nullVect(0,0,0);
 	//reset forces
 	if (!onlyCache) for (FiniteVerticesIterator v = Tri.finite_vertices_begin(); v != Tri.finite_vertices_end(); ++v) v->info().forces=nullVect;
@@ -1210,7 +1209,7 @@
 		if (onlyCache) return;
 	} else {//use cached values when triangulation doesn't change
 // 		#ifndef parallel_forces
-		for (FiniteCellsIterator cell = Tri.finite_cells_begin(); cell != cellEnd; cell++) {
+		for (FiniteCellsIterator cell = Tri.finite_cells_begin(); cell != Tri.finite_cells_end(); cell++) {
 			for (int yy=0;yy<4;yy++) cell->vertex(yy)->info().forces = cell->vertex(yy)->info().forces + cell->info().unitForceVectors[yy]*cell->info().p();}
 			
 //  		#else