Changeset 5918

Timestamp:

Nov 6, 2008, 5:18:31 PM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion.

Location:

anuga_core/source_numpy_conversion/anuga/culvert_flows

Files:

• Test_Culvert_Flat_Water_Lev.py (modified) (2 diffs)
• culvert_class.py (modified) (3 diffs)
• culvert_polygons.py (modified) (7 diffs)

anuga_core/source_numpy_conversion/anuga/culvert_flows/Test_Culvert_Flat_Water_Lev.py

@@ -25 +25 @@
      
 from math import pi,pow,sqrt
-from Numeric import choose, greater, ones, sin, exp, cosh
+import numpy
+
+
 #------------------------------------------------------------------------------
 # Setup computational domain
@@ -149 +151 @@
 Br = Reflective_boundary(domain)              # Solid reflective wall
 Bo = Dirichlet_boundary([-5, 0, 0])           # Outflow
-Btus = Time_boundary(domain, lambda t: [0.0+ 1.25*(1+sin(2*pi*(t-4)/10)), 0.0, 0.0])
-Btds = Time_boundary(domain, lambda t: [0.0+ 0.75*(1+sin(2*pi*(t-4)/20)), 0.0, 0.0])
+Btus = Time_boundary(domain, lambda t: [0.0+ 1.25*(1+numpy.sin(2*pi*(t-4)/10)), 0.0, 0.0])
+Btds = Time_boundary(domain, lambda t: [0.0+ 0.75*(1+numpy.sin(2*pi*(t-4)/20)), 0.0, 0.0])
 domain.set_boundary({'left': Btus, 'right': Btds, 'top': Br, 'bottom': Br})
 

anuga_core/source_numpy_conversion/anuga/culvert_flows/culvert_class.py

@@ -5 +5 @@
 from anuga.utilities.polygon import is_inside_polygon
 from anuga.utilities.polygon import plot_polygons
-
 
 
@@ -66 +65 @@
                  verbose=False):
         
-        from Numeric import sqrt, sum
-
         # Input check
         if diameter is not None:
@@ -236 +233 @@
         
         from anuga.config import g, epsilon
-        from Numeric import take, sqrt
         from anuga.config import velocity_protection        
 

anuga_core/source_numpy_conversion/anuga/culvert_flows/culvert_polygons.py

@@ -4 +4 @@
 # Import necessary modules
 from math import sqrt
-from Numeric import array, sum
+import numpy
+
 
 def create_culvert_polygons(end_point0,
@@ -54 +55 @@
     dy = y1-y0
 
-    vector = array([dx, dy])
-    length = sqrt(sum(vector**2))
+    vector = numpy.array([dx, dy])
+    length = sqrt(numpy.sum(vector**2))
 
     # Adjust polygon width to number of barrels in this culvert
@@ -63 +64 @@
     # Unit direction vector and normal 
     vector /= length
-    normal = array([-dy, dx])/length
+    normal = numpy.array([-dy, dx])/length
     
 
@@ -76 +77 @@
     p2 = p1 - h
     p3 = p0 - h
-    culvert_polygons['exchange_polygon0'] = array([p0,p1,p2,p3])
+    culvert_polygons['exchange_polygon0'] = numpy.array([p0,p1,p2,p3])
 
     
@@ -84 +85 @@
     p2 = p1 + h
     p3 = p0 + h
-    culvert_polygons['exchange_polygon1'] = array([p0,p1,p2,p3])
+    culvert_polygons['exchange_polygon1'] = numpy.array([p0,p1,p2,p3])
 
 
@@ -98 +99 @@
     p2 = p1 - h
     p3 = p0 - h
-    culvert_polygons['enquiry_polygon0'] = array([p0,p1,p2,p3])
+    culvert_polygons['enquiry_polygon0'] = numpy.array([p0,p1,p2,p3])
 
     # Build enquiry polygon 1
@@ -105 +106 @@
     p2 = p1 + h
     p3 = p0 + h
-    culvert_polygons['enquiry_polygon1'] = array([p0,p1,p2,p3])    
+    culvert_polygons['enquiry_polygon1'] = numpy.array([p0,p1,p2,p3])    
 
     # Return results