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

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

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

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -27 +27 @@
 from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
 
-import Numeric as num
+import numpy as num
 
 
@@ -476 +476 @@
         if boundary_polygon is not None:
             #removes sts points that do not lie on boundary
-            quantities[name] = num.take(quantities[name], gauge_id, 1)
+            quantities[name] = num.take(quantities[name], gauge_id, axis=1)
             
     # Close sww, tms or sts netcdf file         
@@ -554 +554 @@
                 expression e.g. by overloading
 
-    Due to a limitation with Numeric, this can not evaluate 0/0
+    Due to a limitation with numeric, this can not evaluate 0/0
     In general, the user can fix by adding 1e-30 to the numerator.
     SciPy core can handle this situation.
@@ -789 +789 @@
                         - easting, northing, name , elevation?
                     - OR (this is not yet done)
-                        - structure which can be converted to a Numeric array,
+                        - structure which can be converted to a numeric array,
                           such as a geospatial data object
                       
@@ -1256 +1256 @@
     n0 = int(n0)
     m = len(locations)
-    model_time = num.zeros((n0, m, p), num.Float) 
-    stages = num.zeros((n0, m, p), num.Float)
-    elevations = num.zeros((n0, m, p), num.Float) 
-    momenta = num.zeros((n0, m, p), num.Float)
-    xmom = num.zeros((n0, m, p), num.Float)
-    ymom = num.zeros((n0, m, p), num.Float)
-    speed = num.zeros((n0, m, p), num.Float)
-    bearings = num.zeros((n0, m, p), num.Float)
-    due_east = 90.0*num.ones((n0, 1), num.Float)
-    due_west = 270.0*num.ones((n0, 1), num.Float)
-    depths = num.zeros((n0, m, p), num.Float)
-    eastings = num.zeros((n0, m, p), num.Float)
+    model_time = num.zeros((n0, m, p), num.float) 
+    stages = num.zeros((n0, m, p), num.float)
+    elevations = num.zeros((n0, m, p), num.float) 
+    momenta = num.zeros((n0, m, p), num.float)
+    xmom = num.zeros((n0, m, p), num.float)
+    ymom = num.zeros((n0, m, p), num.float)
+    speed = num.zeros((n0, m, p), num.float)
+    bearings = num.zeros((n0, m, p), num.float)
+    due_east = 90.0*num.ones((n0, 1), num.float)
+    due_west = 270.0*num.ones((n0, 1), num.float)
+    depths = num.zeros((n0, m, p), num.float)
+    eastings = num.zeros((n0, m, p), num.float)
     min_stages = []
     max_stages = []
@@ -1279 +1279 @@
     min_speeds = []    
     max_depths = []
-    model_time_plot3d = num.zeros((n0, m), num.Float)
-    stages_plot3d = num.zeros((n0, m), num.Float)
-    eastings_plot3d = num.zeros((n0, m),num.Float)
+    model_time_plot3d = num.zeros((n0, m), num.float)
+    stages_plot3d = num.zeros((n0, m), num.float)
+    eastings_plot3d = num.zeros((n0, m),num.float)
     if time_unit is 'mins': scale = 60.0
     if time_unit is 'hours': scale = 3600.0
@@ -1800 +1800 @@
         # Remove the loners from verts
         # Could've used X=compress(less(loners,N),loners)
-        # verts=num.take(verts,X)  to Remove the loners from verts
+        # verts=num.take(verts,X,axis=0)  to Remove the loners from verts
         # but I think it would use more memory
         new_i = lone_start      # point at first loner - 'shuffle down' target
@@ -1834 +1834 @@
     """
         
-    xc = num.zeros(triangles.shape[0], num.Float) # Space for centroid info
+    xc = num.zeros(triangles.shape[0], num.float) # Space for centroid info
     
     for k in range(triangles.shape[0]):
@@ -2121 +2121 @@
                 #add tide to stage if provided
                 if quantity == 'stage':
-                     quantity_value[quantity] = num.array(quantity_value[quantity], num.Float) \
-                                                          + directory_add_tide
+                     quantity_value[quantity] = num.array(quantity_value[quantity],
+                                                          num.float) + directory_add_tide
 
                 #condition to find max and mins for all the plots
@@ -2370 +2370 @@
         file.close()
 
-
 ##
 # @brief ??
@@ -2389 +2388 @@
     
     Inputs: 
-        
         NOTE: if using csv2timeseries_graphs after creating csv file,
         it is essential to export quantities 'depth' and 'elevation'.
@@ -2414 +2412 @@
            myfile_2_point1.csv if <out_name> ='myfile_2_'
             
-            
         They will all have a header
     
@@ -2438 +2435 @@
     import string
     from anuga.shallow_water.data_manager import get_all_swwfiles
-
-#    quantities =  ['stage', 'elevation', 'xmomentum', 'ymomentum']
-    #print "points",points 
 
     assert type(gauge_file) == type(''), 'Gauge filename must be a string'
@@ -2457 +2451 @@
     point_name = []
     
-    #read point info from file
+    # read point info from file
     for i,row in enumerate(point_reader):
-        #read header and determine the column numbers to read correcty.
+        # read header and determine the column numbers to read correctly.
         if i==0:
             for j,value in enumerate(row):
@@ -2471 +2465 @@
         
     #convert to array for file_function
-    points_array = num.array(points,num.Float)
+    points_array = num.array(points,num.float)
         
     points_array = ensure_absolute(points_array)
@@ -2525 +2519 @@
     for sww_file in sww_files:
         sww_file = join(dir_name, sww_file+'.sww')
-        #print 'sww file = ',sww_file
         callable_sww = file_function(sww_file,
                                      quantities=core_quantities,
@@ -2579 +2572 @@
                                     momentum = sqrt(point_quantities[2]**2
                                                     + point_quantities[3]**2)
-        #                            vel = momentum/depth              
                                     vel = momentum / (point_quantities[0] 
                                                       - point_quantities[1])
-        #                            vel = momentum/(depth + 1.e-6/depth)
                                 else:
                                     momentum = 0
@@ -2593 +2584 @@
                                                             point_quantities[3]))
 
-                #print 'point list before write (writer %s) = %s' % (str(point_name[point_i]), str(points_list))
                 points_writer[point_i].writerow(points_list)
-            
 
 ##