[cig-commits] r4487 - cs/benchmark/trunk/benchmark

[baagaard at geodynamics.org]

Author: baagaard
Date: 2006-09-06 14:59:53 -0700 (Wed, 06 Sep 2006)
New Revision: 4487

Modified:
   cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
Log:
Normalized error by number of spatial dims (to get value one would expect).

Modified: cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
===================================================================
--- cs/benchmark/trunk/benchmark/ProjectionQuadPts.py	2006-09-06 21:30:08 UTC (rev 4486)
+++ cs/benchmark/trunk/benchmark/ProjectionQuadPts.py	2006-09-06 21:59:53 UTC (rev 4487)
@@ -224,7 +224,9 @@
         ndims = self.workspace.root._v_attrs.spatial_dim
 
         nelems = self.workspace.root._v_attrs.num_simplices
+        ndims = self.workspace.root._v_attrs.spatial_dim
         localerr = numpy.zeros( (nelems,), dtype=numpy.Float32)
+        localerr_r = numpy.zeros( (nelems,), dtype=numpy.Float32)
         globalerr = 0.0
         globalvol = 0.0
 
@@ -232,9 +234,10 @@
         dataB = numpy.reshape(dataB, (nelems, nquadpts, ndims))
         diff = dataA - dataB
         localvol = jacobian * sum(quadwts)
+
         err = jacobian * numpy.sum(numpy.sum(numpy.dot(quadwts, diff**2),
                                              axis=2),
-                                   axis=0)
+                                   axis=0) / ndims
         localerr[:] = numpy.sqrt(err / localvol).astype(numpy.Float32)
         globalerr = sum(err)
         globalvol = sum(localvol)
@@ -243,11 +246,11 @@
                                         self.workspace.root,
                                         "difference/%s_%s/snapshot%d" % \
                                         (labelA, labelB, timestep))
-
         if field in group and overwrite:
             dataset = getattr(group, field)
             dataset._f_remove()
         self.workspace.createArray(group, field, localerr)
+
         from math import sqrt
         return sqrt(globalerr/globalvol)