[cig-commits] r21363 - short/3D/PyLith/trunk/tests_auto/eqinfo

[brad at geodynamics.org]

Author: brad
Date: 2013-02-13 09:41:56 -0800 (Wed, 13 Feb 2013)
New Revision: 21363

Modified:
   short/3D/PyLith/trunk/tests_auto/eqinfo/TestEqInfo.py
Log:
Manual patch from stable for eqinfo full-scale test.

Modified: short/3D/PyLith/trunk/tests_auto/eqinfo/TestEqInfo.py
===================================================================
--- short/3D/PyLith/trunk/tests_auto/eqinfo/TestEqInfo.py	2013-02-13 16:32:28 UTC (rev 21362)
+++ short/3D/PyLith/trunk/tests_auto/eqinfo/TestEqInfo.py	2013-02-13 17:41:56 UTC (rev 21363)
@@ -22,6 +22,7 @@
 
 import unittest
 import numpy
+import math
 
 class TestEqInfo(unittest.TestCase):
   """
@@ -32,7 +33,6 @@
     """
     Check earthquake stats.
     """
-    tol = 1.0e-6
     attrs = ["timestamp",
              "ruparea",
              "potency",
@@ -53,9 +53,12 @@
       for (valueE, value) in zip(valuesE, values):
         msg = "Mismatch in value for attribute '%s', %g != %g." % (attr, valueE, value)
         if valueE != 0.0:
-          self.assertAlmostEqual(valueE, value, msg=msg, delta=abs(tol*valueE))
+          if math.isinf(math.fabs(valueE)):
+            self.assertAlmostEqual(1.0, math.fabs(value)/1.0e+30, places=6, msg=msg)
+          else:
+            self.assertAlmostEqual(1.0, value/valueE, places=6, msg=msg)
         else:
-          self.assertAlmostEqual(valueE, value, msg=msg, delta=tol)
+          self.assertAlmostEqual(valueE, value, places=6, msg=msg)
         
     return