[yade] 06/06: Update patches.
Anton Gladky
gladk at moszumanska.debian.org
Thu Jun 2 21:02:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit 8d9cc1c9624e01eeb90cac944bd9c552fdfec06e
Author: Anton Gladky <gladk at debian.org>
Date: Thu Jun 2 23:00:42 2016 +0200
Update patches.
---
.../01fea359c04d08f93d2feddcd07b31bc794dbb37.patch | 33 ++---
debian/patches/fix_glibc223.patch | 162 +++++++++++++--------
2 files changed, 113 insertions(+), 82 deletions(-)
diff --git a/debian/patches/01fea359c04d08f93d2feddcd07b31bc794dbb37.patch b/debian/patches/01fea359c04d08f93d2feddcd07b31bc794dbb37.patch
index ee3470b..3063012 100644
--- a/debian/patches/01fea359c04d08f93d2feddcd07b31bc794dbb37.patch
+++ b/debian/patches/01fea359c04d08f93d2feddcd07b31bc794dbb37.patch
@@ -15,11 +15,11 @@ stable Yade release.
create mode 100644 cMake/FindQGLVIEWER-qt5.cmake
delete mode 100644 cMake/FindQGLVIEWER.cmake
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 952a3be..44ca9cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,9 +223,9 @@ IF(ENABLE_GUI)
+Index: trunk-1.20.0/CMakeLists.txt
+===================================================================
+--- trunk-1.20.0.orig/CMakeLists.txt
++++ trunk-1.20.0/CMakeLists.txt
+@@ -219,9 +219,9 @@ IF(ENABLE_GUI)
FIND_PACKAGE(OpenGL)
FIND_PACKAGE(GLUT)
FIND_PACKAGE(glib2)
@@ -30,7 +30,7 @@ index 952a3be..44ca9cc 100644
FIND_PACKAGE(Qt5 CONFIG REQUIRED Widgets Xml OpenGL)
SET(CMAKE_AUTOMOC ON)
FIND_PACKAGE(Qt5Widgets)
-@@ -242,6 +242,7 @@ IF(ENABLE_GUI)
+@@ -238,6 +238,7 @@ IF(ENABLE_GUI)
SET(ENABLE_GUI OFF)
ENDIF(Qt5Widgets_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
ELSE(USE_QT5) # Use Qt4
@@ -38,11 +38,10 @@ index 952a3be..44ca9cc 100644
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL)
IF(QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
SET(GUI_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${QGLVIEWER_LIBRARIES})
-diff --git a/cMake/FindQGLVIEWER-qt4.cmake b/cMake/FindQGLVIEWER-qt4.cmake
-new file mode 100644
-index 0000000..c196ff2
+Index: trunk-1.20.0/cMake/FindQGLVIEWER-qt4.cmake
+===================================================================
--- /dev/null
-+++ b/cMake/FindQGLVIEWER-qt4.cmake
++++ trunk-1.20.0/cMake/FindQGLVIEWER-qt4.cmake
@@ -0,0 +1,24 @@
+# - Try to find QGLViewer
+# Once done this will define
@@ -68,11 +67,10 @@ index 0000000..c196ff2
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt4 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
-diff --git a/cMake/FindQGLVIEWER-qt5.cmake b/cMake/FindQGLVIEWER-qt5.cmake
-new file mode 100644
-index 0000000..bbd15f9
+Index: trunk-1.20.0/cMake/FindQGLVIEWER-qt5.cmake
+===================================================================
--- /dev/null
-+++ b/cMake/FindQGLVIEWER-qt5.cmake
++++ trunk-1.20.0/cMake/FindQGLVIEWER-qt5.cmake
@@ -0,0 +1,24 @@
+# - Try to find QGLViewer
+# Once done this will define
@@ -98,10 +96,9 @@ index 0000000..bbd15f9
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt5 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
-diff --git a/cMake/FindQGLVIEWER.cmake b/cMake/FindQGLVIEWER.cmake
-deleted file mode 100644
-index d7aeef6..0000000
---- a/cMake/FindQGLVIEWER.cmake
+Index: trunk-1.20.0/cMake/FindQGLVIEWER.cmake
+===================================================================
+--- trunk-1.20.0.orig/cMake/FindQGLVIEWER.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# - Try to find QGLViewer
diff --git a/debian/patches/fix_glibc223.patch b/debian/patches/fix_glibc223.patch
index 32e5062..7cd3ba6 100644
--- a/debian/patches/fix_glibc223.patch
+++ b/debian/patches/fix_glibc223.patch
@@ -3,9 +3,11 @@ Author: Graham Inggs <ginggs at debian.org>
Acked-By: Anton Gladky <gladk at debian.org>
Last-Update: 2016-06-02
---- a/gui/qt5/GLViewer.cpp
-+++ b/gui/qt5/GLViewer.cpp
-@@ -350,7 +350,7 @@
+Index: trunk-1.20.0/gui/qt5/GLViewer.cpp
+===================================================================
+--- trunk-1.20.0.orig/gui/qt5/GLViewer.cpp
++++ trunk-1.20.0/gui/qt5/GLViewer.cpp
+@@ -350,7 +350,7 @@ void GLViewer::centerScene(){
if(not(rb->bound)){ rb->updateBound();}
min=rb->bound->min; max=rb->bound->max;
@@ -14,18 +16,20 @@ Last-Update: 2016-06-02
Real minDim=std::min(max[0]-min[0],std::min(max[1]-min[1],max[2]-min[2]));
if(minDim<=0 || hasNan){
// Aabb is not yet calculated...
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ void GLViewer::centerScene(){
max=max.cwiseMax(b->state->pos);
min=min.cwiseMin(b->state->pos);
}
-- if(isinf(min[0])||isinf(min[1])||isinf(min[2])||isinf(max[0])||isinf(max[1])||isinf(max[2])){ LOG_DEBUG("No min/max computed from bodies either, setting cube (-1,-1,-1)×(1,1,1)"); min=-Vector3r::Ones(); max=Vector3r::Ones(); }
-+ if(std::isinf(min[0])||std::isinf(min[1])||std::isinf(min[2])||std::isinf(max[0])||std::isinf(max[1])||std::isinf(max[2])){ LOG_DEBUG("No min/max computed from bodies either, setting cube (-1,-1,-1)×(1,1,1)"); min=-Vector3r::Ones(); max=Vector3r::Ones(); }
+- if(isinf(min[0])||isinf(min[1])||isinf(min[2])||isinf(max[0])||isinf(max[1])||isinf(max[2])){ LOG_DEBUG("No min/max computed from bodies either, setting cube (-1,-1,-1)×(1,1,1)"); min=-Vector3r::Ones(); max=Vector3r::Ones(); }
++ if(std::isinf(min[0])||std::isinf(min[1])||std::isinf(min[2])||std::isinf(max[0])||std::isinf(max[1])||std::isinf(max[2])){ LOG_DEBUG("No min/max computed from bodies either, setting cube (-1,-1,-1)×(1,1,1)"); min=-Vector3r::Ones(); max=Vector3r::Ones(); }
} else {LOG_DEBUG("Using scene's Aabb");}
LOG_DEBUG("Got scene box min="<<min<<" and max="<<max);
---- a/pkg/common/Cylinder.cpp
-+++ b/pkg/common/Cylinder.cpp
-@@ -450,7 +450,7 @@
+Index: trunk-1.20.0/pkg/common/Cylinder.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/common/Cylinder.cpp
++++ trunk-1.20.0/pkg/common/Cylinder.cpp
+@@ -450,7 +450,7 @@ bool Ig2_ChainedCylinder_ChainedCylinder
ChainedCylinder *cc1=static_cast<ChainedCylinder*>(cm1.get());
ChainedCylinder *cc2=static_cast<ChainedCylinder*>(cm2.get());
@@ -34,7 +38,7 @@ Last-Update: 2016-06-02
Vector3r pointsToCheck[4]={A,A+a,B,B+b}; Real resultDist=dist, resultProj=dist ; int whichCaseIsCloser=-1 ;
for (int i=0;i<4;i++){ //loop on the 4 cylinder's extremities and look at the extremity-cylinder distance
Vector3r S=pointsToCheck[i], C=(i<2)?B:A, vec=(i<2)?b:a; Vector3r CS=S-C;
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ bool Ig2_ChainedCylinder_ChainedCylinder
if(d<0.) resultDist=CS.norm();
else if(d>vec.norm()) resultDist=(C+vec-S).norm();
else resultDist=(CS.cross(vec)).norm()/(vec.norm());
@@ -43,9 +47,11 @@ Last-Update: 2016-06-02
}
//we know which extremity may be in contact (i), so k and m are computed to generate the right fictiousStates.
insideCyl1=1 ; insideCyl2=1;
---- a/pkg/common/ZECollider.cpp
-+++ b/pkg/common/ZECollider.cpp
-@@ -68,7 +68,7 @@
+Index: trunk-1.20.0/pkg/common/ZECollider.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/common/ZECollider.cpp
++++ trunk-1.20.0/pkg/common/ZECollider.cpp
+@@ -68,7 +68,7 @@ void ZECollider::action(){
minR=min(s->radius,minR);
}
// if no spheres, disable stride
@@ -54,9 +60,11 @@ Last-Update: 2016-06-02
}
// update bounds via boundDispatcher
---- a/pkg/common/MatchMaker.cpp
-+++ b/pkg/common/MatchMaker.cpp
-@@ -9,7 +9,7 @@
+Index: trunk-1.20.0/pkg/common/MatchMaker.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/common/MatchMaker.cpp
++++ trunk-1.20.0/pkg/common/MatchMaker.cpp
+@@ -9,7 +9,7 @@ Real MatchMaker::operator()(int id1, int
if(((int)m[0]==id1 && (int)m[1]==id2) || ((int)m[0]==id2 && (int)m[1]==id1)) return m[2];
}
// no match
@@ -65,8 +73,10 @@ Last-Update: 2016-06-02
return computeFallback(val1,val2);
}
---- a/pkg/common/Gl1_NormPhys.cpp
-+++ b/pkg/common/Gl1_NormPhys.cpp
+Index: trunk-1.20.0/pkg/common/Gl1_NormPhys.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/common/Gl1_NormPhys.cpp
++++ trunk-1.20.0/pkg/common/Gl1_NormPhys.cpp
@@ -34,7 +34,7 @@
fnNorm=std::abs(fnNorm);
Real radiusScale=1.;
@@ -76,9 +86,11 @@ Last-Update: 2016-06-02
if(fnNorm*fnSign<maxWeakFn){ // weak fabric
if(weakFilter>0) return;
radiusScale=weakScale;
---- a/pkg/common/InsertionSortCollider.cpp
-+++ b/pkg/common/InsertionSortCollider.cpp
-@@ -241,9 +241,9 @@
+Index: trunk-1.20.0/pkg/common/InsertionSortCollider.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/common/InsertionSortCollider.cpp
++++ trunk-1.20.0/pkg/common/InsertionSortCollider.cpp
+@@ -241,9 +241,9 @@ void InsertionSortCollider::action(){
if(!s) continue;
minR=min(s->radius,minR);
}
@@ -90,9 +102,11 @@ Last-Update: 2016-06-02
}
// if interactions are dirty, force reinitialization
if(scene->interactions->dirty){
---- a/pkg/common/Facet.cpp
-+++ b/pkg/common/Facet.cpp
-@@ -20,7 +20,7 @@
+Index: trunk-1.20.0/pkg/common/Facet.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/common/Facet.cpp
++++ trunk-1.20.0/pkg/common/Facet.cpp
+@@ -20,7 +20,7 @@ void Facet::postLoad(Facet&)
// in the future, a fixed-size array should be used instead of vector<Vector3r> for vertices
// this is prevented by yade::serialization now IIRC
if(vertices.size()!=3){ throw runtime_error(("Facet must have exactly 3 vertices (not "+boost::lexical_cast<string>(vertices.size())+")").c_str()); }
@@ -101,9 +115,11 @@ Last-Update: 2016-06-02
Vector3r e[3] = {vertices[1]-vertices[0] ,vertices[2]-vertices[1] ,vertices[0]-vertices[2]};
#define CHECK_EDGE(i) if(e[i].squaredNorm()==0){LOG_FATAL("Facet has coincident vertices "<<i<<" ("<<vertices[i]<<") and "<<(i+1)%3<<" ("<<vertices[(i+1)%3]<<")!");}
CHECK_EDGE(0); CHECK_EDGE(1);CHECK_EDGE(2);
---- a/pkg/dem/NewtonIntegrator.cpp
-+++ b/pkg/dem/NewtonIntegrator.cpp
-@@ -102,7 +102,7 @@
+Index: trunk-1.20.0/pkg/dem/NewtonIntegrator.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/NewtonIntegrator.cpp
++++ trunk-1.20.0/pkg/dem/NewtonIntegrator.cpp
+@@ -102,7 +102,7 @@ void NewtonIntegrator::action()
// its velocity will count as max velocity of bodies
// otherwise the collider might not run if only the cell were changing without any particle motion
// FIXME: will not work for pure shear transformation, which does not change Cell::getSize()
@@ -112,9 +128,11 @@ Last-Update: 2016-06-02
else { maxVelocitySq=0; cellChanged=false; }
#ifdef YADE_BODY_CALLBACK
---- a/lib/triangulation/FlowBoundingSphere.ipp
-+++ b/lib/triangulation/FlowBoundingSphere.ipp
-@@ -895,7 +895,7 @@
+Index: trunk-1.20.0/lib/triangulation/FlowBoundingSphere.ipp
+===================================================================
+--- trunk-1.20.0.orig/lib/triangulation/FlowBoundingSphere.ipp
++++ trunk-1.20.0/lib/triangulation/FlowBoundingSphere.ipp
+@@ -895,7 +895,7 @@ void FlowBoundingSphere<Tesselation>::ga
} else {
/// INCOMPRESSIBLE
m += (cell->info().kNorm())[j2] * cell->neighbor(j2)->info().p();
@@ -123,9 +141,11 @@ Last-Update: 2016-06-02
if (j==0) n += (cell->info().kNorm())[j2];
}
}
---- a/lib/triangulation/PeriodicFlow.hpp
-+++ b/lib/triangulation/PeriodicFlow.hpp
-@@ -406,7 +406,7 @@
+Index: trunk-1.20.0/lib/triangulation/PeriodicFlow.hpp
+===================================================================
+--- trunk-1.20.0.orig/lib/triangulation/PeriodicFlow.hpp
++++ trunk-1.20.0/lib/triangulation/PeriodicFlow.hpp
+@@ -406,7 +406,7 @@ void PeriodicFlow<_Tesselation>::gaussSe
if (j==0) n += compFlowFactor*(cell->info().kNorm())[j2];
} else {
m += (cell->info().kNorm())[j2]*cell->neighbor(j2)->info().shiftedP();
@@ -134,9 +154,11 @@ Last-Update: 2016-06-02
if (j==0) n += (cell->info().kNorm())[j2];
}
}
---- a/pkg/dem/GeneralIntegratorInsertionSortCollider.cpp
-+++ b/pkg/dem/GeneralIntegratorInsertionSortCollider.cpp
-@@ -86,9 +86,9 @@
+Index: trunk-1.20.0/pkg/dem/GeneralIntegratorInsertionSortCollider.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/GeneralIntegratorInsertionSortCollider.cpp
++++ trunk-1.20.0/pkg/dem/GeneralIntegratorInsertionSortCollider.cpp
+@@ -86,9 +86,9 @@ void GeneralIntegratorInsertionSortColli
if(!s) continue;
minR=min(s->radius,minR);
}
@@ -148,9 +170,11 @@ Last-Update: 2016-06-02
}
// update bounds via boundDispatcher
---- a/pkg/dem/UniaxialStrainer.cpp
-+++ b/pkg/dem/UniaxialStrainer.cpp
-@@ -38,13 +38,13 @@
+Index: trunk-1.20.0/pkg/dem/UniaxialStrainer.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/UniaxialStrainer.cpp
++++ trunk-1.20.0/pkg/dem/UniaxialStrainer.cpp
+@@ -38,13 +38,13 @@ void UniaxialStrainer::init(){
if(originalLength<=0) throw runtime_error(("UniaxialStrainer: Initial length is negative or zero (swapped reference particles?)! "+boost::lexical_cast<string>(originalLength)).c_str());
/* this happens is nan propagates from e.g. brefcom consitutive law in case 2 bodies have _exactly_ the same position
* (the the normal strain is 0./0.=nan). That is an user's error, however and should not happen. */
@@ -169,7 +193,7 @@ Last-Update: 2016-06-02
else {absSpeed=strainRate*originalLength;}
if(!setSpeeds){
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ void UniaxialStrainer::init(){
b->state->vel[axis]=pNormalized*(v1-v0)+v0;
}
}
@@ -178,7 +202,7 @@ Last-Update: 2016-06-02
}
void UniaxialStrainer::action(){
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ void UniaxialStrainer::action(){
} else currentStrainRate=strainRate;
// how much do we move (in total, symmetry handled below)
Real dAX=currentStrainRate*originalLength*scene->dt;
@@ -187,9 +211,11 @@ Last-Update: 2016-06-02
Real axialLength=axisCoord(posIds[0])-axisCoord(negIds[0]);
Real newStrain=(axialLength+dAX)/originalLength-1;
if((newStrain*stopStrain>0) && std::abs(newStrain)>=stopStrain){ // same sign of newStrain and stopStrain && over the limit from below in abs values
---- a/pkg/dem/Polyhedra_Ig2.cpp
-+++ b/pkg/dem/Polyhedra_Ig2.cpp
-@@ -64,7 +64,7 @@
+Index: trunk-1.20.0/pkg/dem/Polyhedra_Ig2.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/Polyhedra_Ig2.cpp
++++ trunk-1.20.0/pkg/dem/Polyhedra_Ig2.cpp
+@@ -64,7 +64,7 @@ bool Ig2_Polyhedra_Polyhedra_PolyhedraGe
Real volume;
Vector3r centroid;
P_volume_centroid(Int, &volume, ¢roid);
@@ -198,7 +224,7 @@ Last-Update: 2016-06-02
bang->equivalentPenetrationDepth=0;
bang->penetrationVolume=min(A->GetVolume(),B->GetVolume());
bang->normal = (A->GetVolume()>B->GetVolume() ? 1 : -1)*(se32.position+shift2-se31.position);
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ bool Ig2_Wall_Polyhedra_PolyhedraGeom::g
Real volume;
Vector3r centroid;
P_volume_centroid(Int, &volume, ¢roid);
@@ -207,7 +233,7 @@ Last-Update: 2016-06-02
if (!Is_inside_Polyhedron(PB, ToCGALPoint(centroid))) {bang->equivalentPenetrationDepth=0; return true;}
//calculate area of projection of Intersection into the normal plane
-@@ -250,7 +250,7 @@
+@@ -250,7 +250,7 @@ bool Ig2_Facet_Polyhedra_PolyhedraGeom::
Real volume;
Vector3r centroid;
P_volume_centroid(Int, &volume, ¢roid);
@@ -216,9 +242,11 @@ Last-Update: 2016-06-02
if (!Is_inside_Polyhedron(PB, ToCGALPoint(centroid))) {bang->equivalentPenetrationDepth=0; return true;}
//find normal direction
---- a/pkg/dem/ScGeom.cpp
-+++ b/pkg/dem/ScGeom.cpp
-@@ -104,7 +104,7 @@
+Index: trunk-1.20.0/pkg/dem/ScGeom.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/ScGeom.cpp
++++ trunk-1.20.0/pkg/dem/ScGeom.cpp
+@@ -104,7 +104,7 @@ void ScGeom6D::precomputeRotations(const
// add -DYADE_SCGEOM_DEBUG to CXXFLAGS to enable this piece or just do
// #define YADE_SCGEOM_DEBUG //(but do not commit with that enabled in the code)
#ifdef YADE_SCGEOM_DEBUG
@@ -227,7 +255,7 @@ Last-Update: 2016-06-02
cerr<<"NaN angle found in angleAxisr(q), for quaternion "<<delta<<", after quaternion product"<<endl;
cerr<<"rbp1.ori * (initialOrientation1.conjugate())) * (initialOrientation2 * (rbp2.ori.conjugate()) with quaternions :"<<endl;
cerr<<rbp1.ori<<" * "<<initialOrientation1<<" * "<<initialOrientation2<<" * "<<rbp2.ori<<endl<<" and sub-products :"<<endl<<rbp1.ori * (initialOrientation1.conjugate())<<" * "<<initialOrientation2 * (rbp2.ori.conjugate())<<endl;
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ void ScGeom6D::precomputeRotations(const
cerr<<delta<<" "<<bb.angle()<<endl;
}
#else
@@ -236,9 +264,11 @@ Last-Update: 2016-06-02
#endif
if (aa.angle() > Mathr::PI) aa.angle() -= Mathr::TWO_PI; // angle is between 0 and 2*pi, but should be between -pi and pi
twist = (aa.angle() * aa.axis().dot(normal));
---- a/pkg/dem/Shop_02.cpp
-+++ b/pkg/dem/Shop_02.cpp
-@@ -87,7 +87,7 @@
+Index: trunk-1.20.0/pkg/dem/Shop_02.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/Shop_02.cpp
++++ trunk-1.20.0/pkg/dem/Shop_02.cpp
+@@ -87,7 +87,7 @@ boost::tuple<Real,Real,Real> Shop::spira
else theta=0;
Real hRef=dH_dTheta*(theta-theta0);
long period;
@@ -247,7 +277,7 @@ Last-Update: 2016-06-02
Real h=Shop::periodicWrap(pt[axis]-hRef,hRef-Mathr::PI*dH_dTheta,hRef+Mathr::PI*dH_dTheta,&period);
return boost::make_tuple(r,h,theta);
}
-@@ -238,7 +238,7 @@
+@@ -238,7 +238,7 @@ py::tuple Shop::normalShearStressTensors
Real N=(compressionPositive?-1:1)*phys->normalForce.dot(n);
// Real R=(Body::byId(I->getId2(),scene)->state->pos+cellHsize*I->cellDist.cast<Real>()-Body::byId(I->getId1(),scene)->state->pos).norm();
Real R=.5*(geom->refR1+geom->refR2);
@@ -256,7 +286,7 @@ Last-Update: 2016-06-02
if (compressionPositive?(N<Fsplit):(N>Fsplit)){
for(int i=0; i<3; i++) for(int j=i; j<3; j++){
sigNStrong(i,j)+=R*N*n[i]*n[j];}
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@ void Shop::fabricTensor(Real& Fmean, Mat
fabricStrong=Matrix3r::Zero();
fabricWeak=Matrix3r::Zero();
int nStrong(0), nWeak(0); // number of strong and weak contacts respectively
@@ -265,7 +295,7 @@ Last-Update: 2016-06-02
FOREACH(const shared_ptr<Interaction>& I, *scene->interactions){
if(!I->isReal()) continue;
GenericSpheresContact* geom=YADE_CAST<GenericSpheresContact*>(I->geom.get());
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ void Shop::fabricTensor(Real& Fmean, Mat
const Vector3r& n=geom->normal;
Real f=(revertSign?-1:1)*phys->normalForce.dot(n);
// slipt the tensor according to the mean contact force or a threshold value if this is given
@@ -274,9 +304,11 @@ Last-Update: 2016-06-02
if (revertSign?(f<Fsplit):(f>Fsplit)){ // reminder: forces are compared with their sign
for(int i=0; i<3; i++) for(int j=i; j<3; j++){
fabricStrong(i,j)+=n[i]*n[j];
---- a/pkg/dem/ConcretePM.cpp
-+++ b/pkg/dem/ConcretePM.cpp
-@@ -43,14 +43,14 @@
+Index: trunk-1.20.0/pkg/dem/ConcretePM.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/ConcretePM.cpp
++++ trunk-1.20.0/pkg/dem/ConcretePM.cpp
+@@ -43,14 +43,14 @@ void Ip2_CpmMat_CpmMat_CpmPhys::go(const
// check unassigned values
if (!mat1->neverDamage) {
@@ -297,7 +329,7 @@ Last-Update: 2016-06-02
}
cpmPhys->damLaw = mat1->damLaw;
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ Real Law2_ScGeom_CpmPhys_Cpm::elasticEne
#ifdef YADE_DEBUG
#define CPM_YADE_DEBUG_A \
@@ -306,7 +338,7 @@ Last-Update: 2016-06-02
/*LOG_FATAL("refLength="<<geom->refLength<<"; pos1="<<geom->se31.position<<"; pos2="<<geom->se32.position<<"; displacementN="<<geom->displacementN());*/ \
throw runtime_error("!! epsN==NaN !!");\
}
-@@ -283,8 +283,8 @@
+@@ -283,8 +283,8 @@ Real Law2_ScGeom_CpmPhys_Cpm::elasticEne
#define YADE_VERIFY(condition) if(!(condition)){LOG_FATAL("Verification `"<<#condition<<"' failed!"); LOG_FATAL("in interaction #"<<I->getId1()<<"+#"<<I->getId2()); Omega::instance().saveSimulation("/tmp/verificationFailed.xml"); throw;}
@@ -317,9 +349,11 @@ Last-Update: 2016-06-02
bool Law2_ScGeom_CpmPhys_Cpm::go(shared_ptr<IGeom>& _geom, shared_ptr<IPhys>& _phys, Interaction* I){
TIMING_DELTAS_START();
---- a/pkg/dem/PeriIsoCompressor.cpp
-+++ b/pkg/dem/PeriIsoCompressor.cpp
-@@ -154,7 +154,7 @@
+Index: trunk-1.20.0/pkg/dem/PeriIsoCompressor.cpp
+===================================================================
+--- trunk-1.20.0.orig/pkg/dem/PeriIsoCompressor.cpp
++++ trunk-1.20.0/pkg/dem/PeriIsoCompressor.cpp
+@@ -154,7 +154,7 @@ void PeriTriaxController::action()
if(doUpdate || min(stiff[0],min(stiff[1],stiff[2])) <=0 || dynCell){ strainStressStiffUpdate(); }
// set mass to be sum of masses, if not set by the user
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git
More information about the debian-science-commits
mailing list