yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3449
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Wed 2014-09-10 15:21:52 +0200
message:
  -add debugOut to test isInvadeBoundary=True isPhaseTrapped=True
modified:
  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 'pkg/pfv/UnsaturatedEngine.cpp'
--- pkg/pfv/UnsaturatedEngine.cpp	2014-07-18 15:39:35 +0000
+++ pkg/pfv/UnsaturatedEngine.cpp	2014-09-10 13:21:52 +0000
@@ -337,8 +337,12 @@
 ///invade mode 1: withTrap
 void UnsaturatedEngine::invade1()
 {
+    if(solver->debugOut) {cout<<"----start invade1----"<<endl;}
+
     ///update Pw, Pn according to reservoirInfo.
     updatePressure();
+    if(solver->debugOut) {cout<<"----invade1.updatePressure----"<<endl;}
+    
     ///invadeSingleCell by Pressure difference, only change Pressure.
     RTriangulation& tri = solver->T[solver->currentTes].Triangulation();
     FiniteCellsIterator cellEnd = tri.finite_cells_end();
@@ -346,16 +350,24 @@
         if(cell->info().p() == bndCondValue[3])
             invadeSingleCell(cell,cell->info().p());
     }
+    if(solver->debugOut) {cout<<"----invade1.invadeSingleCell----"<<endl;}
+    
     ///update W, NW reservoirInfo according Pressure, trapped W-phase is marked by isWaterReservoir=False&&isAirReservoir=False.
     updateReservoirs1();
+    if(solver->debugOut) {cout<<"----invade1.update W, NW reservoirInfo----"<<endl;}
+    
     ///search new trapped W-phase, assign trapCapP for trapped W-phase
     checkTrap(bndCondValue[3]-bndCondValue[2]);
+    if(solver->debugOut) {cout<<"----invade1.checkTrap----"<<endl;}
+
     ///update trapped W-phase Pressure
     FiniteCellsIterator ncellEnd = tri.finite_cells_end();
     for ( FiniteCellsIterator ncell = tri.finite_cells_begin(); ncell != ncellEnd; ncell++ ) {
         if( (ncell->info().isWaterReservoir) || (ncell->info().isAirReservoir) ) continue;
         ncell->info().p() = bndCondValue[3] - ncell->info().trapCapP;
     }
+    if(solver->debugOut) {cout<<"----invade1.update trapped W-phase Pressure----"<<endl;}
+    
 }
 
 ///search trapped W-phase, define trapCapP=Pn-Pw.
@@ -378,18 +390,24 @@
         cell->info().isWaterReservoir = false;
         cell->info().isAirReservoir = false;
     }
+    if(solver->debugOut) {cout<<"----updateReservoirs1.initial----"<<endl;}
 
     initWaterReservoirBound();
+    if(solver->debugOut) {cout<<"----updateReservoirs1.initWaterReservoirBound----"<<endl;}
     initAirReservoirBound();
+    if(solver->debugOut) {cout<<"----updateReservoirs1.initAirReservoirBound----"<<endl;}
     
     for (FlowSolver::VCellIterator it = solver->boundingCells[2].begin(); it != solver->boundingCells[2].end(); it++) {
         if ((*it)->info().index == 0) continue;
         waterReservoirRecursion(*it);
     }
+    if(solver->debugOut) {cout<<"----updateReservoirs1.waterReservoirRecursion----"<<endl;}
+    
     for (FlowSolver::VCellIterator it = solver->boundingCells[3].begin(); it != solver->boundingCells[3].end(); it++) {
         if ((*it)->info().index == 0) continue;
         airReservoirRecursion(*it);
     }
+    if(solver->debugOut) {cout<<"----updateReservoirs1.airReservoirRecursion----"<<endl;}
 }
 
 void UnsaturatedEngine::waterReservoirRecursion(CellHandle cell)