yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3013
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2012-02-01 15:42:03 +0100
message:
  - small changes left behind in a previous commit (fix the "undefined IPCells") problem
modified:
  lib/triangulation/FlowBoundingSphere.hpp
  lib/triangulation/PeriodicFlow.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'lib/triangulation/FlowBoundingSphere.hpp'
--- lib/triangulation/FlowBoundingSphere.hpp	2012-01-20 17:31:56 +0000
+++ lib/triangulation/FlowBoundingSphere.hpp	2012-02-01 14:42:03 +0000
@@ -44,7 +44,10 @@
 		bool meanK_LIMIT, meanK_STAT, distance_correction;
 		bool OUTPUT_BOUDARIES_RADII;
 		bool noCache;//flag for checking if cached values cell->unitForceVectors have been defined
+		//Handling imposed pressures on elements in the form of {point,value} pairs, IPCells contains the cell handles corresponding to point
 		vector<pair<Point,Real> > imposedP;
+		vector<Cell_handle> IPCells;
+		
 		void initNewTri () {noCache=true; /*isLinearSystemSet=false; areCellsOrdered=false;*/}//set flags after retriangulation
 		bool permeability_map;
 

=== modified file 'lib/triangulation/PeriodicFlow.cpp'
--- lib/triangulation/PeriodicFlow.cpp	2012-01-25 10:02:04 +0000
+++ lib/triangulation/PeriodicFlow.cpp	2012-02-01 14:42:03 +0000
@@ -398,16 +398,17 @@
                 dp -= cell->info().p();
                 dp_max = std::max(dp_max, std::abs(dp));
                 p_max = std::max(p_max, std::abs(cell->info().shiftedP()));
-                sum_p += std::abs(cell->info().shiftedP());
+                sum_p += cell->info().shiftedP();
                 sum_dp += std::abs(dp);
             }
         }
         p_moy = sum_p/cell2;
         dp_moy = sum_dp/cell2;
 	j++;
-	if (j%100==0) cerr <<"j="<<j<<" p_moy="<<p_moy<<" dp="<< dp_moy<<endl;
+	if (j%100==0) cerr <<"j="<<j<<" p_moy="<<p_moy<<" dp="<< dp_moy<<" p_max="<<p_max<<" dp_max="<<dp_max<<endl;
+	if (j>=40000) cerr<<"GS not converged after 40k iterations, break"<<endl;
 
-    } while ((dp_max/p_max) > tolerance && j<4000 /*&& ( dp_max > tolerance )*//* &&*/ /*( j<50 )*/);
+    } while ((dp_max/p_max) > tolerance && j<40000 /*&& ( dp_max > tolerance )*//* &&*/ /*( j<50 )*/);
 
     int cel=0;
     double Pav=0;