[python-demgengeo] 05/08: Clean in patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat Jul 11 20:52:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository python-demgengeo.
commit eed48bf159db0ce47371a7a4b1fe4702541901c3
Author: Anton Gladky <gladk at debian.org>
Date: Sat Jul 11 12:34:36 2015 +0200
Clean in patches.
---
debian/patches/{gcc5.patch => 10_gcc5.patch} | 8 +-
debian/patches/fix-rpath.patch | 15 -
debian/patches/replace_cerr_by_cout.patch | 940 ---------------------------
debian/patches/series | 4 +-
4 files changed, 5 insertions(+), 962 deletions(-)
diff --git a/debian/patches/gcc5.patch b/debian/patches/10_gcc5.patch
similarity index 74%
rename from debian/patches/gcc5.patch
rename to debian/patches/10_gcc5.patch
index c819156..4a2f7ac 100644
--- a/debian/patches/gcc5.patch
+++ b/debian/patches/10_gcc5.patch
@@ -4,11 +4,11 @@ Author: Matthias Klose <doko at debian.org>
Bug-Debian: https://bugs.debian.org/778075
Last-Update: 2015-07-10
-Index: python-demgengeo-1.0/build/m4/boost.m4
+Index: GenGeo-1.2/m4/boost.m4
===================================================================
---- python-demgengeo-1.0.orig/build/m4/boost.m4
-+++ python-demgengeo-1.0/build/m4/boost.m4
-@@ -76,7 +76,7 @@ dnl strip `\n' with backquotes, not the
+--- GenGeo-1.2.orig/m4/boost.m4
++++ GenGeo-1.2/m4/boost.m4
+@@ -84,7 +84,7 @@ dnl strip `\n' with backquotes, not the
dnl boost_cv_lib_version='1_37\r' for instance, which breaks
dnl everything else.
dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
diff --git a/debian/patches/fix-rpath.patch b/debian/patches/fix-rpath.patch
deleted file mode 100644
index 7f72185..0000000
--- a/debian/patches/fix-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix rpath-issue
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-12-05
-
---- a/build/m4/boost.m4
-+++ b/build/m4/boost.m4
-@@ -414,7 +414,7 @@
- LDFLAGS=$boost_save_LDFLAGS
- LIBS=$boost_save_LIBS
- if test x"$Boost_lib" = xyes; then
-- Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
-+ Boost_lib_LDFLAGS="-L$boost_ldpath"
- Boost_lib_LDPATH="$boost_ldpath"
- break 6
- else
diff --git a/debian/patches/replace_cerr_by_cout.patch b/debian/patches/replace_cerr_by_cout.patch
deleted file mode 100644
index 969835f..0000000
--- a/debian/patches/replace_cerr_by_cout.patch
+++ /dev/null
@@ -1,940 +0,0 @@
-Description: Replace cerr by cout to escape cerr output
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-05-14
-
-diff --git a/geometry/Triangle3D.cc b/geometry/Triangle3D.cc
-index b407d92..4d47f23 100644
---- a/geometry/Triangle3D.cc
-+++ b/geometry/Triangle3D.cc
-@@ -55,11 +55,11 @@ bool Triangle3D::crosses(const Vector3& p1, const Vector3& p2) const
-
- //-- check if points on same side of plane
- Vector3 plane_normal=cross((m_p2-m_p1),(m_p3-m_p1));
-- //std::cerr << "normal: " << plane_normal << std::endl;
-+ //std::cout << "normal: " << plane_normal << std::endl;
-
- double d1=plane_normal*(p1-m_p1);
- double d2=plane_normal*(p2-m_p1);
-- //std::cerr << "d1,d2 " << d1 << " / " << d2 << std::endl;
-+ //std::cout << "d1,d2 " << d1 << " / " << d2 << std::endl;
-
- if(d1*d2<0.0){ // sign(d1)!=sign(d2) -> different sides
-
-diff --git a/src/BoxWithLines2DSubVol.cc b/src/BoxWithLines2DSubVol.cc
-index c79a06a..b48d7f6 100644
---- a/src/BoxWithLines2DSubVol.cc
-+++ b/src/BoxWithLines2DSubVol.cc
-@@ -56,7 +56,7 @@ Vector3 BoxWithLines2DSubVol::BoxWithLines2DSubVol::getAPoint(int id) const
- double px=m_random(minx,maxx);
- double py=m_random(miny,maxy);
-
-- //std::cerr << "id, x, y, p " << id << " [ " << minx << " - " << maxx << " ] [ " << miny << " - " << maxy << " ] [ " << px << " - " << py << " ] " << std::endl;
-+ //std::cout << "id, x, y, p " << id << " [ " << minx << " - " << maxx << " ] [ " << miny << " - " << maxy << " ] [ " << px << " - " << py << " ] " << std::endl;
- return Vector3(px,py,0.0);
- }
-
-diff --git a/src/CircMNTable2D.cc b/src/CircMNTable2D.cc
-index 95ff260..ec5e5ab 100644
---- a/src/CircMNTable2D.cc
-+++ b/src/CircMNTable2D.cc
-@@ -41,7 +41,7 @@ CircMNTable2D::CircMNTable2D(const Vector3& MinPt,const Vector3& MaxPt,double cd
- double nx=(MaxPt-MinPt).X()/m_celldim;
- // error message if not
- if(nx!=floor(nx)){
-- std::cerr << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic x-dimension " << (MaxPt-MinPt).X() << std::endl;
-+ std::cout << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic x-dimension " << (MaxPt-MinPt).X() << std::endl;
- }
- double shift_x=(m_nx-2)*m_celldim;
- m_shift_vec_x=Vector3(shift_x,0.0,0.0);
-@@ -152,7 +152,7 @@ bool CircMNTable2D::insertChecked(const Sphere& S,unsigned int gid,double tol)
- int id=getIndex(S.Center());
- int idx=getXIndex(S.Center());
-
--// std::cerr << "CircMNTable2D::insertChecked(" << S << ") id=" << id << " idx= " << idx << std::endl;
-+// std::cout << "CircMNTable2D::insertChecked(" << S << ") id=" << id << " idx= " << idx << std::endl;
-
- tol+=s_small_value;
- if((id!=-1) && (idx!=0) && (idx!=m_nx-1) && (gid<m_ngroups)){
-@@ -223,7 +223,7 @@ bool CircMNTable2D::checkInsertable(const Sphere& S,unsigned int gid)
- */
- void CircMNTable2D::generateBonds(int gid,double tol,int btag)
- {
-- std::cerr << "CircMNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl;
-+ std::cout << "CircMNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl;
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
- for(int j=1;j<m_ny-1;j++){
-@@ -234,22 +234,22 @@ void CircMNTable2D::generateBonds(int gid,double tol,int btag)
- int id2=idx(i+ii,j+jj);
- vector<pair<int,int> > bonds;
- if((id2==id) && (i!=0)){ // intra-cell, not for boundary
-- //std::cerr << id << " - " << id << std::endl;
-+ //std::cout << id << " - " << id << std::endl;
- bonds=m_data[id].getBonds(gid,tol);
- } else if(id2>id){ // inter-cell
-- //std::cerr << id << " - " << id2 << std::endl;
-+ //std::cout << id << " - " << id2 << std::endl;
- bonds=m_data[id].getBonds(gid,tol,m_data[id2]);
- }
- for(vector<pair<int,int> >::iterator iter=bonds.begin();
- iter!=bonds.end();
- iter++){
-- //std::cerr << iter->first << " | " << iter->second << " ";
-+ //std::cout << iter->first << " | " << iter->second << " ";
- m_bonds[btag].insert(*iter);
- }
-- //std::cerr << std::endl;
-+ //std::cout << std::endl;
- }
- }
-- //std::cerr << std::endl;
-+ //std::cout << std::endl;
- }
- }
- }
-@@ -265,7 +265,7 @@ void CircMNTable2D::generateBonds(int gid,double tol,int btag)
- */
- void CircMNTable2D::generateBondsWithMask(int gid,double tol,int btag, int ptag, int mask)
- {
-- std::cerr << "CircMNTable2D::generateBondsWithMask( " << gid << " , " << tol << " , " << btag << " "
-+ std::cout << "CircMNTable2D::generateBondsWithMask( " << gid << " , " << tol << " , " << btag << " "
- << ptag <<" " << mask<<" )" << std::endl;
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
-@@ -277,22 +277,22 @@ void CircMNTable2D::generateBondsWithMask(int gid,double tol,int btag, int ptag,
- int id2=idx(i+ii,j+jj);
- vector<pair<int,int> > bonds;
- if((id2==id) && (i!=0)){ // intra-cell, not for boundary
-- //std::cerr << id << " - " << id << std::endl;
-+ //std::cout << id << " - " << id << std::endl;
- bonds=m_data[id].getBonds(gid,tol,ptag,mask);
- } else if(id2>id){ // inter-cell
-- //std::cerr << id << " - " << id2 << std::endl;
-+ //std::cout << id << " - " << id2 << std::endl;
- bonds=m_data[id].getBonds(gid,tol,m_data[id2],ptag,mask);
- }
- for(vector<pair<int,int> >::iterator iter=bonds.begin();
- iter!=bonds.end();
- iter++){
-- //std::cerr << iter->first << " | " << iter->second << " ";
-+ //std::cout << iter->first << " | " << iter->second << " ";
- m_bonds[btag].insert(*iter);
- }
-- //std::cerr << std::endl;
-+ //std::cout << std::endl;
- }
- }
-- //std::cerr << std::endl;
-+ //std::cout << std::endl;
- }
- }
- }
-diff --git a/src/CircMNTable3D.cc b/src/CircMNTable3D.cc
-index 052aea2..7e39d66 100644
---- a/src/CircMNTable3D.cc
-+++ b/src/CircMNTable3D.cc
-@@ -35,7 +35,7 @@ CircMNTable3D::CircMNTable3D(const Vector3& MinPt,const Vector3& MaxPt,double cd
- double nx=(MaxPt-MinPt).X()/m_celldim;
- // error message if not
- if(nx!=floor(nx)){
-- std::cerr << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic x-dimension " << (MaxPt-MinPt).X() << std::endl;
-+ std::cout << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic x-dimension " << (MaxPt-MinPt).X() << std::endl;
- }
- m_shift_x=Vector3((m_max_pt-m_min_pt).X(),0.0,0.0);
- set_x_circ();
-@@ -161,7 +161,7 @@ bool CircMNTable3D::checkInsertable(const Sphere& S,unsigned int gid)
- // for(map<double,const Sphere*>::const_iterator iter=close_spheres.begin();
- // iter!=close_spheres.end();
- // iter++){
--// std::cerr << iter->first << " | " << *(iter->second) << std::endl;
-+// std::cout << iter->first << " | " << *(iter->second) << std::endl;
- // }
- }
- } else {
-@@ -227,7 +227,7 @@ bool CircMNTable3D::insertChecked(const Sphere& S,unsigned int gid,double tol)
- */
- void CircMNTable3D::generateBonds(int gid,double tol,int btag)
- {
-- std::cerr << "MNTable3D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
-+ std::cout << "MNTable3D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
- for(int i=0;i<m_nx-1;i++){
- for(int j=1;j<m_ny-1;j++){
- for(int k=1;k<m_nz-1;k++){
-diff --git a/src/CircMNTableXY2D.cc b/src/CircMNTableXY2D.cc
-index f4aec98..c76dce5 100644
---- a/src/CircMNTableXY2D.cc
-+++ b/src/CircMNTableXY2D.cc
-@@ -42,7 +42,7 @@ CircMNTableXY2D::CircMNTableXY2D(const Vector3& MinPt,const Vector3& MaxPt,doubl
- double ny=(MaxPt-MinPt).Y()/m_celldim;
- // error message if not
- if(ny!=floor(ny)){
-- std::cerr << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic y-dimension " << (MaxPt-MinPt).Y() << std::endl;
-+ std::cout << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic y-dimension " << (MaxPt-MinPt).Y() << std::endl;
- }
- double shift_y=(m_ny-2)*m_celldim;
- m_shift_vec_y=Vector3(0.0,shift_y,0.0);
-@@ -178,7 +178,7 @@ bool CircMNTableXY2D::insertChecked(const Sphere& S,unsigned int gid,double tol)
- int idx=getXIndex(S.Center());
- int idy=getYIndex(S.Center());
-
--// std::cerr << "CircMNTable2D::insertChecked(" << S << ") id=" << id << " idx= " << idx << std::endl;
-+// std::cout << "CircMNTable2D::insertChecked(" << S << ") id=" << id << " idx= " << idx << std::endl;
-
- tol+=s_small_value;
- if((id!=-1) && (idx!=0) && (idx!=m_nx-1) && (idy!=0) && (idy!=m_ny-1) && (gid<m_ngroups)){
-@@ -240,7 +240,7 @@ bool CircMNTableXY2D::insertChecked(const Sphere& S,unsigned int gid,double tol)
- */
- void CircMNTableXY2D::generateBonds(int gid,double tol,int btag)
- {
-- std::cerr << "CircMNTableXY2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl;
-+ std::cout << "CircMNTableXY2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl;
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
- for(int j=0;j<m_ny-1;j++){
-diff --git a/src/DifferenceVol.cc b/src/DifferenceVol.cc
-index 6d80de2..ad6967b 100644
---- a/src/DifferenceVol.cc
-+++ b/src/DifferenceVol.cc
-@@ -26,14 +26,14 @@ using std::make_pair;
-
- DifferenceVol::DifferenceVol()
- {
-- std::cerr << "WARNING: DifferenceVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
-+ std::cout << "WARNING: DifferenceVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
- m_vol1 = NULL;
- m_vol2 = NULL;
- }
-
- DifferenceVol::DifferenceVol(AVolume3D& v1, AVolume3D& v2)
- {
-- std::cerr << "WARNING: DifferenceVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
-+ std::cout << "WARNING: DifferenceVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
- m_vol1 = &v1;
- m_vol2 = &v2;
-
-diff --git a/src/DogBone.cc b/src/DogBone.cc
-index 30adbc6..9dd378f 100644
---- a/src/DogBone.cc
-+++ b/src/DogBone.cc
-@@ -41,7 +41,7 @@ DogBone::DogBone(const Vector3& c,const Vector3& axis,double l,double r,double l
- // torus outer radius
- double ro=ri+r2;
-
-- std::cerr << "torus: " << tcenter << " - " << ro << " , " << ri << std::endl;
-+ std::cout << "torus: " << tcenter << " - " << ro << " , " << ri << std::endl;
- m_tor=Torus(tcenter,axis,ro,ri,false);
- }
-
-diff --git a/src/FullCircMNTable3D.cc b/src/FullCircMNTable3D.cc
-index d13579a..4e33d27 100644
---- a/src/FullCircMNTable3D.cc
-+++ b/src/FullCircMNTable3D.cc
-@@ -45,10 +45,10 @@ FullCircMNTable3D::FullCircMNTable3D(const Vector3& MinPt,const Vector3& MaxPt,d
- double nz=(MaxPt-MinPt).Z()/m_celldim;
- // error message if not
- if(ny!=floor(ny)){
-- std::cerr << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic y-dimension " << (MaxPt-MinPt).Y() << std::endl;
-+ std::cout << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic y-dimension " << (MaxPt-MinPt).Y() << std::endl;
- }
- if(nz!=floor(nz)){
-- std::cerr << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic z-dimension " << (MaxPt-MinPt).Z() << std::endl;
-+ std::cout << "WARNING! grid spacing " << m_celldim << " doesn't fit periodic z-dimension " << (MaxPt-MinPt).Z() << std::endl;
- }
- }
-
-@@ -261,7 +261,7 @@ bool FullCircMNTable3D::checkInsertable(const Sphere& S,unsigned int gid)
- // for(map<double,const Sphere*>::const_iterator iter=close_spheres.begin();
- // iter!=close_spheres.end();
- // iter++){
--// std::cerr << iter->first << " | " << *(iter->second) << std::endl;
-+// std::cout << iter->first << " | " << *(iter->second) << std::endl;
- // }
- }
- } else {
-@@ -279,7 +279,7 @@ bool FullCircMNTable3D::checkInsertable(const Sphere& S,unsigned int gid)
- */
- void FullCircMNTable3D::generateBonds(int gid,double tol,int btag)
- {
-- std::cerr << "FullCircMNTable3D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl;
-+ std::cout << "FullCircMNTable3D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl;
- // loop over all inner cells
- for(int i=0;i<m_nx-1;i++){
- for(int j=0;j<m_ny-1;j++){
-@@ -292,25 +292,25 @@ void FullCircMNTable3D::generateBonds(int gid,double tol,int btag)
- int id2=idx(i+ii,j+jj,k+kk);
- vector<pair<int,int> > bonds;
- if((ii+jj+kk)==0){ // intra-cell, not for boundary
-- // std::cerr << id << " - " << id << std::endl;
-+ // std::cout << id << " - " << id << std::endl;
- bonds=m_data[id].getBonds(gid,tol);
- } else if(id2>id){ // inter-cell
-- //std::cerr << id << " - " << id2 << std::endl;
-+ //std::cout << id << " - " << id2 << std::endl;
- bonds=m_data[id].getBonds(gid,tol,m_data[id2]);
- }
- for(vector<pair<int,int> >::iterator iter=bonds.begin();
- iter!=bonds.end();
- iter++){
-- //std::cerr << iter->first << " | " << iter->second << " ";
-+ //std::cout << iter->first << " | " << iter->second << " ";
- if(iter->second > iter->first){
- m_bonds[btag].insert(*iter);
- }
- }
-- //std::cerr << std::endl;
-+ //std::cout << std::endl;
- }
- }
- }
-- //std::cerr << std::endl;
-+ //std::cout << std::endl;
- }
- }
- }
-diff --git a/src/GenericShape.cc b/src/GenericShape.cc
-index 75d9132..03ae734 100644
---- a/src/GenericShape.cc
-+++ b/src/GenericShape.cc
-@@ -96,7 +96,7 @@ GenericShape::GenericShape(string fileDB, string name) {
- valid = 1;
- }
- } catch (boost::regex_error& e) {
-- std::cerr << "Regexp failed:" << e.code() << std::endl;
-+ std::cout << "Regexp failed:" << e.code() << std::endl;
- }
- if ( origins.size() != radii.size() ) {
- std::cout << "Parsed " << radii.size() << " radii and " << origins.size()
-diff --git a/src/HGrainGenerator.cc b/src/HGrainGenerator.cc
-index 1cb738a..fefda39 100644
---- a/src/HGrainGenerator.cc
-+++ b/src/HGrainGenerator.cc
-@@ -63,7 +63,7 @@ void HGrainGenerator2D::generatePacking(AVolume2D* vol,MNTable2D* ntable,int gid
- int jmax=int(floor(dy/(m_rad*sqrt(3.0))))+1;
- // check if odd or even
- bool even=(dx-(double(imax)*m_rad*2.0)>0.5*m_rad);
-- std::cerr << "imax, jmax, even " << imax << " " << jmax << " " << even << std::endl;
-+ std::cout << "imax, jmax, even " << imax << " " << jmax << " " << even << std::endl;
- // seed positions
- for(int i=0;i<imax-1;i++){
- for(int j=0;j<jmax;j++){
-diff --git a/src/HexAggregateInsertGenerator2D.cc b/src/HexAggregateInsertGenerator2D.cc
-index 392750e..b33d820 100644
---- a/src/HexAggregateInsertGenerator2D.cc
-+++ b/src/HexAggregateInsertGenerator2D.cc
-@@ -55,7 +55,7 @@ HexAggregateInsertGenerator2D::HexAggregateInsertGenerator2D(double rmin,
- */
- void HexAggregateInsertGenerator2D::seedParticles(AVolume2D* vol,MNTable2D*ntable ,int gid,int tag)
- {
-- std::cerr << "HexAggregateInsertGenerator2D::seedParticles" << std::endl;
-+ std::cout << "HexAggregateInsertGenerator2D::seedParticles" << std::endl;
- // get bounding box
- pair<Vector3,Vector3> bbx=vol->getBoundingBox();
- double dx=(bbx.second.X()-bbx.first.X())-2.0*m_rmax;
-@@ -224,13 +224,13 @@ void HexAggregateInsertGenerator2D::fillIn(AVolume2D* vol,MNTable2D* ntable ,int
- }
- }
- count_insert++;
-- if((count_insert%100)==0) std::cerr << "inserted: " << count_insert << std::endl;
-+ if((count_insert%100)==0) std::cout << "inserted: " << count_insert << std::endl;
- total_tries+=countfail;
-- if(countfail>m_max_tries/10) std::cerr << countfail << " tries" << std::endl;
-+ if(countfail>m_max_tries/10) std::cout << countfail << " tries" << std::endl;
- countfail=0; // reset failure counter
- } else countfail++;
- } else countfail++;
- }
- }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-diff --git a/src/HexAggregateInsertGenerator2DRand.cc b/src/HexAggregateInsertGenerator2DRand.cc
-index f3848ff..8a378d0 100644
---- a/src/HexAggregateInsertGenerator2DRand.cc
-+++ b/src/HexAggregateInsertGenerator2DRand.cc
-@@ -64,7 +64,7 @@ HexAggregateInsertGenerator2DRand::HexAggregateInsertGenerator2DRand(double rmin
- */
- void HexAggregateInsertGenerator2DRand::seedParticles(AVolume2D* vol,MNTable2D*ntable ,int gid,int tag)
- {
-- std::cerr << "HexAggregateInsertGenerator2DRand::seedParticles" << std::endl;
-+ std::cout << "HexAggregateInsertGenerator2DRand::seedParticles" << std::endl;
- // get bounding box
- pair<Vector3,Vector3> bbx=vol->getBoundingBox();
- double dx=(bbx.second.X()-bbx.first.X())-2.0*m_rmax;
-@@ -230,13 +230,13 @@ void HexAggregateInsertGenerator2DRand::fillIn(AVolume2D* vol,MNTable2D* ntable
- }
- }
- count_insert++;
-- if((count_insert%100)==0) std::cerr << "inserted: " << count_insert << std::endl;
-+ if((count_insert%100)==0) std::cout << "inserted: " << count_insert << std::endl;
- total_tries+=countfail;
-- if(countfail>m_max_tries/10) std::cerr << countfail << " tries" << std::endl;
-+ if(countfail>m_max_tries/10) std::cout << countfail << " tries" << std::endl;
- countfail=0; // reset failure counter
- } else countfail++;
- } else countfail++;
- }
- }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-diff --git a/src/HexAggregateInsertGenerator3D.cc b/src/HexAggregateInsertGenerator3D.cc
-index ea106ee..dcae0c0 100644
---- a/src/HexAggregateInsertGenerator3D.cc
-+++ b/src/HexAggregateInsertGenerator3D.cc
-@@ -146,7 +146,7 @@ void HexAggregateInsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntab
- std::cout << "HexAggregateInsertGenerator3D::seedParticles" << std::endl;
- // get bounding box
- pair<Vector3,Vector3> bbx=vol->getBoundingBox();
-- std::cerr << "bbx: " << bbx.first << " - " << bbx.second << std::endl;
-+ std::cout << "bbx: " << bbx.first << " - " << bbx.second << std::endl;
- double dx=(bbx.second.X()-bbx.first.X());
- double dy=(bbx.second.Y()-bbx.first.Y());
- double dz=(bbx.second.Z()-bbx.first.Z());
-@@ -244,10 +244,10 @@ void HexAggregateInsertGenerator3D::fillIn(AVolume3D*vol ,MNTable3D* ntable,int
- total_tries+=countfail;
- last_fail_count+=countfail;
- if((count_insert%100)==0) {
-- std::cerr << "inserted " << count_insert << " at avg. " << double(last_fail_count)*0.01 << std::endl;
-+ std::cout << "inserted " << count_insert << " at avg. " << double(last_fail_count)*0.01 << std::endl;
- last_fail_count=0;
- }
-- //if(countfail>m_max_tries/10) std::cerr << countfail << " tries" << std::endl;
-+ //if(countfail>m_max_tries/10) std::cout << countfail << " tries" << std::endl;
- countfail=0; // reset failure counter
- } else {
- countfail++;
-@@ -255,5 +255,5 @@ void HexAggregateInsertGenerator3D::fillIn(AVolume3D*vol ,MNTable3D* ntable,int
- } else countfail++;
- }
- }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-diff --git a/src/InsertGenerator2D.cc b/src/InsertGenerator2D.cc
-index 5a13108..59a31c0 100644
---- a/src/InsertGenerator2D.cc
-+++ b/src/InsertGenerator2D.cc
-@@ -222,15 +222,15 @@ void InsertGenerator2D::fillIn(AVolume2D* vol,MNTable2D* ntable,int gid, int tag
- nsph.setTag(tag);
- ntable->insertChecked(nsph,gid); // insert
- count_insert++;
-- if((count_insert%100)==0) std::cerr << "inserted: " << count_insert << std::endl;
-+ if((count_insert%100)==0) std::cout << "inserted: " << count_insert << std::endl;
- total_tries+=countfail;
-- if(countfail>m_max_tries/10) std::cerr << countfail << " tries" << std::endl;
-+ if(countfail>m_max_tries/10) std::cout << countfail << " tries" << std::endl;
- countfail=0; // reset failure counter
- } else countfail++;
- } else countfail++;
- }
- }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-
- ostream& operator << (ostream& ost,const InsertGenerator2D& T)
-diff --git a/src/InsertGenerator3D.cc b/src/InsertGenerator3D.cc
-index c1cdf70..1f8bb32 100644
---- a/src/InsertGenerator3D.cc
-+++ b/src/InsertGenerator3D.cc
-@@ -164,7 +164,7 @@ void InsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntable,int gid,
- // get bounding box
- std::cout << "InsertGenerator3D::seedParticles" << std::endl;
- pair<Vector3,Vector3> bbx=vol->getBoundingBox();
-- std::cerr << "bbx: " << bbx.first << " - " << bbx.second << std::endl;
-+ std::cout << "bbx: " << bbx.first << " - " << bbx.second << std::endl;
- double dx=(bbx.second.X()-bbx.first.X());
- double dy=(bbx.second.Y()-bbx.first.Y());
- double dz=(bbx.second.Z()-bbx.first.Z());
-@@ -214,7 +214,7 @@ void InsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntable,int gid,
- jitter=m_rmax-r;
- }
- }
-- //std::cerr << "pos: " << Vector3(px,py,pz) << " r: " << r << std::endl;
-+ //std::cout << "pos: " << Vector3(px,py,pz) << " r: " << r << std::endl;
- // jitter position
- double dx=jitter*(2.0*((double)(rand())/(double)(RAND_MAX))-1.0);
- double dy=jitter*(2.0*((double)(rand())/(double)(RAND_MAX))-1.0);
-@@ -224,9 +224,9 @@ void InsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntable,int gid,
- if(fit){
- S.setTag(tag);
- ntable->insertChecked(S,gid);
-- //std::cerr << "inserted" << std::endl;
-+ //std::cout << "inserted" << std::endl;
- } // else {
--// std::cerr << "isIn " << vol->isIn(S) << " insertable: " << ntable->checkInsertable(S,gid) << std::endl;
-+// std::cout << "isIn " << vol->isIn(S) << " insertable: " << ntable->checkInsertable(S,gid) << std::endl;
- // }
- }
- }
-@@ -247,7 +247,7 @@ void InsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntable,int gid,
- // get bounding box
- std::cout << "InsertGenerator3D::seedParticles" << std::endl;
- pair<Vector3,Vector3> bbx=vol->getBoundingBox();
-- std::cerr << "bbx: " << bbx.first << " - " << bbx.second << std::endl;
-+ std::cout << "bbx: " << bbx.first << " - " << bbx.second << std::endl;
- double dx=(bbx.second.X()-bbx.first.X());
- double dy=(bbx.second.Y()-bbx.first.Y());
- double dz=(bbx.second.Z()-bbx.first.Z());
-@@ -284,7 +284,7 @@ void InsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntable,int gid,
- } else {
- r=m_rmin+((m_rmax-m_rmin)*((double)(rand())/(double)(RAND_MAX)));
- }
-- //std::cerr << "pos: " << Vector3(px,py,pz) << " r: " << r << std::endl;
-+ //std::cout << "pos: " << Vector3(px,py,pz) << " r: " << r << std::endl;
- Sphere S(Vector3(px,py,pz),r);
- bool fit=vol->isIn(S) && ntable->checkInsertable(S,gid);
- if(fit){
-@@ -292,9 +292,9 @@ void InsertGenerator3D::seedParticles(AVolume3D* vol,MNTable3D* ntable,int gid,
- //S.setTag(tag);
- sList->insertShape(Vector3(px,py,pz),r,ntable,tag,gid);
- //ntable->insertChecked(S,gid);
-- //std::cerr << "inserted" << std::endl;
-+ //std::cout << "inserted" << std::endl;
- } // else {
--// std::cerr << "isIn " << vol->isIn(S) << " insertable: " << ntable->checkInsertable(S,gid) << std::endl;
-+// std::cout << "isIn " << vol->isIn(S) << " insertable: " << ntable->checkInsertable(S,gid) << std::endl;
- // }
- }
- }
-@@ -356,7 +356,7 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
- total_tries+=countfail;
- last_fail_count+=countfail;
- if((count_insert%100)==0) {
-- std::cerr << "inserted " << count_insert << " at avg. " << double(last_fail_count)*0.01 << std::endl;
-+ std::cout << "inserted " << count_insert << " at avg. " << double(last_fail_count)*0.01 << std::endl;
- last_fail_count=0;
- }
- countfail=0; // reset failure counter
-@@ -367,7 +367,7 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
- } else countfail++;
- }
- // }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-
- /*!
-@@ -384,7 +384,7 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
-
- // get vol. of particles already in ntable
- double tvol=ntable->getSumVolume(gid);
-- std::cerr << "particle volume: " << tvol << std::endl;
-+ std::cout << "particle volume: " << tvol << std::endl;
-
- Sphere nsph;
-
-@@ -431,10 +431,10 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
- total_tries+=countfail;
- last_fail_count+=countfail;
- if((count_insert%100)==0) {
-- std::cerr << "inserted " << count_insert << " with volume " << tvol << " at avg. " << double(last_fail_count)*0.01 << std::endl;
-+ std::cout << "inserted " << count_insert << " with volume " << tvol << " at avg. " << double(last_fail_count)*0.01 << std::endl;
- last_fail_count=0;
- }
-- //if(countfail>m_max_tries/10) std::cerr << countfail << " tries" << std::endl;
-+ //if(countfail>m_max_tries/10) std::cout << countfail << " tries" << std::endl;
- countfail=0; // reset failure counter
- } else {
- countfail++;
-@@ -442,7 +442,7 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
- } else countfail++;
- }
- }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-
-
-@@ -500,10 +500,10 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
- total_tries+=countfail;
- last_fail_count+=countfail;
- if((count_insert%100)==0) {
-- std::cerr << "inserted " << count_insert << " at avg. " << double(last_fail_count)*0.01 << std::endl;
-+ std::cout << "inserted " << count_insert << " at avg. " << double(last_fail_count)*0.01 << std::endl;
- last_fail_count=0;
- }
-- //if(countfail>m_max_tries/10) std::cerr << countfail << " tries" << std::endl;
-+ //if(countfail>m_max_tries/10) std::cout << countfail << " tries" << std::endl;
- countfail=0; // reset failure counter
- } else {
- countfail++;
-@@ -511,7 +511,7 @@ void InsertGenerator3D::fillIn(AVolume3D* vol,MNTable3D* ntable,int gid, int tag
- } else countfail++;
- }
- }
-- std::cerr << "total tries: " << total_tries << std::endl;
-+ std::cout << "total tries: " << total_tries << std::endl;
- }
-
- ostream& operator << (ostream& ost,const InsertGenerator3D& T)
-diff --git a/src/IntersectionVol.cc b/src/IntersectionVol.cc
-index e38200b..5ff9e4c 100644
---- a/src/IntersectionVol.cc
-+++ b/src/IntersectionVol.cc
-@@ -26,14 +26,14 @@ using std::make_pair;
-
- IntersectionVol::IntersectionVol()
- {
-- std::cerr << "WARNING: IntersectionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
-+ std::cout << "WARNING: IntersectionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
- m_vol1 = NULL;
- m_vol2 = NULL;
- }
-
- IntersectionVol::IntersectionVol(AVolume3D& v1, AVolume3D& v2)
- {
-- std::cerr << "WARNING: IntersectionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
-+ std::cout << "WARNING: IntersectionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
- m_vol1 = &v1;
- m_vol2 = &v2;
-
-diff --git a/src/MNTable2D.cc b/src/MNTable2D.cc
-index 27f3f4d..cfa4506 100644
---- a/src/MNTable2D.cc
-+++ b/src/MNTable2D.cc
-@@ -526,7 +526,7 @@ void MNTable2D::removeTagged(int gid,int tag,int mask)
- */
- void MNTable2D::generateBonds(int gid,double tol,int btag)
- {
-- //std::cerr << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
-+ //std::cout << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
- for(int j=0;j<m_ny-1;j++){
-@@ -564,7 +564,7 @@ void MNTable2D::generateBonds(int gid,double tol,int btag)
- */
- void MNTable2D::generateBondsWithMask(int gid,double tol,int btag, int ptag, int mask)
- {
-- //std::cerr << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag <<
-+ //std::cout << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag <<
- // " " << ptag <<" " << mask<<" )" << std::endl; // loop over all cells
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
-@@ -640,7 +640,7 @@ void MNTable2D::generateBondsTaggedMasked(int gid,double tol,int btag,int ptag1,
- */
- void MNTable2D::generateRandomBonds(int gid,double tol,double prob,int btag, int ptag, int mask)
- {
-- //std::cerr << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag <<
-+ //std::cout << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag <<
- // " " << ptag <<" " << mask<<" )" << std::endl; // loop over all cells
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
-@@ -677,7 +677,7 @@ void MNTable2D::generateRandomBonds(int gid,double tol,double prob,int btag, int
- */
- void MNTable2D::generateClusterBonds(int gid,double tol,int btag1, int btag2)
- {
-- //std::cerr << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
-+ //std::cout << "MNTable2D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
- // loop over all cells
- for(int i=0;i<m_nx-1;i++){
- for(int j=0;j<m_ny-1;j++){
-diff --git a/src/MNTable3D.cc b/src/MNTable3D.cc
-index 23ae03c..c736b54 100644
---- a/src/MNTable3D.cc
-+++ b/src/MNTable3D.cc
-@@ -56,7 +56,7 @@ MNTable3D::MNTable3D(const Vector3& MinPt,const Vector3& MaxPt,double cd,unsigne
- m_nx=int(ceil(req_size.X()/m_celldim))+2;
- m_ny=int(ceil(req_size.Y()/m_celldim))+2;
- m_nz=int(ceil(req_size.Z()/m_celldim))+2;
-- std::cerr << "nx,ny,nz: " << m_nx << " , " << m_ny << " , " << m_nz << std::endl;
-+ std::cout << "nx,ny,nz: " << m_nx << " , " << m_ny << " , " << m_nz << std::endl;
-
- // add padding
- m_origin=MinPt-Vector3(m_celldim,m_celldim,m_celldim);
-@@ -126,12 +126,12 @@ bool MNTable3D::insertFromRawFile(const string& filename,double scale,double tol
-
- bool can_insert=insertChecked(Sphere(Vector3(x*scale,y*scale,z*scale),r*scale),0,tol);
- if(!can_insert){
-- std::cerr << "couldn't insert particle : " << Vector3(x*scale,y*scale,z*scale) << " r= " << r*scale << std::endl;
-+ std::cout << "couldn't insert particle : " << Vector3(x*scale,y*scale,z*scale) << " r= " << r*scale << std::endl;
- } else {
- count++;
- }
- }
-- std::cerr << "inserted particle count:" << count << std::endl;
-+ std::cout << "inserted particle count:" << count << std::endl;
-
- infile.close();
-
-@@ -460,7 +460,7 @@ bool MNTable3D::checkInsertable(const Sphere& S,unsigned int gid)
- // for(map<double,const Sphere*>::const_iterator iter=close_spheres.begin();
- // iter!=close_spheres.end();
- // iter++){
--// std::cerr << iter->first << " | " << *(iter->second) << std::endl;
-+// std::cout << iter->first << " | " << *(iter->second) << std::endl;
- // }
- }
- } else {
-@@ -499,7 +499,7 @@ double MNTable3D::getSumVolume(int gid)
- */
- void MNTable3D::generateBonds(int gid,double tol,int btag)
- {
-- std::cerr << "MNTable3D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
-+ std::cout << "MNTable3D::generateBonds( " << gid << " , " << tol << " , " << btag << " )" << std::endl; // loop over all cells
- for(int i=1;i<m_nx-1;i++){
- for(int j=1;j<m_ny-1;j++){
- for(int k=1;k<m_nz-1;k++){
-@@ -539,7 +539,7 @@ void MNTable3D::generateBonds(int gid,double tol,int btag)
- */
- void MNTable3D::generateBondsTagged(int gid,double tol,int btag,int tag1,int tag2)
- {
-- std::cerr << "MNTable3D::generateBondsTagged( " << gid << " , " << tol << " , " << btag << " , " << tag1 << " , " << tag2 << " )" << std::endl; // loop over all cells
-+ std::cout << "MNTable3D::generateBondsTagged( " << gid << " , " << tol << " , " << btag << " , " << tag1 << " , " << tag2 << " )" << std::endl; // loop over all cells
- for(int i=1;i<m_nx-1;i++){
- for(int j=1;j<m_ny-1;j++){
- for(int k=1;k<m_nz-1;k++){
-@@ -581,7 +581,7 @@ void MNTable3D::generateBondsTagged(int gid,double tol,int btag,int tag1,int tag
- */
- void MNTable3D::generateRandomBonds(int gid,double tol, double prob, int btag,int ptag,int mask)
- {
-- std::cerr << "MNTable3D::generateRandomBonds( " << gid << " , " << tol << " , " << prob << " , " << btag << " , " << ptag << " , " << mask << " )" << std::endl;
-+ std::cout << "MNTable3D::generateRandomBonds( " << gid << " , " << tol << " , " << prob << " , " << btag << " , " << ptag << " , " << mask << " )" << std::endl;
- // loop over all cells
- for(int i=1;i<m_nx-1;i++){
- for(int j=1;j<m_ny-1;j++){
-@@ -674,7 +674,7 @@ void MNTable3D::generateClusterBonds(int gid,double tol,int btag1, int btag2)
- */
- void MNTable3D::generateBondsWithJointSet(const TriPatchSet& Joints,int gid,double tol,int tag)
- {
-- std::cerr << "MNTable3D::generateBondsWithJointSet( " << tag << " )" << std::endl;
-+ std::cout << "MNTable3D::generateBondsWithJointSet( " << tag << " )" << std::endl;
- // loop over all cells
- for(int i=1;i<m_nx-1;i++){
- for(int j=1;j<m_ny-1;j++){
-diff --git a/src/PolygonWithLines2D.cc b/src/PolygonWithLines2D.cc
-index 7f9d741..4d895b5 100644
---- a/src/PolygonWithLines2D.cc
-+++ b/src/PolygonWithLines2D.cc
-@@ -115,11 +115,11 @@ PolygonWithLines2D::PolygonWithLines2D(boost::python::list corners)
- m_pmax=comp_max(m_pmax,*iter);
- }
- // m_vertices[idx]=m_vertices[0]; // closure
-- std::cerr << m_pmin << " - " << m_pmax << std::endl;
-+ std::cout << m_pmin << " - " << m_pmax << std::endl;
- m_nsides=idx;
- m_centre=0.5*(m_pmin+m_pmax);
- for(int i=0;i<m_nsides;i++){
-- std::cerr << m_vertices[i] << std::endl;
-+ std::cout << m_vertices[i] << std::endl;
- }
- }
-
-diff --git a/src/ShapeList.cc b/src/ShapeList.cc
-index 15c8525..2011d09 100644
---- a/src/ShapeList.cc
-+++ b/src/ShapeList.cc
-@@ -43,7 +43,7 @@ void ShapeList::insertShape(Vector3 pos, double radius, MNTable3D* ntable, int t
- randomValue = randomValue - shapeList[i]->bias();
- i++;
- if (i == shapeList.size() ) {
-- std::cerr << "Error in ShapeList::insertShape :> randomValue too high\n";
-+ std::cout << "Error in ShapeList::insertShape :> randomValue too high\n";
- return;
- }
- }
-diff --git a/src/TriBox.cc b/src/TriBox.cc
-index f59272f..62f6599 100644
---- a/src/TriBox.cc
-+++ b/src/TriBox.cc
-@@ -117,7 +117,7 @@ bool TriBox::isIn(const Vector3& V) const
- double dx=(m_pmax.x()-m_pmin.x())/2.0;
- double xmin=(m_pmin.x()+m_pmax.x())/2.0-dx*ry;
- double xmax=(m_pmin.x()+m_pmax.x())/2.0+dx*ry;
-- // std::cerr << "y: " << V.Y() << " dy: " << dy << " ry: " << ry << " dx: " << dx << " xmin: " << xmin << "xmax: " << xmax << std::endl;
-+ // std::cout << "y: " << V.Y() << " dy: " << dy << " ry: " << ry << " dx: " << dx << " xmin: " << xmin << "xmax: " << xmax << std::endl;
- res=res && (V.x()<xmax) && (V.x()>xmin);
- } else {
- res=false;
-@@ -134,14 +134,14 @@ bool TriBox::isIn(const Sphere& S)
-
- vector<Plane>::iterator iter=m_planes.begin();
-
-- // std::cerr << "p: " << p<< " r: " << r;
-+ // std::cout << "p: " << p<< " r: " << r;
- double dist=2*r;
- while((iter!=m_planes.end()) && (dist>r)){
- dist=iter->getDist(p);
-- // std::cerr << " dist: " << dist ;
-+ // std::cout << " dist: " << dist ;
- iter++;
- }
-- // std::cerr << std::endl;
-+ // std::cout << std::endl;
-
- return res && (dist>r);
- }
-diff --git a/src/TriPatchSet.cc b/src/TriPatchSet.cc
-index 102673b..f869c1a 100644
---- a/src/TriPatchSet.cc
-+++ b/src/TriPatchSet.cc
-@@ -56,6 +56,6 @@ void TriPatchSet::addTriangle(const Vector3& p1, const Vector3& p2, const Vector
- m_pmax=tmax;
- m_bbx_set=true;
- }
-- //std::cerr << "patch set size: " << m_triangles.size()
-+ //std::cout << "patch set size: " << m_triangles.size()
- //<< " bbx: " << m_pmin << " - " << m_pmax << std::endl;
- }
-diff --git a/src/UnionVol.cc b/src/UnionVol.cc
-index 94bccc3..a81ada7 100644
---- a/src/UnionVol.cc
-+++ b/src/UnionVol.cc
-@@ -26,14 +26,14 @@ using std::make_pair;
-
- UnionVol::UnionVol()
- {
-- std::cerr << "WARNING: UnionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
-+ std::cout << "WARNING: UnionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
- m_vol1 = NULL;
- m_vol2 = NULL;
- }
-
- UnionVol::UnionVol(AVolume3D& v1, AVolume3D& v2)
- {
-- std::cerr << "WARNING: UnionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
-+ std::cout << "WARNING: UnionVol is an experimental feature and may not always work as expected. For details see doc/CSG.readme" << std::endl;
- m_vol1 = &v1;
- m_vol2 = &v2;
-
-diff --git a/src/granular_gouge.cc b/src/granular_gouge.cc
-index 50a4889..9ca7f7e 100644
---- a/src/granular_gouge.cc
-+++ b/src/granular_gouge.cc
-@@ -309,7 +309,7 @@ void generate_granular_gouge(MNTable3D* NT,
- double grmax,
- int gntry)
- {
-- std::cerr << "Granular Gouge: " << Pmin << " - " << Pmax << " " << grmin << " " << grmax << " " << gntry << std::endl;
-+ std::cout << "Granular Gouge: " << Pmin << " - " << Pmax << " " << grmin << " " << grmax << " " << gntry << std::endl;
- // == stage 1 - generate grains ==
- // -- setup auxillary Table,Volume and Generator
- MNTable3D T_aux(Pmin,Pmax,2.1*grmax,1);
-@@ -325,7 +325,7 @@ void generate_granular_gouge(MNTable3D* NT,
- // == stage 2 - fill grains ==
- // -- get nr. of grains
- int ngr=grain_sph.size();
-- std::cerr << " found " << ngr << " grains" << std:: endl;
-+ std::cout << " found " << ngr << " grains" << std:: endl;
- // -- grow nr. of particle groups in main NTable
- NT->GrowNGroups(1+ngr);
- // -- for each grain, do filling
-diff --git a/src/main.cc b/src/main.cc
-index 1011b31..1375679 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -42,7 +42,7 @@
- #include <iostream>
-
- using std::cout;
--using std::cerr;
-+using std::cout;
- using std::endl;
-
- // -- System includes --
-@@ -100,7 +100,7 @@ int main(int argc, char** argv)
-
- vol=xsize*ysize;
- double poros=(vol-T.getSumVolume(0))/vol;
-- cerr << "Porosity: " << poros << endl;
-+ cout << "Porosity: " << poros << endl;
-
- cout << T << endl;
-
-@@ -124,7 +124,7 @@ int main(int argc, char** argv)
-
- double vol=2.0*size*size*size;
- double poros=(vol-T.getSumVolume(0))/vol;
-- cerr << "Porosity: " << poros << endl;
-+ cout << "Porosity: " << poros << endl;
-
- cout << T << endl;
- } else if(dim==4){ // Cylinder, 3:1
-@@ -223,7 +223,7 @@ int main(int argc, char** argv)
-
- vol=size*size;
- double poros=(vol-T.getSumVolume(0))/vol;
-- cerr << "Porosity: " << poros << endl;
-+ cout << "Porosity: " << poros << endl;
-
- cout << T << endl;
-
-@@ -269,7 +269,7 @@ int main(int argc, char** argv)
-
- vol=xsize*ysize;
- double poros=(vol-T.getSumVolume(0))/vol;
-- cerr << "Porosity: " << poros << endl;
-+ cout << "Porosity: " << poros << endl;
-
- cout << T << endl;
-
-diff --git a/src/main_gouge.cc b/src/main_gouge.cc
-index 104f856..ed346f2 100644
---- a/src/main_gouge.cc
-+++ b/src/main_gouge.cc
-@@ -20,7 +20,7 @@
- #include <iostream>
-
- using std::cout;
--using std::cerr;
-+using std::cout;
- using std::endl;
-
- // -- System includes --
-diff --git a/src/main_hlayer.cc b/src/main_hlayer.cc
-index 4cb6ec3..c544149 100644
---- a/src/main_hlayer.cc
-+++ b/src/main_hlayer.cc
-@@ -20,7 +20,7 @@
- #include <iostream>
-
- using std::cout;
--using std::cerr;
-+using std::cout;
- using std::endl;
-
- // -- System includes --
-diff --git a/src/main_layered.cc b/src/main_layered.cc
-index 436dbfc..89c2cd7 100644
---- a/src/main_layered.cc
-+++ b/src/main_layered.cc
-@@ -21,7 +21,7 @@
- #include <iostream>
-
- using std::cout;
--using std::cerr;
-+using std::cout;
- using std::endl;
-
- // -- System includes --
-diff --git a/src/main_sbx.cc b/src/main_sbx.cc
-index f01deb4..4a0f74d 100644
---- a/src/main_sbx.cc
-+++ b/src/main_sbx.cc
-@@ -32,7 +32,7 @@
- #include <iostream>
-
- using std::cout;
--using std::cerr;
-+using std::cout;
- using std::endl;
-
- // -- System includes --
-@@ -92,7 +92,7 @@ int main(int argc, char** argv)
-
- vol=xsize*ysize;
- double poros=(vol-T.getSumVolume(0))/vol;
-- cerr << "Porosity: " << poros << endl;
-+ cout << "Porosity: " << poros << endl;
-
- cout << T << endl;
-
-@@ -116,7 +116,7 @@ int main(int argc, char** argv)
-
- double vol=2.0*size*size*size;
- double poros=(vol-T.getSumVolume(0))/vol;
-- cerr << "Porosity: " << poros << endl;
-+ cout << "Porosity: " << poros << endl;
-
- cout << T << endl;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 1056443..a49c9f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-rpath.patch
-replace_cerr_by_cout.patch
-gcc5.patch
+10_gcc5.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-demgengeo.git
More information about the debian-science-commits
mailing list