yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2328
committer: bchareyre <bchareyre@dt-rv020>
branch nick: trunk
timestamp: Wed 2010-07-07 20:13:32 +0200
message:
  - Remove useless spheresVolume (redundant with  TriaxialStressController::spheresVolume)
modified:
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.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/TriaxialCompressionEngine.cpp'
--- pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-06-08 21:22:07 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp	2010-07-07 18:13:32 +0000
@@ -23,41 +23,6 @@
 CREATE_LOGGER(TriaxialCompressionEngine);
 YADE_PLUGIN((TriaxialCompressionEngine));
 
-// TriaxialCompressionEngine::TriaxialCompressionEngine() : uniaxialEpsilonCurr(strain[1])
-// {
-// 	translationAxis=TriaxialStressController::normal[wall_bottom_id];
-// 	translationAxisx=Vector3r(1,0,0);
-// 	translationAxisz=Vector3r(0,0,1);
-// 	strainRate=0;
-// 	currentStrainRate=0;
-// 	StabilityCriterion=0.001;
-// 	//Phase1=false;
-// 	currentState=STATE_UNINITIALIZED;
-// 	previousState=currentState;
-// 	UnbalancedForce = 1;
-// 	Key = "";
-// 	noFiles=false;
-// 	Phase1End = "Compacted";
-// 	FinalIterationPhase1 = 0;
-// 	Iteration = 0;
-// 	testEquilibriumInterval = 20;
-// 
-// 	autoUnload=true;
-// 	autoCompressionActivation=true;
-// 	autoStopSimulation=true;
-// 
-// 	UnbalancedForce = 1;
-// 	saveSimulation = false;
-// 	firstRun=true;
-// 	previousSigmaIso=sigma_iso;
-// 	frictionAngleDegree = -1;
-// 	epsilonMax = 0.5;
-// 
-// 	fixedPoroCompaction=false;
-//  	boxVolume=0;
-// 	maxStress =0;
-// }
-
 TriaxialCompressionEngine::~TriaxialCompressionEngine()
 {	
 }
@@ -133,13 +98,13 @@
 				computeStressStrain (); // update stress and strain
 			}
 			// stop simulation if unloaded and compression is not activate automatically
-			else if (currentState==STATE_ISO_UNLOADING && !autoCompressionActivation){
-				Omega::instance().stopSimulationLoop();
-			}
+// 			else if (currentState==STATE_ISO_UNLOADING && !autoCompressionActivation){
+// 				Omega::instance().stopSimulationLoop();
+// 			}
 		}
 		else if ( porosity<=fixedPorosity && currentState==STATE_FIXED_POROSITY_COMPACTION )
 		{
-			Omega::instance().stopSimulationLoop();
+// 			Omega::instance().stopSimulationLoop();
 			return;
 		}
 	}
@@ -183,7 +148,7 @@
 	}
 	if ( currentState==STATE_LIMBO && autoStopSimulation )
 	{		
-		Omega::instance().stopSimulationLoop();
+// 		Omega::instance().stopSimulationLoop();
 		return;
 	}
 	TriaxialStressController::action();
@@ -205,7 +170,7 @@
 			State* p_top=Body::byId(wall_top_id,scene)->state.get();
 			p_top->pos -= 0.5*currentStrainRate*height*translationAxis*dt;
 		} else {
-			Omega::instance().stopSimulationLoop();
+// 			Omega::instance().stopSimulationLoop();
 		}
 	}
 	if ( currentState==STATE_FIXED_POROSITY_COMPACTION )

=== modified file 'pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp'
--- pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp	2010-04-26 09:02:51 +0000
+++ pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.hpp	2010-07-07 18:13:32 +0000
@@ -74,7 +74,7 @@
 		
 		///Change physical properties of interactions and/or bodies in the middle of a simulation (change only friction for the moment, complete this function to set cohesion and others before compression test)
 		void setContactProperties(Real frictionDegree);
-
+		
 		YADE_CLASS_BASE_DOC_ATTRS_CTOR_PY(
 		TriaxialCompressionEngine,TriaxialStressController,
 		"The engine is a state machine with the following states; transitions my be automatic, see below.\n\n"
@@ -106,7 +106,6 @@
 		((Real,epsilonMax,0.5,"Value of axial deformation for which the loading must stop"))
 		((Real,uniaxialEpsilonCurr,1,"Current value of axial deformation during confined loading (is reference to strain[1])"))
 		((Real,fixedPoroCompaction,false,"A special type of compaction with imposed final porosity :yref:`TriaxialCompressionEngine::fixedPorosity` (WARNING : can give unrealistic results!)"))
-		((Real,spheresVolume,1,""))
 		((Real,fixedPorosity,0,"Value of porosity chosen by the user"))
 		((Real,maxStress,0,"Max value of stress during the simulation (for post-processing)"))
 		,
@@ -114,7 +113,7 @@
 		translationAxisz=Vector3r(0,0,1);
 		currentState=STATE_UNINITIALIZED;
 		previousState=currentState;
-			Phase1End = "Compacted";
+		Phase1End = "Compacted";
 		FinalIterationPhase1 = 0;
 		Iteration = 0;
 		firstRun=true;
@@ -123,7 +122,7 @@
 		saveSimulation=false;
 		,
 	 	.def("setContactProperties",&TriaxialCompressionEngine::setContactProperties,"Assign a new friction angle (degrees) to dynamic bodies and relative interactions")
-		 )
+		)
 	DECLARE_LOGGER;
 };