*** empty log message ***

Cantera/python/setup.py.in

@@ -26,6 +26,11 @@ cvlibstr = "@CVODE_LIBS@"
 cvlibs = cvlibstr.replace('-l',' ')
 cvlist = cvlibs.split()
 
+thermolib = []
+need_cathermo = @NEED_CATHERMO@
+if need_cathermo == 1:
+    thermolib = ["caThermo"]
+    
 extra_link = "@EXTRA_LINK@"
 linkargs = extra_link.split()    
 
@@ -42,11 +47,11 @@ endlib = endlib1.split()
 
 if platform == "win32":
     libs = ["clib", "zeroD","oneD","transport",
-            "cantera","recipes"] + bllist + cvlist + ["ctmath", "tpx", "converters"]
+            "cantera"] + bllist + cvlist + ["ctmath", "tpx"]
 else:
     
     libs = ["clib", "zeroD","oneD","transport",
-            "cantera", "converters"] + bllist + cvlist + ["ctmath", "tpx"]
+            "cantera", "converters"] + thermolib + bllist + cvlist + ["ctmath", "tpx"]
                                           
     if @build_with_f2c@ == 1:
          libs.append("ctf2c")

Cantera/src/ThermoFactory.cpp

@@ -32,9 +32,14 @@
 #include "MetalPhase.h"
 #endif
 
+#undef USE_SSTP
 #ifdef WITH_STOICH_SUBSTANCE
+#ifdef USE_SSTP
+#include "thermo/StoichSubstanceSSTP.h"
+#else
 #include "StoichSubstance.h"
 #endif
+#endif
 
 #include "importCTML.h"
 
@@ -97,7 +102,11 @@ namespace Cantera {
 
 #ifdef WITH_STOICH_SUBSTANCE
         case cStoichSubstance:
+#ifdef USE_SSTP
+            th = new StoichSubstanceSSTP;
+#else
             th = new StoichSubstance;
+#endif
             break;
 #endif
 

Cantera/src/thermo/StoichSubstanceSSTP.cpp

@@ -8,6 +8,8 @@
  * Copywrite (2005) Sandia Corporation. Under the terms of
  * Contract DE-AC04-94AL85000 with Sandia Corporation, the
  * U.S. Government retains certain rights in this software.
+ *
+ * Copyright 2001 California Institute of Technology
  */
 
 /*

preconfig

@@ -193,11 +193,11 @@ WITH_STOICH_SUBSTANCE='y'
 WITH_PURE_FLUIDS='y'
 
 # This flag enables the inclusion of ideal solution capabilities
-WITH_IDEAL_SOLUTIONS=${WITH_IDEAL_SOLUTIONS:="n"}
+WITH_IDEAL_SOLUTIONS=${WITH_IDEAL_SOLUTIONS:="y"}
 
 # Enable expanded electrochemistry capabilities, include thermo
 # models for electrolyte solutions
-WITH_ELECTROLYTES=${WITH_ELECTROLYTES:="n"}
+WITH_ELECTROLYTES=${WITH_ELECTROLYTES:="y"}
 
 
 ######################################################################

tools/src/Makefile.in

@@ -6,7 +6,7 @@ BINDIR = @buildbin@
 build_ck = @BUILD_CK@
 
 LCXX_FLAGS = -L$(LIBDIR)  @LOCAL_LIB_DIRS@ @CXXFLAGS@
-LOCAL_LIBS = -lcantera -ltpx -lctcxx 
+LOCAL_LIBS = @LOCAL_LIBS@ #-lcantera -ltpx -lctcxx 
 #LOCAL_LIBS = -lcantera @math_libs@ @BLAS_LAPACK_LIBS@ -lctcxx 
 
 LCXX_END_LIBS = @LCXX_END_LIBS@ @EXTRA_LINK@