[cig-commits] r5420 - in cs/benchmark/trunk/benchmark: . short/applications

[baagaard at geodynamics.org]

Author: baagaard
Date: 2006-12-01 17:00:36 -0800 (Fri, 01 Dec 2006)
New Revision: 5420

Modified:
   cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
   cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py
Log:
Updated to be compatible with numpy 1.0.

Modified: cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
===================================================================
--- cs/benchmark/trunk/benchmark/ProjectionQuadPts.py	2006-12-02 00:57:22 UTC (rev 5419)
+++ cs/benchmark/trunk/benchmark/ProjectionQuadPts.py	2006-12-02 01:00:36 UTC (rev 5420)
@@ -156,10 +156,11 @@
         connSize = simplices.shape[1]
 
         fieldProj = numpy.zeros((nelems, nquadpts, ndims),
-                                dtype=numpy.Float32)
+                                dtype=numpy.float32)
         fieldLocal = solnfield[simplices,:]
         tmp = dot(basisfns_quad, fieldLocal)
-        fieldProj[:] = tmp.astype(numpy.Float32)
+        tmp = numpy.reshape(tmp, (nelems, nquadpts, ndims))
+        fieldProj[:] = tmp.astype(numpy.float32)
 
         group = tablewaiter.createGroup(self.workspace,
                                         self.workspace.root,
@@ -225,8 +226,8 @@
 
         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)
+        localerr = numpy.zeros( (nelems,), dtype=numpy.float32)
+        localerr_r = numpy.zeros( (nelems,), dtype=numpy.float32)
         globalerr = 0.0
         globalvol = 0.0
 
@@ -238,7 +239,7 @@
         err = jacobian[:] * numpy.sum(numpy.sum(numpy.dot(quadwts, diff**2),
                                                 axis=2),
                                       axis=0) / ndims
-        localerr[:] = numpy.sqrt(err[:] / localvol[:]).astype(numpy.Float32)
+        localerr[:] = numpy.sqrt(err[:] / localvol[:]).astype(numpy.float32)
         globalerr = numpy.sum(err)
         globalvol = numpy.sum(localvol)
         
@@ -329,10 +330,10 @@
         nquadpts = len(quadpts)
         ndims = len(quadpts[0])
         
-        points = numpy.zeros((nelems, nquadpts, ndims), dtype=numpy.Float32)
+        points = numpy.zeros((nelems, nquadpts, ndims), dtype=numpy.float32)
         for iquad in xrange(nquadpts):
             pts = mapOrigin + dot(mapFromRef, quadpts[iquad])
-            points[:,iquad] = pts.astype(numpy.Float32)
+            points[:,iquad] = pts.astype(numpy.float32)
 
         group = tablewaiter.createGroup(workspace, workspace.root,
                                         "projection")

Modified: cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py	2006-12-02 00:57:22 UTC (rev 5419)
+++ cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py	2006-12-02 01:00:36 UTC (rev 5420)
@@ -125,7 +125,7 @@
         self._info.log("Loading geometry...")
         
         vertices = numpy.zeros((self.numNodes, self.spatialDim),
-                               dtype=numpy.Float32)
+                               dtype=numpy.float32)
 
         filename = "%s.coord" % self.scenarioRoot
         filein = open(filename, 'r')
@@ -155,7 +155,7 @@
         self._info.log("Loading topology...")
 
         simplices = numpy.zeros((self.numElements, self.connSize),
-                                dtype=numpy.Int32)
+                                dtype=numpy.int32)
 
         filename = "%s.connect" % self.scenarioRoot
         filein = open(filename, 'r')
@@ -189,9 +189,9 @@
         filename = "%s.out" % self.scenarioRoot
 
         displacements = numpy.zeros((self.numNodes, self.spatialDim),
-                                    dtype=numpy.Float32)
+                                    dtype=numpy.float32)
         velocities = numpy.zeros((self.numNodes, self.spatialDim),
-                                 dtype=numpy.Float32)
+                                 dtype=numpy.float32)
         filein = open(filename, 'r')
         numHeaderLines = 4
         for iskip in xrange(numHeaderLines):