yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2041
committer: Emanuele Catalano <ecatalano@r2balme>
branch nick: trunk
timestamp: Fri 2010-02-19 14:31:48 +0100
message:
  Forgot to delete some line.
modified:
  pkg/dem/Engine/PartialEngine/FlowEngine.cpp
  pkg/dem/Engine/PartialEngine/FlowEngine.hpp


--
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 'pkg/dem/Engine/PartialEngine/FlowEngine.cpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.cpp	2010-02-19 11:12:48 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.cpp	2010-02-19 13:31:48 +0000
@@ -19,15 +19,9 @@
 YADE_REQUIRE_FEATURE (CGAL);
 CREATE_LOGGER (FlowEngine);
 
-std::ofstream cons_DAMP ("cons_DAMP", std::ios::out);
-std::ofstream cons_NONDAMP ("cons_NONDAMP", std::ios::out);
-std::ofstream settle_DAMP ("settle_DAMP", std::ios::out);
-std::ofstream settle_NONDAMP ("settle_NONDAMP", std::ios::out);
-
 FlowEngine::~FlowEngine()
 {
 }
-
 void FlowEngine::applyCondition ( Scene* ncb )
 {
 	if (!flow) {flow = shared_ptr<CGT::FlowBoundingSphere> (new CGT::FlowBoundingSphere);first=true;}
@@ -97,11 +91,6 @@
 			
 			flow->PermeameterCurve(flow->T[currentTes].Triangulation(), g, time);
 			
-			if (damped) {cons_DAMP << j << " " << time << " " << flow->Pressures[cons] << endl; cons++;}
-			if (!damped){cons_NONDAMP << j << " " << time << " " << flow->Pressures[cons] << endl; cons++;}
-			if (damped) {settle_DAMP << j << " " << time << " " << triaxialCompressionEngine->uniaxialEpsilonCurr << endl;}
-			if (!damped) {settle_NONDAMP << j << " " << time << " " << triaxialCompressionEngine->uniaxialEpsilonCurr << endl;}
-			
 			if ( Omega::instance().getCurrentIteration() % PermuteInterval == 0 )
 			{
 // 				flow->Sample_Permeability ( flow->T[currentTes].Triangulation(), flow->x_min, flow->x_max, flow->y_min, flow->y_max, flow->z_min, flow->z_max );

=== modified file 'pkg/dem/Engine/PartialEngine/FlowEngine.hpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.hpp	2010-02-19 11:12:48 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.hpp	2010-02-19 13:31:48 +0000
@@ -59,7 +59,7 @@
 					((Real,loadFactor,1.5,"Load multiplicator for oedometer test"))
 					((bool,unload,false,"Remove the load in oedometer test"))
 					((bool,tess_based_force,true,"true=force computation based on tessalation, false=force computation based on triangulation")));
-	DECLARE_LOGGER;
+		DECLARE_LOGGER;
 };
 
 REGISTER_SERIALIZABLE(FlowEngine);