[yade] 02/03: Remove patches, applied by upstream.
Anton Gladky
gladk at moszumanska.debian.org
Sun Aug 31 05:52:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit bd5a05a50cc2eefc98e331228082e70ae9a25f62
Author: Anton Gladky <gladk at debian.org>
Date: Sat Aug 30 22:21:36 2014 +0200
Remove patches, applied by upstream.
---
debian/patches/02_fix_DEM-PFV.patch | 78 -----------------------------
debian/patches/03_fix_segfault_clumps.patch | 60 ----------------------
debian/patches/series | 2 -
3 files changed, 140 deletions(-)
diff --git a/debian/patches/02_fix_DEM-PFV.patch b/debian/patches/02_fix_DEM-PFV.patch
deleted file mode 100644
index 172a6fc..0000000
--- a/debian/patches/02_fix_DEM-PFV.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From c5c059e25916977f8cdb7d4f5767db76b2f60e05 Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladky.anton at gmail.com>
-Date: Wed, 6 Aug 2014 19:37:20 +0200
-Subject: [PATCH] Use toleranceWarning and toleranceCritical for DEM-PFV check.
-
----
- scripts/checks-and-tests/checks/DEM-PFV-check.py | 29 ++++++++++++++++--------
- 1 file changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/scripts/checks-and-tests/checks/DEM-PFV-check.py b/scripts/checks-and-tests/checks/DEM-PFV-check.py
-index 38b6391..0f2164d 100644
---- a/scripts/checks-and-tests/checks/DEM-PFV-check.py
-+++ b/scripts/checks-and-tests/checks/DEM-PFV-check.py
-@@ -5,7 +5,8 @@
-
- if ('PFVFLOW' in features):
- errors=0
-- tolerance=0.01
-+ toleranceWarning =0.01
-+ toleranceCritical=0.10
-
- from yade import pack
- num_spheres=100# number of spheres
-@@ -77,9 +78,11 @@
- modulus = 1000./abs(e22)
-
- target=252759.905803
-- if abs((modulus-target)/target)>tolerance :
-+ if abs((modulus-target)/target)>toleranceWarning:
- print "DEM-PFV: difference in bulk modulus:", modulus, "vs. target ",target
-- errors+=1
-+ if (abs((modulus-target)/target)>toleranceCritical):
-+ errors+=1
-+ print "The difference is more, than the critical tolerance!"
-
- #B. Activate flow engine and set boundary conditions in order to get permeability
- flow.dead=0
-@@ -103,9 +106,11 @@
- errors+=1
-
- target=0.040399916554
-- if abs((permeability-target)/target)>tolerance :
-+ if abs((permeability-target)/target)>toleranceWarning:
- print "DEM-PFV: difference in permeability:",permeability," vs. target ",target
-- errors+=1
-+ if (abs((permeability-target)/target)>toleranceCritical):
-+ errors+=1
-+ print "The difference is more, than the critical tolerance!"
-
- #C. now the oedometer test, drained at the top, impermeable at the bottom plate
- flow.bndCondIsPressure=[0,0,0,1,0,0]
-@@ -121,13 +126,19 @@
- O.run(3000,1)
-
- target=628.314160434
-- if abs((flow.getPorePressure((0.5,0.1,0.5))-target)/target)>tolerance :
-+ if abs((flow.getPorePressure((0.5,0.1,0.5))-target)/target)>toleranceWarning:
- print "DEM-PFV: difference in final pressure:",flow.getPorePressure((0.5,0.1,0.5))," vs. target ",target
-- errors+=1
-+ if (abs((flow.getPorePressure((0.5,0.1,0.5))-target)/target)>toleranceCritical):
-+ errors+=1
-+ print "The difference is more, than the critical tolerance!"
-+
- target=0.00258113045083
-- if abs((triax.strain[1]-zeroe22-target)/target)>tolerance :
-+ if abs((triax.strain[1]-zeroe22-target)/target)>toleranceWarning:
- print "DEM-PFV: difference in final deformation",triax.strain[1]-zeroe22," vs. target ",target
-- errors+=1
-+ if (abs((triax.strain[1]-zeroe22-target)/target)>toleranceCritical):
-+ errors+=1
-+ print "The difference is more, than the critical tolerance!"
-+
-
- if (float(flow.execTime)/float(sum([e.execTime for e in O.engines])))>0.6 :
- print "(INFO) DEM-PFV: More than 60\% of cpu time in FlowEngine (",100.*(float(flow.execTime)/float(sum([e.execTime for e in O.engines]))) ,"%). Should not happen with efficient libraries (check blas/lapack/cholmod implementations)"
---
-2.0.3
-
diff --git a/debian/patches/03_fix_segfault_clumps.patch b/debian/patches/03_fix_segfault_clumps.patch
deleted file mode 100644
index 2f395fa..0000000
--- a/debian/patches/03_fix_segfault_clumps.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 90640cc8af36602cc0a4b980bc06486c19277adf Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladky.anton at gmail.com>
-Date: Mon, 11 Aug 2014 20:25:01 +0200
-Subject: [PATCH] Fix crash after clumps removing. Closes LP:1354433
-
-After Clump::del(clumpBody, b), b->clumpId is aways "-1",
-so it is wrong to use it later in this->erase(b->clumpId,false).
----
- core/BodyContainer.cpp | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/core/BodyContainer.cpp b/core/BodyContainer.cpp
-index 7c186da..31d78ad 100644
---- a/core/BodyContainer.cpp
-+++ b/core/BodyContainer.cpp
-@@ -29,15 +29,12 @@ Body::id_t BodyContainer::insert(shared_ptr<Body>& b){
-
- bool BodyContainer::erase(Body::id_t id, bool eraseClumpMembers){//default is false (as before)
- if(!body[id]) return false;
--
- const shared_ptr<Body>& b=Body::byId(id);
--
- if ((b) and (b->isClumpMember())) {
-- const shared_ptr<Body>& clumpBody=Body::byId(b->clumpId);
-+ const shared_ptr<Body> clumpBody=Body::byId(b->clumpId);
- const shared_ptr<Clump> clump=YADE_PTR_CAST<Clump>(clumpBody->shape);
- Clump::del(clumpBody, b);
--
-- if (clump->members.size()==0) this->erase(b->clumpId,false); //Clump has no members any more. Remove it
-+ if (clump->members.size()==0) this->erase(clumpBody->id,false); //Clump has no members any more. Remove it
- }
-
- if ((b) and (b->isClump())){
-@@ -46,17 +43,18 @@ bool BodyContainer::erase(Body::id_t id, bool eraseClumpMembers){//default is fa
- std::map<Body::id_t,Se3r>& members = clump->members;
- FOREACH(MemberMap::value_type& mm, members){
- const Body::id_t& memberId=mm.first;
-- if (eraseClumpMembers) this->erase(memberId,false); // erase members
-- //when the last members is erased, the clump will be erased automatically, see above
-- else Body::byId(memberId)->clumpId=Body::id_t(-1); // make members standalones
-+ if (eraseClumpMembers) {
-+ this->erase(memberId,false); // erase members
-+ } else {
-+ //when the last members is erased, the clump will be erased automatically, see above
-+ Body::byId(memberId)->clumpId=Body::ID_NONE; // make members standalones
-+ }
- }
- }
- const shared_ptr<Scene>& scene=Omega::instance().getScene();
- for(Body::MapId2IntrT::iterator it=b->intrs.begin(),end=b->intrs.end(); it!=end; ++it) { //Iterate over all body's interactions
- scene->interactions->requestErase((*it).second);
- }
--
- body[id].reset();
--
- return true;
- }
---
-2.0.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 2892aa3..b4e6505 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
01_remove_google_analytics.patch
-02_fix_DEM-PFV.patch
-03_fix_segfault_clumps.patch
--
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