From 0fa2a3ee9b86f46764abeda56ffc275024227226 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Fri, 22 Jul 2005 13:33:58 +0000
Subject: [PATCH] cleanup

---
 Cantera/src/ChemEquil.cpp   |  8 +++++---
 Cantera/src/GasKinetics.cpp |  3 +++
 Cantera/src/GasKinetics.h   |  2 +-
 configure                   | 10 +++++-----
 ext/f2c_libs/arith.h        |  6 ++----
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Cantera/src/ChemEquil.cpp b/Cantera/src/ChemEquil.cpp
index 78929d5ed..0a19f3310 100755
--- a/Cantera/src/ChemEquil.cpp
+++ b/Cantera/src/ChemEquil.cpp
@@ -662,7 +662,7 @@ converge:
         double minDamp = 0.0;
         double xTol = 1.e-7;
 
-        static vector_fp res_new(nvar); // fix
+        vector_fp res_new(nvar); // fix
 
         //slope = grad * step;
         slope = dot(grad.begin(), grad.end(), step.begin());
@@ -768,8 +768,10 @@ converge:
         yy = m_p2->value(mix);
         resid[m_mm] = xx/xval - 1.0; 
         resid[m_skip] = yy/yval - 1.0;
-        addLogEntry(m_p1->symbol(), fp2str(xx)+"  ("+fp2str(xval)+")");
-        addLogEntry(m_p2->symbol(), fp2str(yy)+"  ("+fp2str(yval)+")");
+	string xstr = fp2str(xx)+"  ("+fp2str(xval)+")";
+        addLogEntry(m_p1->symbol(), xstr);
+	string ystr = fp2str(yy)+"  ("+fp2str(yval)+")";
+        addLogEntry(m_p2->symbol(), ystr);
         endLogGroup();
     }
 
diff --git a/Cantera/src/GasKinetics.cpp b/Cantera/src/GasKinetics.cpp
index 3daf1a260..dc9cc34f5 100755
--- a/Cantera/src/GasKinetics.cpp
+++ b/Cantera/src/GasKinetics.cpp
@@ -47,6 +47,9 @@ namespace Cantera {
         //        m_rxnstoich = new ReactionStoichMgr;
     }
 
+  GasKinetics::
+  ~GasKinetics() {delete m_kdata;}
+
     /**
      * Update temperature-dependent portions of reaction rates and
      * falloff functions.
diff --git a/Cantera/src/GasKinetics.h b/Cantera/src/GasKinetics.h
index 08127df36..d48789e22 100755
--- a/Cantera/src/GasKinetics.h
+++ b/Cantera/src/GasKinetics.h
@@ -84,7 +84,7 @@ namespace Cantera {
         GasKinetics(thermo_t* thermo = 0);
 
         /// Destructor.
-        virtual ~GasKinetics(){delete m_kdata;}
+        virtual ~GasKinetics();
 
         virtual int ID() { return cGasKinetics; }
 
diff --git a/configure b/configure
index 9cb7391c7..22f22aa1d 100755
--- a/configure
+++ b/configure
@@ -76,13 +76,13 @@ USE_NUMERIC=${USE_NUMERIC:="default"}
 
 # If numarray was installed using the --home option, set this to the
 # home directory for numarray.
-# NUMARRAY_HOME=${NUMARRAY_HOME:="$HOME/python_modules"}
+NUMARRAY_HOME=${NUMARRAY_HOME:="$HOME/python_modules"}
 
 # If you want to install the Cantera Python package somewhere other
 # than the default 'site-packages' directory within the Python library
 # directory, then set this to the desired directory. This is useful when
 # you do not have write access to the Python library directory. 
-# CANTERA_PYTHON_HOME=${CANTERA_PYTHON_HOME:="$HOME/python_modules"}
+CANTERA_PYTHON_HOME=${CANTERA_PYTHON_HOME:="$HOME/python_modules"}
   
 # Set this to 'y' when site packages must be put in system directories
 # but Cantera tutorials must be put in user space.  An alternative to
@@ -229,7 +229,7 @@ ENABLE_TPX='y'
 # (The settings shown here are appropriate if you are using the ATLAS
 # libraries.)
 #
-#BLAS_LAPACK_LIBS='-llapack -lblas'
+BLAS_LAPACK_LIBS='-llapack -lblas'
 #'-llapack -lf77blas -lcblas -latlas'
 #BLAS_LAPACK_DIR='/usr/lib'
 #
@@ -261,7 +261,7 @@ CXX=${CXX:=g++}
 CC=${CC:=gcc}
 
 # C++ compiler flags
-CXXFLAGS=${CXXFLAGS:="-O3 -Wall"}
+CXXFLAGS=${CXXFLAGS:="-O0 -g -Wall"}
 
 # the C++ flags required for linking. Uncomment if additional flags
 # need to be passed to the linker.
@@ -305,7 +305,7 @@ F77=${F77:=g77}
 
 # Fortran 77 compiler flags. Note that the Fortran compiler flags must be set
 # to produce object code compatible with the C/C++ compiler you are using.
-FFLAGS=${FFLAGS:='-O3'}
+FFLAGS=${FFLAGS:='-O0 -g'}
 
 # the additional Fortran flags required for linking, if any. Leave commented
 # out if no additional flags are required.
diff --git a/ext/f2c_libs/arith.h b/ext/f2c_libs/arith.h
index 508eb414f..76539f82b 100644
--- a/ext/f2c_libs/arith.h
+++ b/ext/f2c_libs/arith.h
@@ -1,4 +1,2 @@
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Double_Align
-#define NANCHECK
+#define IEEE_8087
+#define Arith_Kind_ASL 1