Finishing numpy port

Cantera/python/Makefile.in

@@ -38,7 +38,7 @@ use_clib_dll = @USE_CLIB_DLL@
 #LOCAL_DEFS=-DDEBUG_MODE
 PIC_FLAG=@PIC@
 
-CXX_FLAGS= "@CXXFLAGS@ $(LOCAL_DEFS)  $(PIC_FLAG)"
+CXX_FLAGS= @CXXFLAGS@ $(LOCAL_DEFS)  $(PIC_FLAG)
 
 all: _build 
 

Cantera/python/examples/reactors/sensitivity_sim/sensitivity1.py

@@ -57,9 +57,8 @@ for n in range(np):
     # sensitivity of OH to reaction 3    
     data[n,5] = sim.sensitivity('OH',3)
     
-    print '%10.3e %10.3f %10.3f %14.6e' % (sim.time(), r.temperature(), 
-                                           r.pressure(), r.intEnergy_mass())
-                                           #sim.sensitivity("OH",0))
+    print '%10.3e %10.3f %10.3f %14.6e %10.3f %10.3f' % (sim.time(), r.temperature(), 
+                                           r.pressure(), r.intEnergy_mass(),  data[n,4],  data[n,5])
 
 
 # plot the results if matplotlib is installed.

Cantera/python/setup.py.in

@@ -1,4 +1,5 @@
 import sys
+import string
 from distutils.core import setup, Extension
     
 libs = []
@@ -13,15 +14,25 @@ if @build_with_f2c@ <> 1:
 linkargs = '@LCXX_FLAGS@'
 
 numarray_incl = "@NUMARRAY_INC_DIR@"
-numpy_incl    = "@NUMPY_INC_DIR@"
+numpy_incl = "@NUMPY_INC_DIR@"
+
+num_collect = []
+if (type(numarray_incl).__name__=='str') :
+    if numarray_incl <> '':
+        numarray_list =  numarray_incl.split(":")
+        num_collect = num_collect + numarray_list
+
+if (type(numpy_incl).__name__=='str') :
+    if numpy_incl <> '':
+        numpy_list =  numpy_incl.split(":")
+        num_collect = num_collect + numpy_list
 
 incdirs=["../../build/include", "src", "../clib/src"]
 
-if numarray_incl <> '':
-    incdirs.append(numarray_incl)
-
-if numpy_incl <> '':
-    incdirs.append(numpy_incl)
+if num_collect <> '':
+    for x in num_collect :
+       if x <> '' :
+          incdirs.append(x)
 
 bllibstr = "@BLAS_LAPACK_LIBS@"
 bllibs = bllibstr.replace('-l',' ')