Changeset 5897 for anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

Timestamp:

Nov 6, 2008, 12:17:15 PM (15 years ago)

Author:

ole

Message:

Reverted numpy changes to the trunk that should have been made to the branch.
The command was svn merge -r 5895:5890 .

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (20 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -15 +15 @@
 
 from anuga.utilities.numerical_tools import ensure_numeric
-import numpy
+from Numeric import arange, choose, zeros, Float, array, allclose, take, compress
     
 from anuga.geospatial_data.geospatial_data import ensure_absolute
@@ -237 +237 @@
     from anuga.config import time_format
     from Scientific.IO.NetCDF import NetCDFFile
-##    from numpy.oldnumeric import array, zeros, Float, alltrue, concatenate, reshape
+    from Numeric import array, zeros, Float, alltrue, concatenate, reshape
 
     # Open NetCDF file
@@ -303 +303 @@
     # Get variables
     # if verbose: print 'Get variables'    
-    time = numpy.array(fid.variables['time'][:]    )
+    time = fid.variables['time'][:]    
 
     # Get time independent stuff
@@ -317 +317 @@
             triangles = fid.variables['volumes'][:]
 
-        x = numpy.reshape(x, (len(x),1))
-        y = numpy.reshape(y, (len(y),1))
-        vertex_coordinates = numpy.concatenate((x,y), axis=1) #m x 2 array
+        x = reshape(x, (len(x),1))
+        y = reshape(y, (len(y),1))
+        vertex_coordinates = concatenate((x,y), axis=1) #m x 2 array
 
         if boundary_polygon is not None:
@@ -331 +331 @@
             for i in range(len(boundary_polygon)):
                 for j in range(len(x)):
-                    if numpy.allclose(vertex_coordinates[j],boundary_polygon[i],1e-4):
+                    if allclose(vertex_coordinates[j],boundary_polygon[i],1e-4):
                         #FIX ME:
                         #currently gauges lat and long is stored as float and
@@ -351 +351 @@
                 gauge_neighbour_id.append(-1)
             gauge_neighbour_id=ensure_numeric(gauge_neighbour_id)
-            if len(numpy.compress(gauge_neighbour_id>=0,gauge_neighbour_id))!=len(temp)-1:
+            if len(compress(gauge_neighbour_id>=0,gauge_neighbour_id))!=len(temp)-1:
                 msg='incorrect number of segments'
                 raise msg
@@ -373 +373 @@
         # move time back - relative to domain's time
         if domain_starttime > starttime:
-##            print 'type(time)=%s' % type(time)
-##            print 'type(domain_starttime)=%s' % type(domain_starttime)
-##            print 'type(starttime)=%s' % type(starttime)
-##            a = time - domain_starttime
             time = time - domain_starttime + starttime
 
@@ -402 +398 @@
         if boundary_polygon is not None:
             #removes sts points that do not lie on boundary
-            quantities[name] = numpy.take(quantities[name], gauge_id, 1)
+            quantities[name] = take(quantities[name],gauge_id,1)
             
     # Close sww, tms or sts netcdf file         
@@ -524 +520 @@
                 raise 'Illegal input to get_textual_float:', value
         else:
-            return format % float(value)
+            return format %float(value)
 
 
@@ -1040 +1036 @@
     """
 #    from math import sqrt, atan, degrees
-##    from numpy.oldnumeric import ones, allclose, zeros, Float, ravel
+    from Numeric import ones, allclose, zeros, Float, ravel
     from os import sep, altsep, getcwd, mkdir, access, F_OK, environ
 
@@ -1081 +1077 @@
     n0 = int(n0)
     m = len(locations)
-    model_time = numpy.zeros((n0,m,p), numpy.float) 
-    stages = numpy.zeros((n0,m,p), numpy.float)
-    elevations = numpy.zeros((n0,m,p), numpy.float) 
-    momenta = numpy.zeros((n0,m,p), numpy.float)
-    xmom = numpy.zeros((n0,m,p), numpy.float)
-    ymom = numpy.zeros((n0,m,p), numpy.float)
-    speed = numpy.zeros((n0,m,p), numpy.float)
-    bearings = numpy.zeros((n0,m,p), numpy.float)
-    due_east = 90.0*numpy.ones((n0,1), numpy.float)
-    due_west = 270.0*numpy.ones((n0,1), numpy.float)
-    depths = numpy.zeros((n0,m,p), numpy.float)
-    eastings = numpy.zeros((n0,m,p), numpy.float)
+    model_time = zeros((n0,m,p), Float) 
+    stages = zeros((n0,m,p), Float)
+    elevations = zeros((n0,m,p), Float) 
+    momenta = zeros((n0,m,p), Float)
+    xmom = zeros((n0,m,p), Float)
+    ymom = zeros((n0,m,p), Float)
+    speed = zeros((n0,m,p), Float)
+    bearings = zeros((n0,m,p), Float)
+    due_east = 90.0*ones((n0,1), Float)
+    due_west = 270.0*ones((n0,1), Float)
+    depths = zeros((n0,m,p), Float)
+    eastings = zeros((n0,m,p), Float)
     min_stages = []
     max_stages = []
@@ -1104 +1100 @@
     min_speeds = []    
     max_depths = []
-    model_time_plot3d = numpy.zeros((n0,m), numpy.float)
-    stages_plot3d = numpy.zeros((n0,m), numpy.float)
-    eastings_plot3d = numpy.zeros((n0,m),numpy.float)
+    model_time_plot3d = zeros((n0,m), Float)
+    stages_plot3d = zeros((n0,m), Float)
+    eastings_plot3d = zeros((n0,m),Float)
     if time_unit is 'mins': scale = 60.0
     if time_unit is 'hours': scale = 3600.0
@@ -1206 +1202 @@
                 else:
                     #ax.plot_wireframe(model_time[:,:,j],eastings[:,:,j],stages[:,:,j])
-                    ax.plot3D(numpy.ravel(eastings[:,:,j]),numpy.ravel(model_time[:,:,j]),numpy.ravel(stages[:,:,j]))
+                    ax.plot3D(ravel(eastings[:,:,j]),ravel(model_time[:,:,j]),ravel(stages[:,:,j]))
                 ax.set_xlabel('time')
                 ax.set_ylabel('x')
@@ -1505 +1501 @@
     
     # initialise the array to easily find the index of the first loner
-    loners=numpy.arange(2*N, N, -1) # if N=3 [6,5,4]
+    loners=arange(2*N, N, -1) # if N=3 [6,5,4]
     for t in triangles:
         for vert in t:
@@ -1539 +1535 @@
         #print "loners", loners
         #print "triangles before", triangles
-        triangles = numpy.choose(triangles,loners)
+        triangles = choose(triangles,loners)
         #print "triangles after", triangles
     return verts, triangles
@@ -1554 +1550 @@
 
         
-    xc = numpy.zeros(triangles.shape[0], numpy.float) # Space for centroid info
+    xc = zeros(triangles.shape[0], Float) # Space for centroid info
     
     for k in range(triangles.shape[0]):
@@ -1836 +1832 @@
                 #add tide to stage if provided
                 if quantity == 'stage':
-                     quantity_value[quantity]=numpy.array(quantity_value[quantity])+directory_add_tide
+                     quantity_value[quantity]=array(quantity_value[quantity])+directory_add_tide
 
                 #condition to find max and mins for all the plots
@@ -1947 +1943 @@
             #get data from dict in to list
             #do maths to list by changing to array
-            t=(numpy.array(directory_quantity_value[directory][filename]['time'])+directory_start_time)/seconds_in_minutes
+            t=(array(directory_quantity_value[directory][filename]['time'])+directory_start_time)/seconds_in_minutes
 
             #finds the maximum elevation, used only as a test
@@ -2128 +2124 @@
     from csv import reader,writer
     from anuga.utilities.numerical_tools import ensure_numeric, mean, NAN
-##    from numpy.oldnumeric import array, resize, shape, Float, zeros, take, argsort, argmin
+    from Numeric import array, resize, shape, Float, zeros, take, argsort, argmin
     import string
     from anuga.shallow_water.data_manager import get_all_swwfiles
@@ -2169 +2165 @@
         
     #convert to array for file_function
-    points_array = numpy.array(points, numpy.float)
+    points_array = array(points,Float)
         
     points_array = ensure_absolute(points_array)