yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3519
committer: jduriez <jerome.duriez@xxxxxxxxxxx>
timestamp: Mon 2014-11-03 10:26:48 -0700
message:
  Doc hyperlinks, and erase of commented lines
modified:
  pkg/dem/KinemC__Engine.cpp
  pkg/dem/KinemC__Engine.hpp
  pkg/dem/KinemSimpleShearBox.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/KinemC__Engine.cpp'
--- pkg/dem/KinemC__Engine.cpp	2014-10-15 06:44:01 +0000
+++ pkg/dem/KinemC__Engine.cpp	2014-11-03 17:26:48 +0000
@@ -22,20 +22,13 @@
 
 	if( ((compSpeed > 0) && (current_sigma < targetSigma)) || ((compSpeed < 0) && (current_sigma > targetSigma)) )
 	{
-		if(temoin!=0)
-		{
-// 			cout << "j'ai ici un temoin #0 visiblement. En effet temoin =" <<boost::lexical_cast<string>(temoin) << endl;
-			temoin=0;
-// 			cout << "Maintenant (toujours dans le if temoin!=0), temoin =" <<boost::lexical_cast<string>(temoin) << endl;
-		}
+		if(temoin!=0) temoin=0;
 		
 		letMove(0.0,-compSpeed*dt);
 	}
 	else if (temoin==0)
 	{
 		stopMovement();
-// 		cout << "Mouvement stoppe, temoin = " << boost::lexical_cast<string>(temoin) << endl;
-// 		cout << " Dans le if, temoin =" << boost::lexical_cast<string>(temoin) << endl;
 		string f;
 		if (compSpeed > 0)
 			f="Sigmax_";
@@ -44,7 +37,6 @@
 
 		Omega::instance().saveSimulation(Key + f +boost::lexical_cast<string> (floor(targetSigma)) + "kPaReached.xml");
 		temoin=1;
-// 		cout << " Fin du if, temoin =" << boost::lexical_cast<string>(temoin) << endl << endl;
 	}
 
 	
@@ -57,7 +49,6 @@
 			temoin_save[j]=1;
 		}
 	}
-// 	cout << "Fin de ApplyCondi, temoin = " << boost::lexical_cast<string>(temoin) << endl;
 
 }
 
