yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3392
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Tue 2014-01-14 15:04:00 +0100
message:
  -replace cell->info().p  with isAir/WaterReservoir
modified:
  pkg/dem/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/dem/UnsaturatedEngine.cpp'
--- pkg/dem/UnsaturatedEngine.cpp	2014-01-13 16:54:44 +0000
+++ pkg/dem/UnsaturatedEngine.cpp	2014-01-14 14:04:00 +0000
@@ -127,7 +127,7 @@
     double surface_tension = surfaceTension ;
     for (int facet = 0; facet < 4; facet ++) {
         if (flow->T[flow->currentTes].Triangulation().is_infinite(cell->neighbor(facet))) continue;
-        if (cell->neighbor(facet)->info().p() != 0) continue;
+        if (cell->neighbor(facet)->info().p() == bndCondValue[2]) continue;
         if (cell->neighbor(facet)->info().isWaterReservoir == false) continue;
         double n_cell_pe = surface_tension/cell->info().poreRadius[facet];
         if (pressure > n_cell_pe) {
@@ -157,7 +157,7 @@
 
     Finite_cells_iterator _cell_end = flow->T[flow->currentTes].Triangulation().finite_cells_end();
     for ( Finite_cells_iterator _cell = flow->T[flow->currentTes].Triangulation().finite_cells_begin(); _cell != _cell_end; _cell++ ) {
-        if(_cell->info().p() != 0)
+        if(_cell->info().isAirReservoir == true)
             invadeSingleCell2(_cell,_cell->info().p(),flow);
     }
 }
@@ -171,11 +171,10 @@
     double surface_tension = surfaceTension; //Surface Tension in contact with air at 20 Degrees Celsius is:0.0728(N/m)
     Finite_cells_iterator cell_end = flow->T[flow->currentTes].Triangulation().finite_cells_end();
     for ( Finite_cells_iterator cell = flow->T[flow->currentTes].Triangulation().finite_cells_begin(); cell != cell_end; cell++ ) {
-        if (cell->info().p()!=0) {
+        if (cell->info().isAirReservoir == true) {
             for (int facet=0; facet<4; facet ++) {
                 if (flow->T[flow->currentTes].Triangulation().is_infinite(cell->neighbor(facet))) continue;
-                if (cell->neighbor(facet)->info().p()!=0) continue;
-                if (cell->neighbor(facet)->info().isWaterReservoir == false) continue;
+                if ( (cell->neighbor(facet)->info().isAirReservoir == true) || (cell->neighbor(facet)->info().isWaterReservoir == false) ) continue;
                 double n_cell_pe = surface_tension/cell->info().poreRadius[facet];
                 nextEntry = min(nextEntry,n_cell_pe);
             }