Changeset 5911

Timestamp:

Nov 6, 2008, 4:33:48 PM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion.

Location:

anuga_core/source_numpy_conversion/anuga/mesh_engine

Files:

• mesh_engine.py (modified) (7 diffs)
• mesh_engine_c_layer.c (modified) (1 diff)
• test_generate_mesh.py (modified) (3 diffs)

anuga_core/source_numpy_conversion/anuga/mesh_engine/mesh_engine.py

@@ -11 +11 @@
 #import anuga.mesh_engine.list_dic as triang
 
-from Numeric import array, Float, Int32, reshape
+import numpy
 
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -46 +46 @@
         
     try:
-        points =  ensure_numeric(points, Float)
+        points =  ensure_numeric(points, numpy.float)
     except ValueError:
         msg = 'ERROR: Inconsistent points array.'
@@ -61 +61 @@
     try:
         # If Int is used, instead of Int32, it fails in Linux
-        segments = ensure_numeric(segments, Int32)
+        segments = ensure_numeric(segments, numpy.int32)
         
     except ValueError:
@@ -72 +72 @@
         
     try:
-        holes = ensure_numeric(holes, Float)
+        holes = ensure_numeric(holes, numpy.float)
     except ValueError:
         msg = 'ERROR: Inconsistent holess array.'
@@ -80 +80 @@
     regions = add_area_tag(regions)
     try:
-        regions = ensure_numeric(regions, Float)
+        regions = ensure_numeric(regions, numpy.float)
     except  (ValueError, TypeError):
         msg = 'ERROR: Inconsistent regions array.'
@@ -90 +90 @@
     
     try:
-        pointatts = ensure_numeric(pointatts, Float)
+        pointatts = ensure_numeric(pointatts, numpy.float)
     except (ValueError, TypeError):
         msg = 'ERROR: Inconsistent point attributes array.'
@@ -100 +100 @@
         raise ANUGAError, msg
     if len(pointatts.shape) == 1:
-        pointatts = reshape(pointatts,(pointatts.shape[0],1))
-    
-    try:
-        segatts = ensure_numeric(segatts, Int32)
+        pointatts = numpy.reshape(pointatts,(pointatts.shape[0],1))
+    
+    try:
+        segatts = ensure_numeric(segatts, numpy.int32)
     except ValueError:
         msg = 'ERROR: Inconsistent point attributes array.'

anuga_core/source_numpy_conversion/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -64 +64 @@
 #define PY_ARRAY_UNIQUE_SYMBOL API_YEAH
 //#define NO_IMPORT_ARRAY
-#include "Numeric/arrayobject.h"
+//#include "numpy/oldnumeric.h"
+#include "numpy/arrayobject.h"
 #include <sys/types.h>
 

anuga_core/source_numpy_conversion/anuga/mesh_engine/test_generate_mesh.py

@@ -5 +5 @@
 level of the code, using the -j flag in triangle.
 """
-
-
-#FIXME (Ole): Go through this file and check that array's 
-#             aren't compared using ==. Need to use either alltrue 
-#             (on 1D integer arrays) or allclose.
- 
-
 import sys
 
@@ -17 +10 @@
 from anuga.mesh_engine.mesh_engine import generate_mesh
 
-from Numeric import array, Float, Int
+import numpy
 
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -45 +38 @@
         mode = "Qzp"
         
-        points =  ensure_numeric(points, Float)
-        seglist = test = ensure_numeric(seglist, Int)
+        points =  ensure_numeric(points, numpy.float)
+        seglist = test = ensure_numeric(seglist, numpy.int)
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist, mode, test)