The following commit has been merged in the master branch:
commit f5a454a629ba49c64dd3d9aab665e0d879f038e2
Author: Anton Gladky <[email protected]>
Date: Thu Jun 23 20:54:02 2011 +0200
Delete patches, applied by upstream in 0.60.3 release.
diff --git a/debian/patches/fix_absent_syncSizesOfContainers.patch
b/debian/patches/fix_absent_syncSizesOfContainers.patch
deleted file mode 100644
index 1f60a8d..0000000
--- a/debian/patches/fix_absent_syncSizesOfContainers.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Added syncSizesOfContainers to forceContainer::reset() for the
case of not using NewtonIntegrator in scripts
-Author: Anton Gladky <[email protected]>
-Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2571
-Last-Update: 2011-05-04
-
---- a/core/ForceContainer.hpp
-+++ b/core/ForceContainer.hpp
-@@ -152,6 +152,7 @@
- /*! Reset all data, also reset summary forces/torques and mark
the container clean. */
- // perhaps should be private and friend Scene or whatever the
only caller should be
- void reset(long iter){
-+ syncSizesOfContainers();
- for(int thread=0; thread<nThreads; thread++){
- memset(&_forceData
[thread][0],0,sizeof(Vector3r)*sizeOfThreads[thread]);
-
memset(&_torqueData[thread][0],0,sizeof(Vector3r)*sizeOfThreads[thread]);
diff --git a/debian/patches/fix_compilation_with_eigen3.patch
b/debian/patches/fix_compilation_with_eigen3.patch
deleted file mode 100644
index fa4ac0e..0000000
--- a/debian/patches/fix_compilation_with_eigen3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix compilation with Eigen3
-Author: Anton Gladky <[email protected]>
-Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2572
-Last-Update: 2011-06-07
-
---- a/pkg/common/Gl1_NormPhys.cpp
-+++ b/pkg/common/Gl1_NormPhys.cpp
-@@ -64,9 +64,9 @@
- glTranslatef(p1[0],p1[1],p1[2]);
- Quaternionr
q(Quaternionr().setFromTwoVectors(Vector3r(0,0,1),relPos/dist /* normalized
*/));
- // using Transform with OpenGL:
http://eigen.tuxfamily.org/dox/TutorialGeometry.html
-- #if EIGEN_MAJOR_VERSION<20 //Eigen3 definition,
while it is not realized
-+ #if EIGEN_WORLD_VERSION==2
- glMultMatrixd(Eigen::Transform3d(q).data());
-- #else
-+ #elif EIGEN_WORLD_VERSION==3
- glMultMatrixd(Eigen::Affine3d(q).data());
- #endif
- glColor3v(color);
---- a/pkg/dem/DomainLimiter.cpp
-+++ b/pkg/dem/DomainLimiter.cpp
-@@ -226,11 +226,11 @@
-
- // switch to local coordinates
- glTranslatev(tester->contPt);
-- #if EIGEN_MAJOR_VERSION<20 //Eigen3 definition, while it
is not realized
-- glMultMatrixd(Eigen::Transform3d(tester->trsf).data());
-- #else
-- glMultMatrixd(Eigen::Affine3d(tester->trsf).data());
-- #endif
-+ #if EIGEN_WORLD_VERSION==2
-+ glMultMatrixd(Eigen::Transform3d(tester->trsf).data());
-+ #elif EIGEN_WORLD_VERSION==3
-+ glMultMatrixd(Eigen::Affine3d(tester->trsf).data());
-+ #endif
-
-
- glDisable(GL_LIGHTING);
diff --git a/debian/patches/fix_force_applying_to_non_existing_body.patch
b/debian/patches/fix_force_applying_to_non_existing_body.patch
deleted file mode 100644
index 749c537..0000000
--- a/debian/patches/fix_force_applying_to_non_existing_body.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix crash, when force applied to non existing body
-Author: Anton Gladky <[email protected]>
-Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2570
-Last-Update: 2011-04-21
-
---- a/pkg/common/ForceEngine.cpp
-+++ b/pkg/common/ForceEngine.cpp
-@@ -14,7 +14,7 @@
-
- void ForceEngine::action(){
- FOREACH(Body::id_t id, ids){
-- assert(scene->bodies->exists(id));
-+ if (!(scene->bodies->exists(id))) continue;
- scene->forces.addForce(id,force);
- }
- }
---- a/pkg/common/PressTestEngine.cpp
-+++ b/pkg/common/PressTestEngine.cpp
-@@ -7,7 +7,7 @@
- if (curentDirection != stop) {
- if (curentDirection==forward) {
///<Forward direction of the
press
- FOREACH(Body::id_t id, ids){
-- assert(scene->bodies->exists(id));
-+ if (!(scene->bodies->exists(id))) continue;
- currentVerticalForce =
scene->forces.getForce(id)[2]; ///<Define current vertical force
- minimalForce = maxVerticalForce*0.1;
///<Define minimal edge
of the force (10% from Maximal)
- minimalPredictedForce = predictedForce*0.1;
///<Define minimal edge of the
Predicted force (10% from Predicted)
diff --git a/debian/patches/fix_memory_wrong_accces_after_body_erase.patch
b/debian/patches/fix_memory_wrong_accces_after_body_erase.patch
deleted file mode 100644
index 8fd9192..0000000
--- a/debian/patches/fix_memory_wrong_accces_after_body_erase.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: fix "wrong memory access" in CpmStateUpdater after body erase
-Author: Jan Stránský <[email protected]>
-Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2569
-Last-Update: 2011-04-13
-
---- a/pkg/dem/ConcretePM.cpp
-+++ b/pkg/dem/ConcretePM.cpp
-@@ -394,6 +394,7 @@
- assert(bodyStats[0].nCohLinks==0); // should be initialized by dfault
ctor
- avgRelResidual=0; Real nAvgRelResidual=0;
- FOREACH(const shared_ptr<Interaction>& I, *scene->interactions){
-+ if(!I) continue;
- if(!I->isReal()) continue;
- shared_ptr<CpmPhys> phys=dynamic_pointer_cast<CpmPhys>(I->phys);
- if(!phys) continue;
-@@ -421,6 +422,7 @@
- nAvgRelResidual+=1;
- }
- FOREACH(shared_ptr<Body> B, *scene->bodies){
-+ if (!B) continue;
- const Body::id_t& id=B->getId();
- // add damaged contacts that have already been deleted
- CpmState* state=dynamic_cast<CpmState*>(B->state.get());
diff --git a/debian/patches/fix_spelling_errors.patch
b/debian/patches/fix_spelling_errors.patch
deleted file mode 100644
index d6cbeb0..0000000
--- a/debian/patches/fix_spelling_errors.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Description: fix spelling errors
-Author: Anton Gladky <[email protected]>
-Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2568
-Last-Update: 2011-04-13
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -126,7 +126,7 @@
- * lib/serialization-qt/FundamentalHandler.tpp: Hopefully all
- xml-parser-offensive characters are escaped at string serialization,
- and unescaped at deserialization. We use standard SGML escapes
(newline=&br;
-- tab=&tab; <=<) and so on now. This allows to save
-+ tab=&tab; <=<) and so on now. This allows one to save
- XML-as-string in the xml itself (used for DisplayParameters).
-
- * gui/qt3/GLViewer.cpp: GLViewer now properly saves what XYZ planes
-@@ -854,12 +854,12 @@
- - 'C' key centers scene on selected body
- - 'D' sets the 'isDynamic' flag of selected body. (select it twice to unset
this flag).
- - Finally 3D lattice works with torsion and bending. There is bending
stiffness, and torsion stiffness.
-- - flag that allows to enable/disable calculating of torsion in lattice
-+ - flag that allows one to enable/disable calculating of torsion in lattice
- - LatticeExample FileGenerator can now generate a 3D tetrahedral regular
grid. (before there was only orthogonal grid)
-
- r.1008
- - Omega throws when loading bad simulation file
-- - NullGUI allows to call a FileGenerator
-+ - NullGUI allows one to call a FileGenerator
- - Lattice 3D is working with bending stiffness. Now I must add torsional
stiffness.
- - also renamed: ./yade-scripts/renameClassFirst volatileInteractions
transientInteractions
- - added GLDrawStateFunctor. So now it is possible to see bodies' velocity,
acceleration, angularVelocity, angularAcceleration. And other State attributes
of a body.
---- a/NEWS
-+++ b/NEWS
-@@ -15,7 +15,7 @@
- - separated State and (possibly shared) Material for bodies
- - InsertionSortCollider handles both periodic and aperiodic
simulations now
- - Cell can undergo arbitrary linear transformation during
simulation
-- - VTKRecorder saves to VTK-compatible XML files; allows to use
Paraview for post-processing
-+ - VTKRecorder saves to VTK-compatible XML files; allows one to
use Paraview for post-processing
- - NewtonIntegrator features integration of rotation of
non-spherical bodies
- - callback functionality for interaction and body loop
(InteractionDispatchers and NewtonIntegrator) (not yet fully done)
- - body and interaction containers devirtualized
(https://blueprints.launchpad.net/yade/+spec/devirtualize-containers)
---- a/doc/sphinx/prog.rst
-+++ b/doc/sphinx/prog.rst
-@@ -1660,7 +1660,7 @@
- /* ... */
- };
-
--This allows to construct :yref:`Body` objects from functions such as
:yref:`yade.utils.sphere` only by knowing the requires :yref:`Material` type,
enforcing the expectation of the model implementor.
-+This allows one to construct :yref:`Body` objects from functions such as
:yref:`yade.utils.sphere` only by knowing the requires :yref:`Material` type,
enforcing the expectation of the model implementor.
-
-
- Runtime structure
---- a/pkg/dem/CohesiveFrictionalPM.cpp
-+++ b/pkg/dem/CohesiveFrictionalPM.cpp
-@@ -22,7 +22,7 @@
- Real Dtensile=phys->FnMax/phys->kn;
- Real Dsoftening = phys->strengthSoftening*Dtensile;
-
-- /*to set the equilibrium distance between all cohesive elements when
they first meet -> allows to work with initial stress-free assembly*/
-+ /*to set the equilibrium distance between all cohesive elements when
they first meet -> allows one to work with initial stress-free assembly*/
- if ( contact->isFresh(scene) ) { phys->initD = displN;
phys->normalForce = Vector3r::Zero(); phys->shearForce = Vector3r::Zero();}
- Real D = displN - phys->initD; // interparticular distance is computed
depending on the equilibrium distance
-
---- a/pkg/dem/Disp2DPropLoadEngine.hpp
-+++ b/pkg/dem/Disp2DPropLoadEngine.hpp
-@@ -53,7 +53,7 @@
- void postLoad(Disp2DPropLoadEngine&);
-
- YADE_CLASS_BASE_DOC_ATTRS_CTOR(Disp2DPropLoadEngine,BoundaryController,
-- "Disturbs a simple shear sample in a given displacement
direction\n\nThis engine allows to apply, on a simple shear sample, a loading
controlled by du/dgamma = cste, which is equivalent to du + cste' * dgamma = 0
(proportionnal path loadings).\nTo do so, the upper plate of the simple shear
box is moved in a given direction (corresponding to a given du/dgamma), whereas
lateral plates are moved so that the box remains closed.\nThis engine can
easily be used to perform directionnal probes, with a python script launching
successivly the same .xml which contains this engine, after having modified the
direction of loading (see *theta* attribute). That's why this Engine contains a
*saveData* procedure which can save data on the state of the sample at the end
of the loading (in case of successive loadings - for successive directions -
through a python script, each line would correspond to one direction of
loading).",
-+ "Disturbs a simple shear sample in a given displacement
direction\n\nThis engine allows one to apply, on a simple shear sample, a
loading controlled by du/dgamma = cste, which is equivalent to du + cste' *
dgamma = 0 (proportionnal path loadings).\nTo do so, the upper plate of the
simple shear box is moved in a given direction (corresponding to a given
du/dgamma), whereas lateral plates are moved so that the box remains
closed.\nThis engine can easily be used to perform directionnal probes, with a
python script launching successivly the same .xml which contains this engine,
after having modified the direction of loading (see *theta* attribute). That's
why this Engine contains a *saveData* procedure which can save data on the
state of the sample at the end of the loading (in case of successive loadings -
for successive directions - through a python script, each line would correspond
to one direction of loading).",
- ((Body::id_t,id_topbox,3,,"the id of the upper wall"))
- ((Body::id_t,id_boxbas,1,,"the id of the lower wall"))
- ((Body::id_t,id_boxleft,0,,"the id of the left wall"))
---- a/pkg/dem/KinemCNLEngine.hpp
-+++ b/pkg/dem/KinemCNLEngine.hpp
-@@ -27,7 +27,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 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 *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",
- ((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]"))
---- a/pkg/dem/KinemCNSEngine.hpp
-+++ b/pkg/dem/KinemCNSEngine.hpp
-@@ -25,7 +25,7 @@
-
-
- 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 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 (= *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",
- ((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]"))
---- a/pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp
-+++ b/pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp
-@@ -22,7 +22,7 @@
- #include <string>
-
- /**
--This law allows to take into account capillary forces/effects between spheres
coming from the presence of interparticular liquid bridges (menisci).
-+This law allows one to take into account capillary forces/effects between
spheres coming from the presence of interparticular liquid bridges (menisci).
- refs:
- - (french, lot of documentation) L. Scholtes, PhD thesis ->
http://tel.archives-ouvertes.fr/tel-00363961/en/
- - (english, less...) L. Scholtes et al. Micromechanics of granular materials
with capillary effects. International Journal of Engineering Science
2009,(47)1, 64-75
-@@ -94,7 +94,7 @@
- void postLoad(Law2_ScGeom_CapillaryPhys_Capillarity&);
-
-
--
YADE_CLASS_BASE_DOC_ATTRS(Law2_ScGeom_CapillaryPhys_Capillarity,GlobalEngine,"This
law allows to take into account capillary forces/effects between spheres
coming from the presence of interparticular liquid bridges (menisci).\n\n
refs:\n\n#. in french [Scholtes2009d]_ (lot of documentation) \n#. in english
[Scholtes2009b]_ (less documentation), pg. 64-75.\n\nThe law needs ascii files
M(r=i) with i=R1/R2 to work (see
https://yade-dem.org/index.php/CapillaryTriaxialTest). These ASCII files
contain a set of results from the resolution of the Laplace-Young equation for
different configurations of the interacting geometry.\n\nThe control parameter
is the capillary pressure (or suction) Uc = ugas - Uliquid. Liquid bridges
properties (volume V, extent over interacting grains delta1 and delta2) are
computed as a result of the defined capillary pressure and of the interacting
geometry (spheres radii and interparticular distance).",
-+
YADE_CLASS_BASE_DOC_ATTRS(Law2_ScGeom_CapillaryPhys_Capillarity,GlobalEngine,"This
law allows one to take into account capillary forces/effects between spheres
coming from the presence of interparticular liquid bridges (menisci).\n\n
refs:\n\n#. in french [Scholtes2009d]_ (lot of documentation) \n#. in english
[Scholtes2009b]_ (less documentation), pg. 64-75.\n\nThe law needs ascii files
M(r=i) with i=R1/R2 to work (see
https://yade-dem.org/index.php/CapillaryTriaxialTest). These ASCII files
contain a set of results from the resolution of the Laplace-Young equation for
different configurations of the interacting geometry.\n\nThe control parameter
is the capillary pressure (or suction) Uc = ugas - Uliquid. Liquid bridges
properties (volume V, extent over interacting grains delta1 and delta2) are
computed as a result of the defined capillary pressure and of the interacting
geometry (spheres radii and interparticular distance).",
- ((Real,CapillaryPressure,0.,,"Value of the capillary pressure Uc
defines as Uc=Ugas-Uliquid"))
- ((bool,fusionDetection,false,,"If true potential menisci overlaps are
checked"))
- ((bool,binaryFusion,true,,"If true, capillary forces are set to zero as
soon as, at least, 1 overlap (menisci fusion) is detected"))
---- a/pkg/dem/SampleCapillaryPressureEngine.hpp
-+++ b/pkg/dem/SampleCapillaryPressureEngine.hpp
-@@ -34,7 +34,7 @@
- void updateParameters();
- virtual void action();
-
--
YADE_CLASS_BASE_DOC_ATTRS_CTOR_PY(SampleCapillaryPressureEngine,TriaxialStressController,"Rk:
this engine has to be tested withthe new formalism. It produces the isotropic
compaction of an assembly and allows to controlled the capillary pressure
inside (uses Law2_ScGeom_CapillaryPhys_Capillarity).",
-+
YADE_CLASS_BASE_DOC_ATTRS_CTOR_PY(SampleCapillaryPressureEngine,TriaxialStressController,"Rk:
this engine has to be tested withthe new formalism. It produces the isotropic
compaction of an assembly and allows one to controlled the capillary pressure
inside (uses Law2_ScGeom_CapillaryPhys_Capillarity).",
- ((Real,Pressure,0,,"Value of the capillary pressure
Uc=Ugas-Uliquid (see Law2_ScGeom_CapillaryPhys_Capillarity). [Pa]"))
- ((bool,pressureVariationActivated,1,,"Is the capillary pressure
varying?"))
- ((bool,fusionDetection,1,,"Is the detection of menisci
overlapping activated?"))
---- a/py/utils.py
-+++ b/py/utils.py
-@@ -356,7 +356,7 @@
- :param Quaternion orientation: orientation of the cylinder; the
reference orientation has axis along the $+x$ axis.
- :param int segmentsNumber: number of edges on the cylinder surface (>=5)
- :param bitmask wallMask: determines which walls will be created, in the
order up (1), down (2), side (4). The numbers are ANDed; the default 7 means to
create all walls
-- :param (θmin,Θmax) angleRange: allows to create only part of cylinder
by specifying range of angles; if ``None``, (0,2*pi) is assumed.
-+ :param (θmin,Θmax) angleRange: allows one to create only part of
cylinder by specifying range of angles; if ``None``, (0,2*pi) is assumed.
- :param bool closeGap: close range skipped in angleRange with triangular
facets at cylinder bases.
- :param **kw: (unused keyword arguments) passed to utils.facet;
- """
---- a/py/ymport.py
-+++ b/py/ymport.py
-@@ -184,7 +184,7 @@
- is passed to :yref:`yade.utils.sphere`
- :Returns: list of spheres.
-
-- LSMGenGeo library allows to create pack of spheres
-+ LSMGenGeo library allows one to create pack of spheres
- with given [Rmin:Rmax] with null stress inside the specimen.
- Can be useful for Mining Rock simulation.
-
-@@ -220,7 +220,7 @@
- `**kw`: (unused keyword arguments)
- is passed to :yref:`yade.utils.sphere`
-
-- LSMGenGeo library allows to create pack of spheres
-+ LSMGenGeo library allows one to create pack of spheres
- with given [Rmin:Rmax] with null stress inside the specimen.
- Can be useful for Mining Rock simulation.
-
---- a/pkg/dem/KinemCNDEngine.hpp
-+++ b/pkg/dem/KinemCNDEngine.hpp
-@@ -24,7 +24,7 @@
- protected :
-
-
YADE_CLASS_BASE_DOC_ATTRS_CTOR(KinemCNDEngine,KinemSimpleShearBox,
-- "To apply a Constant Normal Displacement (CND) shear
for a parallelogram box\n\n \tThis engine, designed for simulations implying a
simple shear box (:yref:`SimpleShear` Preprocessor or scripts/simpleShear.py),
allows to perform a constant normal displacement shear, by translating
horizontally the upper plate, while the lateral ones rotate so that they always
keep contact with the lower and upper walls.",
-+ "To apply a Constant Normal Displacement (CND) shear
for a parallelogram box\n\n \tThis engine, designed for simulations implying a
simple shear box (:yref:`SimpleShear` Preprocessor or scripts/simpleShear.py),
allows one to perform a constant normal displacement shear, by translating
horizontally the upper plate, while the lateral ones rotate so that they always
keep contact with the lower and upper walls.",
- ((Real,shearSpeed,0.0,,"the speed at which the shear is
performed : speed of the upper plate [m/s]"))
- ((Real,gammalim,0.0,,"the value of the tangential
displacement at wich the displacement is stopped [m]"))
- ((Real,gamma,0.0,,"the current value of the tangential
displacement"))
diff --git a/debian/patches/fix_version_number.patch
b/debian/patches/fix_version_number.patch
deleted file mode 100644
index d78abf7..0000000
--- a/debian/patches/fix_version_number.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Description: change version number
-Author: Anton Gladky <[email protected]>
-Last-Update: 2011-06-23
-
---- a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--0.60
-+0.60.2
diff --git a/debian/patches/series b/debian/patches/series
index 406bca6..182eb42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-fix_memory_wrong_accces_after_body_erase.patch
-fix_spelling_errors.patch
-fix_force_applying_to_non_existing_body.patch
-fix_absent_syncSizesOfContainers.patch
fix_FTBFS_on_KFreeBSD.patch
-fix_compilation_with_eigen3.patch
use_eigen3_instead_of_eigen2.patch
get_rid_off_suffix.patch
-fix_version_number.patch
--
Yet Another Dynamic Engine. Platform for discrete element modeling.
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
