yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2061
committer: jduriez <jduriez@c1solimara-l>
branch nick: trunk
timestamp: Wed 2010-03-03 17:19:21 +0100
message:
  Suppressing of commented lines
modified:
  pkg/common/Engine/PartialEngine/CinemKNCEngine.cpp
  pkg/common/Engine/PartialEngine/CinemKNCEngine.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/common/Engine/PartialEngine/CinemKNCEngine.cpp'
--- pkg/common/Engine/PartialEngine/CinemKNCEngine.cpp	2010-03-03 16:03:23 +0000
+++ pkg/common/Engine/PartialEngine/CinemKNCEngine.cpp	2010-03-03 16:19:21 +0000
@@ -18,24 +18,6 @@
 YADE_PLUGIN((CinemKNCEngine));
 
 
-// CinemKNCEngine::CinemKNCEngine() : leftbox(new Body), rightbox(new Body), frontbox(new Body), backbox(new Body), topbox(new Body), boxbas(new Body)
-// {
-// 	firstRun=true;
-// 	shearSpeed=0;
-// 	alpha=Mathr::PI/2.0;;
-// 	gamma=0;
-// 	gammalim=0;
-// 	id_topbox=3;
-// 	id_boxbas=1;
-// 	id_boxleft=0;
-// 	id_boxright=2;
-// 	id_boxfront=5;
-// 	id_boxback=4;
-// 	F_0=0;
-// 	Key="";
-// }
-
-
 void CinemKNCEngine::applyCondition(Scene * ncb)
 {
 	if(LOG) cerr << "debut applyCondi !!" << endl;
@@ -46,8 +28,6 @@
 	topbox = Body::byId(id_topbox);
 	boxbas = Body::byId(id_boxbas);
 	
-// 	shared_ptr<BodyContainer> bodies = ncb->bodies;
-
 	if(gamma<=gammalim)
 	{
 		letMove(ncb);
@@ -257,5 +237,3 @@
 
 
 
-// YADE_REQUIRE_FEATURE(PHYSPAR);
-

=== modified file 'pkg/common/Engine/PartialEngine/CinemKNCEngine.hpp'
--- pkg/common/Engine/PartialEngine/CinemKNCEngine.hpp	2010-03-03 16:03:23 +0000
+++ pkg/common/Engine/PartialEngine/CinemKNCEngine.hpp	2010-03-03 16:19:21 +0000
@@ -14,17 +14,6 @@
 #include<yade/lib-base/Math.hpp>
 #include<yade/pkg-dem/NormalInelasticityLaw.hpp>
 
-/*! \brief To apply a constant normal rigidity shear for a parallelogram box (simple shear)
-
-This engine, used in simulations issued from "DirectShearCis" Preprocessor, allows to translate horizontally the upper plate while the lateral ones rotate so that they always keep contact with the lower and upper walls
-In fact 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)
-The 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.
-
-
-Nota : 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
-
-!!WARNING!! : But, 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
-*/
 
 
 class CinemKNCEngine : public PartialEngine