yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3401
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Wed 2014-02-05 19:32:13 +0100
message:
  clean code.
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-02-05 18:23:19 +0000
+++ pkg/dem/UnsaturatedEngine.cpp	2014-02-05 18:32:13 +0000
@@ -205,7 +205,7 @@
     } 
 }
 
-template<class Solver>
+template<class Solver>//update reservoir attr and pressure
 void UnsaturatedEngine::updateReservoir(Solver& flow)
 {
     updatePressure(flow);
@@ -783,8 +783,6 @@
 template<class Solver>
 Real UnsaturatedEngine::getSaturation (Solver& flow )
 {
-//      updateAirReservoir(flow);
-//     updateWaterReservoir(flow);    
     updateReservoir(flow);
     RTriangulation& tri = flow->T[flow->currentTes].Triangulation();
     Real capillary_volume = 0.0; //total capillary volume
@@ -798,7 +796,7 @@
         if (cell->info().isAirReservoir==true) {
             air_volume = air_volume + cell->info().capillaryCellVolume;
         }
-    }cerr<<"air_volume:"<<air_volume<<"  capillary_volume:"<<capillary_volume<<endl;
+    }/*cerr<<"air_volume:"<<air_volume<<"  capillary_volume:"<<capillary_volume<<endl;*/
     Real saturation = 1 - air_volume/capillary_volume;
     return saturation;
 }