Changeset 5913 for anuga_core/source_numpy_conversion/anuga/visualiser

Timestamp:

Nov 6, 2008, 4:42:14 PM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion.

Location:

anuga_core/source_numpy_conversion/anuga/visualiser

Files:

• offline.py (modified) (3 diffs)
• realtime.py (modified) (3 diffs)

anuga_core/source_numpy_conversion/anuga/visualiser/offline.py

@@ -1 @@
-from Numeric import array, Float, ravel, zeros
+import numpy
 from Scientific.IO.NetCDF import NetCDFFile
 from Tkinter import Button, E, Tk, W, Label, StringVar, Scale, HORIZONTAL
@@ -80 +80 @@
         else:
             N_vert = len(fin.variables[quantityName])
-        x = ravel(array(fin.variables['x'], Float))
-        y = ravel(array(fin.variables['y'], Float))
+        x = numpy.ravel(numpy.array(fin.variables['x'], numpy.float))
+        y = numpy.ravel(numpy.array(fin.variables['y'], numpy.float))
         if dynamic is True:
-            q = array(fin.variables[quantityName][frameNumber], Float)
-        else:
-            q = ravel(array(fin.variables[quantityName], Float))
+            q = numpy.array(fin.variables[quantityName][frameNumber], numpy.float)
+        else:
+            q = numpy.ravel(numpy.array(fin.variables[quantityName], numpy.float))
 
         q *= self.height_zScales[quantityName]
@@ -123 +123 @@
         for q in filter(lambda n:n != 'x' and n != 'y' and n != 'z' and n != 'time' and n != 'volumes', fin.variables.keys()):
             if len(fin.variables[q].shape) == 1: # Not a time-varying quantity
-                quantities[q] = ravel(array(fin.variables[q], Float))
+                quantities[q] = numpy.ravel(numpy.array(fin.variables[q], numpy.float))
             else: # Time-varying, get the current timestep data
-                quantities[q] = array(fin.variables[q][self.frameNumber], Float)
+                quantities[q] = numpy.array(fin.variables[q][self.frameNumber], numpy.float)
         fin.close()
         return quantities

anuga_core/source_numpy_conversion/anuga/visualiser/realtime.py

@@ -1 @@
-from Numeric import Float, zeros, shape
+import numpy
 from Tkinter import Button, E, Tk, W
 from threading import Event
@@ -47 +47 @@
 
         # Also build vert_index - a list of the x & y values of each vertex
-        self.vert_index = zeros((N_vert,2), Float)
+        self.vert_index = numpy.zeros((N_vert,2), numpy.float)
         for n in range(N_tri):
             self.vtk_cells.InsertNextCell(3)
@@ -56 +56 @@
     def update_height_quantity(self, quantityName, dynamic=True):
         N_vert = len(self.source.get_vertex_coordinates())
-        qty_index = zeros(N_vert, Float)
+        qty_index = numpy.zeros(N_vert, numpy.float)
         triangles = self.source.get_triangles()
         vertex_values, _ = self.source.get_quantity(quantityName).get_vertex_values(xy=False, smooth=False)