Changeset 1032

Timestamp:

Mar 8, 2005, 11:21:06 AM (20 years ago)

Author:

ole

Message:

Changed int* to long* for use with 64 bit

Location:

inundation/ga/storm_surge/pyvolution

Files:

• test_util.py (modified) (1 diff)
• util_ext.c (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -920 +920 @@
 
     def test_outside_polygon(self):
-
         U = [[0,0], [1,0], [1,1], [0,1]] #Unit square    
+
         assert not outside_polygon( [0.5, 0.5], U )
         #evaluate to False as the point 0.5, 0.5 is inside the unit square
-
+        
         assert outside_polygon( [1.5, 0.5], U )
         #evaluate to True as the point 1.5, 0.5 is outside the unit square

inundation/ga/storm_surge/pyvolution/util_ext.c

@@ -9 +9 @@
 //
 // Ole Nielsen, GA 2004
+//
+//NOTE: On 64 bit systems use long* instead of int* for Numeric arrays
+//this will also work on 32 bit systems
+
 
 #include "Python.h"
@@ -63 +67 @@
                     double* points,
                     double* polygon,
-                    int* indices,    // M-Array for storage indices
+                    long* indices,    // M-Array for storage indices
                     int closed,
                     int verbose) {
@@ -227 +231 @@
 
   //printf("M=%d, N=%d\n", M, N);
-  // Call underlying routine
+  //Call underlying routine
   count = _inside_polygon(M, N,
                           (double*) point -> data,
                           (double*) polygon -> data,
-                          (int*) indices -> data,
+                          (long*) indices -> data,
                           closed, verbose);