From 320f882050d20585a98d6a8aafb3cac0b62d1401 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Sun, 9 Jan 2005 20:58:22 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/src/MultiPhase.cpp |  5 +----
 Cantera/src/config.h       | 26 ++++++--------------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/Cantera/src/MultiPhase.cpp b/Cantera/src/MultiPhase.cpp
index 4137b334d..37759e915 100644
--- a/Cantera/src/MultiPhase.cpp
+++ b/Cantera/src/MultiPhase.cpp
@@ -266,14 +266,11 @@ namespace Cantera {
 
     doublereal MultiPhase::equilibrate(int XY, doublereal err, 
         int maxsteps) {
-        cout << "in equil" << endl;
         init();
         if (m_equil == 0) {
             m_equil = new MultiPhaseEquil(this);
         }
-        m_equil->equilibrate(XY, err, maxsteps);
-        delete m_equil;
-        m_equil = 0;
+        return m_equil->equilibrate(XY, err, maxsteps);
     }
 
 }
diff --git a/Cantera/src/config.h b/Cantera/src/config.h
index 6c5c15b6c..9cc9f7918 100755
--- a/Cantera/src/config.h
+++ b/Cantera/src/config.h
@@ -11,7 +11,7 @@
 // These flags turn on or off features that are still in
 // development and are not yet stable.
 
-#define DEV_EQUIL
+#undef DEV_EQUIL
 
 
 //------------------------ Fortran settings -------------------//
@@ -59,8 +59,8 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 // The configure script defines this if the operatiing system is Mac
 // OS X, This used to add some Mac-specific directories to the default
 // data file search path.
-#define DARWIN 1
-#define HAS_SSTREAM 1
+#define DARWIN 0
+/* #undef HAS_SSTREAM */
 
 // Identify whether the operating system is cygwin's overlay of
 // windows, with gcc being used as the compiler.
@@ -68,33 +68,19 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 
 // Identify whether the operating system is windows based, with
 // microsoft vc++ being used as the compiler
-/* #undef WINMSVC */
+#define WINMSVC
 
 //--------- Fonts for reaction path diagrams ----------------------
 #define RXNPATH_FONT "Helvetica"
 
 //--------------------- Python ------------------------------------
-// This path to the python executable is created during
-// Cantera's setup. It identifies the python executable
-// used to run Python to process .cti files. Note that this is only
-// used if environment variable PYTHON_CMD is not set.
-#define PYTHON_EXE "python"
-
 // If this is defined, the Cantera Python interface will use the
 // Numeric package; otherwise, it will use numarray.
-/* #undef HAS_NUMERIC */
-
-//--------------------- Cantera -----------------------------------
-
-/* #undef CANTERA_ROOT */
-// This data pathway is used to locate a directory where datafiles
-// are to be found. Note, the local directory is always searched
-// as well.
-#define CANTERA_DATA "/Applications/Cantera/data"
+/* #define HAS_NUMERIC 1 */
 
 #define INCL_PURE_FLUIDS 1
 
 //--------------------- compile options ----------------------------
-#define USE_PCH 1
+/* #define USE_PCH 1 */
 
 #endif