yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2179
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-04-25 17:48:22 +0200
message:
  1. Forgotten fixes.
modified:
  pkg/dem/PreProcessor/STLImporter.cpp
  pkg/dem/meta/Shop.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'pkg/dem/PreProcessor/STLImporter.cpp'
--- pkg/dem/PreProcessor/STLImporter.cpp	2010-04-25 13:18:11 +0000
+++ pkg/dem/PreProcessor/STLImporter.cpp	2010-04-25 15:48:22 +0000
@@ -18,7 +18,7 @@
 
 	// Load geometry
     vector<double> vtmp, ntmp; vector<int>  etmp, ftmp;
-    STLReader reader; reader.tolerance=Math<Real>::Zero()_TOLERANCE;
+    STLReader reader; reader.tolerance=Math<Real>::ZERO_TOLERANCE;
     if(!reader.open(filename, back_inserter(vtmp), back_inserter(etmp), back_inserter(ftmp), back_inserter(ntmp))) 
 	{
 		LOG_ERROR("Can't open file: " << filename);

=== modified file 'pkg/dem/meta/Shop.cpp'
--- pkg/dem/meta/Shop.cpp	2010-04-25 13:18:11 +0000
+++ pkg/dem/meta/Shop.cpp	2010-04-25 15:48:22 +0000
@@ -466,7 +466,7 @@
 	int ax1=(axis+1)%3,ax2=(axis+2)%3;
 	Real r=sqrt(pow(pt[ax1],2)+pow(pt[ax2],2));
 	Real theta;
-	if(r>Mathr::Zero()_TOLERANCE){
+	if(r>Mathr::ZERO_TOLERANCE){
 		theta=acos(pt[ax1]/r);
 		if(pt[ax2]<0) theta=Mathr::TWO_PI-theta;
 	}
@@ -1140,8 +1140,8 @@
     b->ks = 2.0/7.0 * m/tc/tc * ( Mathr::PI*Mathr::PI + Mathr::Pow(Mathr::Log(es),2) );
     b->cs = -2.0/7.0 * m/tc * Mathr::Log(es);
 
-    if (Math<Real>::FAbs(b->cn) <= Math<Real>::Zero()_TOLERANCE ) b->cn=0;
-    if (Math<Real>::FAbs(b->cs) <= Math<Real>::Zero()_TOLERANCE ) b->cs=0;
+    if (Math<Real>::FAbs(b->cn) <= Math<Real>::ZERO_TOLERANCE ) b->cn=0;
+    if (Math<Real>::FAbs(b->cs) <= Math<Real>::ZERO_TOLERANCE ) b->cs=0;
 }
 
 /* This function is copied almost verbatim from scientific python, module Visualization, class ColorScale