[cig-commits] [commit] knepley/upgrade-petsc-interface: Improve solution test for full-scale testing. (5253432)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : knepley/upgrade-petsc-interface
Link       : https://github.com/geodynamics/pylith/compare/6577078423096c173f4628e4df1a2ecae818d3ee...ff8c198552ecaa8b0c392c980e2ae626799874b9

>---------------------------------------------------------------

commit 525343227481b58f2d30e1748712dcd7881a37dd
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Feb 27 15:08:04 2014 -0800

    Improve solution test for full-scale testing.


>---------------------------------------------------------------

525343227481b58f2d30e1748712dcd7881a37dd
 pylith/tests/Solution.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pylith/tests/Solution.py b/pylith/tests/Solution.py
index 1e36a6c..f8e8944 100644
--- a/pylith/tests/Solution.py
+++ b/pylith/tests/Solution.py
@@ -36,7 +36,7 @@ def check_displacements(testcase, filename, mesh):
   testcase.assertEqual(mesh['spaceDim'], spaceDim)
 
   # Check displacement solution
-  toleranceMask = 1.0e-3
+  toleranceAbsMask = 0.1
   tolerance = 1.0e-5
 
   dispE = testcase.calcDisplacements(vertices)
@@ -51,7 +51,7 @@ def check_displacements(testcase, filename, mesh):
   for istep in xrange(nsteps):
     for icomp in xrange(ncomps):
 
-      mask = numpy.abs(dispE[istep,:,icomp]) > toleranceMask
+      mask = numpy.abs(dispE[istep,:,icomp]) > toleranceAbsMask
       diff = numpy.abs(disp[istep,:,icomp] - dispE[istep,:,icomp])
       diffR = numpy.abs(1.0 - disp[istep,:,icomp] / dispE[istep,:,icomp])  
       okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)
@@ -59,9 +59,10 @@ def check_displacements(testcase, filename, mesh):
         print "Error in component %d of displacement field at time step %d." % (icomp, istep)
         print "Expected values: ",dispE[istep,:,:]
         print "Output values: ",disp[istep,:,:]
-        print dispE[istep,~okay,icomp]
-        print disp[istep,~okay,icomp]
-        print diffR[~okay]
+        print "Expected values (not okay): ",dispE[istep,~okay,icomp]
+        print "Computed values (not okay): ",disp[istep,~okay,icomp]
+        print "Relative diff (not okay): ",diffR[~okay]
+        print "Coordinates (not okay): ",vertices[~okay,:]
       testcase.assertEqual(nvertices, numpy.sum(okay))    
     
   h5.close()