Changeset 2547

Timestamp:

Mar 15, 2006, 11:54:28 AM (19 years ago)

Author:

ole

Message:

Got everything to compile under numpy

Files:

• compile_all.py (modified) (1 diff)
• inundation-numpy-branch/pyvolution/quantity_ext.c (modified) (1 diff)
• inundation-numpy-branch/pyvolution/shallow_water_ext.c (modified) (1 diff)
• inundation-numpy-branch/pyvolution/shallow_water_kinetic_ext.c (modified) (1 diff)

compile_all.py

@@ -2 +2 @@
 
 buildroot = os.getcwd()
-os.chdir('inundation')
+
+#Complete horrible hack to decide which branch to take (Ole)
+try:
+    os.stat('inundation-numpy-branch')
+except:
+    os.chdir('inundation')
+else:
+    os.chdir('inundation-numpy-branch')    
+
 print 'Changing to', os.getcwd()        
 

inundation-numpy-branch/pyvolution/quantity_ext.c

@@ -11 +11 @@
 
 #include "Python.h"
-#include "Numeric/arrayobject.h"
+#include "arrayobject.h"
 #include "math.h"
 
 //Shared code snippets
 #include "util_ext.h"
-//#include "quantity_ext.h" //Obsolete
-
 
 

inundation-numpy-branch/pyvolution/shallow_water_ext.c

@@ -14 +14 @@
 
 #include "Python.h"
-#include "Numeric/arrayobject.h"
+#include "arrayobject.h"
 #include "math.h"
 #include <stdio.h>

inundation-numpy-branch/pyvolution/shallow_water_kinetic_ext.c

@@ -14 +14 @@
 
 #include "Python.h"
-#include "Numeric/arrayobject.h"
+#include "arrayobject.h"
 #include "math.h"
 #include <stdio.h>