Changeset 5908

Timestamp:

Nov 6, 2008, 4:20:34 PM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion.

Location:

anuga_core/source_numpy_conversion/anuga/advection

Files:

• advection.py (modified) (5 diffs)
• advection_ext.c (modified) (1 diff)
• test_advection.py (modified) (7 diffs)

anuga_core/source_numpy_conversion/anuga/advection/advection.py

@@ -20 +20 @@
 """
 
+import numpy
 
 #import logging, logging.config
@@ -66 +67 @@
                                 numproc=numproc)
 
-        import Numeric
         if velocity is None:
-            self.velocity = Numeric.array([1,0],'d')
+            self.velocity = numpy.array([1,0],'d')
         else:
-            self.velocity = Numeric.array(velocity,'d')
+            self.velocity = numpy.array(velocity,'d')
 
         #Only first is implemented for advection
@@ -155 +155 @@
 
         import sys
-        from Numeric import zeros, Float
         from anuga.config import max_timestep
 
@@ -228 +227 @@
 
         import sys
-        from Numeric import zeros, Float
         from anuga.config import max_timestep
 
@@ -251 +249 @@
         stage_bdry = Stage.boundary_values
 
-        flux = zeros(1, Float) #Work array for summing up fluxes
+        flux = numpy.zeros(1, numpy.float) #Work array for summing up fluxes
 
         #Loop

anuga_core/source_numpy_conversion/anuga/advection/advection_ext.c

@@ -10 +10 @@
 
 #include "Python.h"
-#include "Numeric/arrayobject.h"
+#include "numpy/arrayobject.h"
 #include "math.h"
 #include "stdio.h"

anuga_core/source_numpy_conversion/anuga/advection/test_advection.py

@@ -6 +6 @@
 
 from anuga.config import g, epsilon
-from Numeric import allclose, array, zeros, ones, Float
+import numpy
 from anuga.advection.advection import Domain, Transmissive_boundary, Dirichlet_boundary
 
@@ -48 +48 @@
 
         #Populate boundary array with dirichlet conditions.
-        domain.neighbours = array([[-1,-2,-3]])
+        domain.neighbours = numpy.array([[-1,-2,-3]])
         domain.quantities['stage'].boundary_values[:] = 1.0
 
@@ -102 +102 @@
 
         #Populate boundary array with dirichlet conditions.
-        domain.neighbours = array([[-1,-2,-3]])
+        domain.neighbours = numpy.array([[-1,-2,-3]])
         domain.quantities['stage'].boundary_values[0] = 1.0
 
@@ -111 +111 @@
         domain.compute_fluxes()
         U = domain.quantities['stage'].explicit_update
-        assert allclose(U, 0)
+        assert numpy.allclose(U, 0)
 
 
@@ -133 +133 @@
 
         #Populate boundary array with dirichlet conditions.
-        domain.neighbours = array([[1,-1,-2], [0,-3,-4]])
+        domain.neighbours = numpy.array([[1,-1,-2], [0,-3,-4]])
         domain.set_quantity('stage', [1.0, 0.0], location='centroids')
         domain.distribute_to_vertices_and_edges()
@@ -157 +157 @@
         #Boundaries
         T = Transmissive_boundary(domain)
-        D = Dirichlet_boundary(array([3.1415]))
+        D = Dirichlet_boundary(numpy.array([3.1415]))
 
         domain.set_boundary( {'left': D, 'right': T, 'bottom': T, 'top': T} )
@@ -164 +164 @@
         #Check that the boundary value gets propagated to all elements
         for t in domain.evolve(yieldstep = 0.05, finaltime = 10):
-            if allclose(domain.quantities['stage'].centroid_values, 3.1415):
+            if numpy.allclose(domain.quantities['stage'].centroid_values, 3.1415):
                 break
 
-        assert allclose(domain.quantities['stage'].centroid_values, 3.1415)
+        assert numpy.allclose(domain.quantities['stage'].centroid_values, 3.1415)