[cig-commits] r18823 - short/3D/PyLith/branches/v1.6-stable/pylith/tests

[brad at geodynamics.org]

Author: brad
Date: 2011-08-12 13:38:57 -0700 (Fri, 12 Aug 2011)
New Revision: 18823

Modified:
   short/3D/PyLith/branches/v1.6-stable/pylith/tests/Solution.py
Log:
Modified tolerances for full-scale tests.

Modified: short/3D/PyLith/branches/v1.6-stable/pylith/tests/Solution.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/tests/Solution.py	2011-08-12 20:32:09 UTC (rev 18822)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/tests/Solution.py	2011-08-12 20:38:57 UTC (rev 18823)
@@ -34,13 +34,14 @@
   testcase.assertEqual(mesh['spaceDim'], spaceDim)
 
   # Check displacement solution
-  tolerance = 1.0e-6
+  toleranceMask = 1.0e-3
+  tolerance = 1.0e-5
 
   dispE = testcase.calcDisplacements(data['vertices'])
   disp = data['vertex_fields']['displacement']
 
   # Check x displacements
-  mask = numpy.abs(dispE[:,0]) > tolerance
+  mask = numpy.abs(dispE[:,0]) > toleranceMask
   diff = numpy.abs(disp[:,0] - dispE[:,0])
   diffR = numpy.abs(1.0 - disp[:,0] / dispE[:,0])  
   okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)
@@ -48,10 +49,13 @@
     print "Error in x-component of displacement field."
     print "Expected values: ",dispE
     print "Output values: ",disp
+    print dispE[~okay]
+    print disp[~okay]
+    print diffR[~okay]
   testcase.assertEqual(nvertices, numpy.sum(okay))    
     
   # Check y displacements
-  mask = numpy.abs(dispE[:,1]) > tolerance
+  mask = numpy.abs(dispE[:,1]) > toleranceMask
   diff = numpy.abs(disp[:,1] - dispE[:,1])
   diffR = numpy.abs(1.0 - disp[:,1] / dispE[:,1])  
   okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)
@@ -59,10 +63,13 @@
     print "Error in y-component of displacement field."
     print "Expected values: ",dispE
     print "Output values: ",disp
+    print dispE[~okay]
+    print disp[~okay]
+    print diffR[~okay]
   testcase.assertEqual(nvertices, numpy.sum(okay))    
 
   # Check z displacements
-  mask = numpy.abs(dispE[:,2]) > tolerance
+  mask = numpy.abs(dispE[:,2]) > toleranceMask
   diff = numpy.abs(disp[:,2] - dispE[:,2])
   diffR = numpy.abs(1.0 - disp[:,2] / dispE[:,2])  
   okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)