@@ -117,7 +108,7 @@
 	}
 	else if (temoin<2)
 	{
-		stopMovement();		// INDISPENSABLE !
+		stopMovement();
 		it_stop=scene->iter;
 		cout << "Shear stopped : gammaLim reached at it "<< it_stop << endl;
 		temoin=2;
@@ -156,7 +147,7 @@
 	}
 	else if (temoin<2)
 	{
-		stopMovement();		// INDISPENSABLE !
+		stopMovement();
 		it_stop=scene->iter;
 		cout << "Cisaillement arrete : gammaLim atteint a l'iteration "<< it_stop << endl;
 		temoin=2;

=== modified file 'pkg/dem/KinemC__Engine.hpp'
--- pkg/dem/KinemC__Engine.hpp	2014-10-15 06:44:01 +0000
+++ pkg/dem/KinemC__Engine.hpp	2014-11-03 17:26:48 +0000
@@ -25,7 +25,7 @@
 // 			;
 
 		YADE_CLASS_BASE_DOC_ATTRS_CTOR(KinemCTDEngine,KinemSimpleShearBox,
-			"To compress a simple shear sample by moving the upper box in a vertical way only, so that the tangential displacement (defined by the horizontal gap between the upper and lower boxes) remains constant (thus, the CTD = Constant Tangential Displacement).\n \t The lateral boxes move also to keep always contact. All that until this box is submitted to a given stress (=*targetSigma*). Moreover saves are executed at each value of stresses stored in the vector *sigma_save*, and at *targetSigma*",
+			"To compress a simple shear sample by moving the upper box in a vertical way only, so that the tangential displacement (defined by the horizontal gap between the upper and lower boxes) remains constant (thus, the CTD = Constant Tangential Displacement).\n \t The lateral boxes move also to keep always contact. All that until this box is submitted to a given stress (:yref:`targetSigma<KinemCTDEngine.targetSigma>`). Moreover saves are executed at each value of stresses stored in the vector :yref:`sigma_save<KinemCTDEngine.sigma_save>`, and at :yref:`targetSigma<KinemCTDEngine.targetSigma>`",
 			((Real,compSpeed,0.0,,"(vertical) speed of the upper box : >0 for real compression, <0 for unloading [$m/s$]"))
 			((std::vector<Real>,sigma_save,,,"vector with the values of sigma at which a save of the simulation should be performed [$kPa$]"))
 			((Real,targetSigma,0.0,,"the value of sigma at which the compression should stop [$kPa$]")),
@@ -72,7 +72,7 @@
 
 	
 	YADE_CLASS_BASE_DOC_ATTRS_CTOR(KinemCNLEngine,KinemSimpleShearBox,
-				 "To apply a constant normal stress shear (i.e. Constant Normal Load : CNL) for a parallelogram box (simple shear box : :yref:`SimpleShear` Preprocessor or scripts/simpleShear.py)\n\nThis engine allows one to translate horizontally the upper plate while the lateral ones rotate so that they always keep contact with the lower and upper walls.\n\nIn fact the upper plate can move not only horizontally but also vertically, so that the normal stress acting on it remains constant (this constant value is not chosen by the user but is the one that exists at the beginning of the simulation)\n\nThe right vertical displacements which will be allowed are computed from the rigidity Kn of the sample over the wall (so to cancel a deltaSigma, a normal dplt deltaSigma*S/(Kn) is set)\n\nThe movement is moreover controlled by the user via a *shearSpeed* which will be the speed of the upper wall, and by a maximum value of horizontal displacement *gammalim*, after which the shear stops.\n\n.. note::\n\tNot only the positions of walls are updated but also their speeds, which is all but useless considering the fact that in the contact laws these velocities of bodies are used to compute values of tangential relative displacements.\n\n.. warning::\n\tBecause of this last point, if you want to use later saves of simulations executed with this Engine, but without that stopMovement was executed, your boxes will keep their speeds => you will have to cancel them 'by hand' in the .xml.\n",
+				 "To apply a constant normal stress shear (i.e. Constant Normal Load : CNL) for a parallelogram box (simple shear box : :yref:`SimpleShear` Preprocessor or scripts/simpleShear.py)\n\nThis engine allows one to translate horizontally the upper plate while the lateral ones rotate so that they always keep contact with the lower and upper walls.\n\nIn fact the upper plate can move not only horizontally but also vertically, so that the normal stress acting on it remains constant (this constant value is not chosen by the user but is the one that exists at the beginning of the simulation)\n\nThe right vertical displacements which will be allowed are computed from the rigidity Kn of the sample over the wall (so to cancel a deltaSigma, a normal dplt deltaSigma*S/(Kn) is set)\n\nThe movement is moreover controlled by the user via a :yref:`shearSpeed<KinemCNLEngine.shearSpeed>` which will be the speed of the upper wall, and by a maximum value of horizontal displacement :yref:`gammalim<KinemCNLEngine.gammalim>`, after which the shear stops.\n\n.. note::\n\tNot only the positions of walls are updated but also their speeds, which is all but useless considering the fact that in the contact laws these velocities of bodies are used to compute values of tangential relative displacements.\n\n.. warning::\n\tBecause of this last point, if you want to use later saves of simulations executed with this Engine, but without that stopMovement was executed, your boxes will keep their speeds => you will have to cancel them 'by hand' in the .xml.\n",
 				 ((Real,shearSpeed,0.0,,"the speed at wich the shearing is performed : speed of the upper plate [m/s]"))
 				 ((Real,gammalim,0.0,,"the value of tangential displacement (of upper plate) at wich the shearing is stopped [m]"))
 				 ((Real,gamma,0.0,,"current value of tangential displacement [m]"))
@@ -94,7 +94,7 @@
 		void 	action()
 			;
 	YADE_CLASS_BASE_DOC_ATTRS_CTOR(KinemCNSEngine,KinemSimpleShearBox,
-		"To apply a Constant Normal Stifness (CNS) shear for a parallelogram box (simple shear)\n\nThis engine, useable in simulations implying one deformable parallelepipedic box, allows one to translate horizontally the upper plate while the lateral ones rotate so that they always keep contact with the lower and upper walls. The upper plate can move not only horizontally but also vertically, so that the normal rigidity defined by DeltaF(upper plate)/DeltaU(upper plate) = constant (= *KnC* defined by the user).\n\nThe movement is moreover controlled by the user via a *shearSpeed* which is the horizontal speed of the upper wall, and by a maximum value of horizontal displacement *gammalim* (of the upper plate), after which the shear stops.\n\n.. note::\n\t not only the positions of walls are updated but also their speeds, which is all but useless considering the fact that in the contact laws these velocities of bodies are used to compute values of tangential relative displacements.\n\n.. warning::\n\tBut, because of this last point, if you want to use later saves of simulations executed with this Engine, but without that stopMovement was executed, your boxes will keep their speeds => you will have to cancel them by hand in the .xml",
+		"To apply a Constant Normal Stifness (CNS) shear for a parallelogram box (simple shear)\n\nThis engine, useable in simulations implying one deformable parallelepipedic box, allows one to translate horizontally the upper plate while the lateral ones rotate so that they always keep contact with the lower and upper walls. The upper plate can move not only horizontally but also vertically, so that the normal rigidity defined by DeltaF(upper plate)/DeltaU(upper plate) = constant (= :yref:`KnC<KinemCNSEngine.KnC>` defined by the user).\n\nThe movement is moreover controlled by the user via a :yref:`shearSpeed<KinemCNLEngine.shearSpeed>` which is the horizontal speed of the upper wall, and by a maximum value of horizontal displacement :yref:`gammalim<KinemCNLEngine.gammalim>` (of the upper plate), after which the shear stops.\n\n.. note::\n\t not only the positions of walls are updated but also their speeds, which is all but useless considering the fact that in the contact laws these velocities of bodies are used to compute values of tangential relative displacements.\n\n.. warning::\n\tBut, because of this last point, if you want to use later saves of simulations executed with this Engine, but without that stopMovement was executed, your boxes will keep their speeds => you will have to cancel them by hand in the .xml",
 		((Real,shearSpeed,0.0,,"the speed at wich the shearing is performed : speed of the upper plate [m/s]"))
 		((Real,gammalim,0.0,,"the value of tangential displacement (of upper plate) at wich the shearing is stopped [m]"))
 		((Real,gamma,0.0,,"current value of tangential displacement [m]"))

=== modified file 'pkg/dem/KinemSimpleShearBox.cpp'
--- pkg/dem/KinemSimpleShearBox.cpp	2014-10-15 06:44:01 +0000
+++ pkg/dem/KinemSimpleShearBox.cpp	2014-11-03 17:26:48 +0000
@@ -48,7 +48,6 @@
 {
 
 	if(LOG)	cout << "It : " << scene->iter << endl;
-// 	computeDu();
 
 // 	const Real& dt = scene->dt; // dt value obtained by getBoxes_Dt
 
@@ -152,24 +151,9 @@
 	
 	if(firstRun)
 	{
-// 		if ( !myLdc )	// FIXME : reenable this feature since Law2 is a functor ?? But difference in stiffnesses normally now taken into account
-// 		{
-// 			vector<shared_ptr<Engine> >::iterator itFirst = scene->engines.begin();
-// 			vector<shared_ptr<Engine> >::iterator itLast = scene->engines.end();
-// 			for ( ;itFirst!=itLast; ++itFirst )
-// 			{
-// 				if ( ( *itFirst )->getClassName() == "Law2_ScGeom6D_NormalInelasticityPhys_NormalInelasticity" ) 
-// 				{
-// 					myLdc =  YADE_PTR_CAST<Law2_ScGeom6D_NormalInelasticityPhys_NormalInelasticity> ( *itFirst );
-// 					coeff_dech = myLdc ->coeff_dech;
-// 					if(LOG) cout << "Law2_ScGeom6D_NormalInelasticityPhys_NormalInelasticity engine found, with coeff_dech = " << coeff_dech << endl;
-// 				}
-// 			}
-// 		}
 
 		alpha=Mathr::PI/2.0;;
 		y0 = topbox->state->pos.y();
-// 		cout << "y0 initialise à : " << y0 << endl;
 		f0 = fSup.y();
 		firstRun=false;
 	}
@@ -179,9 +163,6 @@
 	Real hCurrent = topbox->state->pos.y();
 	computeScontact();
 	Real fDesired = f0 + KnC * 1.0e9 * Scontact * (hCurrent-y0); // The value of the force desired, with the fact that KnC is in MPa/mm 
-// 	cout << "Je veux atteindre a cet it fDesired = "<< fDesired << endl;
-// 	cout << "Alors que f0 =  = "<< f0 << endl;
-// 	cout << "Car terme correctif = " << KnC * 1.0e9 * Scontact * (hCurrent-y0)<< endl;
 
 	if( stiffness==0 )
 	{