Merged changes from the trunk.

Note, there isn't any changes in the core code done here.
2010-01-04 01:42:45 +00:00 · 2010-01-04 01:42:45 +00:00 · b41d72bf4c
commit b41d72bf4c
parent 4297e1ce11 ade2f69c1f
37 changed files with 12041 additions and 8878 deletions
--- a/Cantera/cxx/demos/combustor/combustor_blessed_0.csv
+++ b/Cantera/cxx/demos/combustor/combustor_blessed_0.csv
--- a/Cantera/matlab/setup_winmatlab_d.py
+++ b/Cantera/matlab/setup_winmatlab_d.py
@ -0,0 +1,94 @@
+#
+# python script to create a few key files for the windows build
+#
+# $Id: setup_winmatlab.py,v 1.29 2009/07/20 19:38:53 hkmoffa Exp $
+#
+import sys
+import os
+import os.path
+
+#
+# We are currently in the CanteraRoot/Cantera/matlab directory
+CurrDir=os.getcwd()
+#
+# Get a list of path + 'matlab'
+#
+CantDir=os.path.split(CurrDir)
+#
+# Get a list of CanteraRoot + 'Cantera'
+#
+CantRootList=os.path.split(CantDir[0])
+#
+# CanteraRoot will contain the absolute path name
+#             of the development root directory
+#
+CanteraRoot=CantRootList[0]
+
+bindir = CanteraRoot + '/bin'
+libdir = CanteraRoot + '/build/lib/i686-pc-win32'
+incdir = CanteraRoot + '/build/include'
+dflibdir = ''
+
+bllibstr = "-lctlapack_d -lctblas_d"
+bllibs = bllibstr.replace('-l',' ')
+bllist = bllibs.split()
+
+bldir = libdir
+
+libs = ['clib_d']
+#
+#  setup.m  file
+#     This is a utility matlab file that tells matlab to
+#     jump down a directory and execute build_cantera.m
+#
+f = open('setup.m','w')
+# f.write('cd cantera\nbuild_cantera\nexit\n')
+f.write('cd cantera\nbuild_cantera\n')
+f.close()
+#
+#  cantera/build_Cantera.m
+#
+#    Here we create the file cantera/build_Cantera.m
+#    This file contains the command which is executed from within matlab
+#    to build the cantera extension
+#
+fb = open('cantera/build_cantera.m','w')
+fb.write("""
+disp('building Cantera..');
+mex -v  -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ...
+    private/xmlmethods.cpp private/phasemethods.cpp  ...
+    private/thermomethods.cpp private/kineticsmethods.cpp ...
+    private/transportmethods.cpp private/reactormethods.cpp ...
+    private/reactornetmethods.cpp ...
+    private/wallmethods.cpp private/flowdevicemethods.cpp ...
+    private/funcmethods.cpp ...
+    private/mixturemethods.cpp ...
+    private/onedimmethods.cpp private/surfmethods.cpp  ...
+""")
+s = ''
+for lib in libs:
+    s += '    '+libdir+'/'+lib+'.lib ...\n'
+fb.write(s)
+if bllist:
+    s = ''
+    for lib in bllist:
+        s += '    '+bldir+'/'+lib+'.lib ...\n'
+    fb.write(s)
+# fb.write('    "'+dflibdir+'/dformd.lib" ...\n')
+# fb.write('    "'+dflibdir+'/dfconsol.lib" ...\n')
+# fb.write('    "'+dflibdir+'/dfport.lib" \n')
+fb.write('   \n')
+fb.close()
+#
+#  Here we create the file ctbin.m.
+#  This is a matlab command which specified the ctbin directory
+#  within matlab. However we have a problem. This refers to the
+#  development computer, while we may be on the target computer.
+#  Don't know how to resolve this atm.
+#
+fp = open('cantera/ctbin.m','w')
+fp.write("""function path = ctbin
+path = '"""+bindir+"""';
+""")
+fp.close()
+
--- a/Cantera/python/Makefile.in
+++ b/Cantera/python/Makefile.in
@ -91,7 +91,7 @@ endif
 clean:
 	@PYTHON_CMD@ setup.py clean
 	rm -f _build; rm -f _winbuild
-	(if test -d build ; then cd build; rm -fR * ; fi )
+	(if test -d build ; then cd build; rm -fR * ; fi)
 	cd src; rm -f *.o

 depends:
--- a/Cantera/python/examples/equilibrium/adiabatic_flame/runtest
+++ b/Cantera/python/examples/equilibrium/adiabatic_flame/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 adiabatic_blessed_0.csv adiabatic.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 adiabatic_blessed_0.csv adiabatic.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/equilibrium/multiphase_plasma/runtest
+++ b/Cantera/python/examples/equilibrium/multiphase_plasma/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 equil_koh_blessed_0.csv equil_koh.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 equil_koh_blessed_0.csv equil_koh.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/adiabatic_flame/runtest
+++ b/Cantera/python/examples/flames/adiabatic_flame/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 adiabatic_flame_blessed_0.csv adiabatic_flame.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 adiabatic_flame_blessed_0.csv adiabatic_flame.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/flame1/runtest
+++ b/Cantera/python/examples/flames/flame1/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 flame1_blessed_0.csv flame1.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 flame1_blessed_0.csv flame1.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/flame2/runtest
+++ b/Cantera/python/examples/flames/flame2/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 flame2_blessed_0.csv flame2.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 flame2_blessed_0.csv flame2.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/flame_fixed_T/runtest
+++ b/Cantera/python/examples/flames/flame_fixed_T/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 flame_fixed_T_blessed_0.csv flame_fixed_T.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 flame_fixed_T_blessed_0.csv flame_fixed_T.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/free_h2_air/runtest
+++ b/Cantera/python/examples/flames/free_h2_air/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 freeflame1_blessed_0.csv freeflame1.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 freeflame1_blessed_0.csv freeflame1.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/npflame1/runtest
+++ b/Cantera/python/examples/flames/npflame1/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 npflame1_blessed_0.csv npflame1.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 npflame1_blessed_0.csv npflame1.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/flames/stflame1/runtest
+++ b/Cantera/python/examples/flames/stflame1/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 stflame1_1_blessed_0.csv stflame1_1.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 stflame1_1_blessed_0.csv stflame1_1.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/reactors/reactor2_sim/runtest
+++ b/Cantera/python/examples/reactors/reactor2_sim/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 piston_blessed_0.csv piston.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 piston_blessed_0.csv piston.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest
+++ b/Cantera/python/examples/surface_chemistry/catcomb_stagflow/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 catcomb_blessed_0.csv catcomb.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 catcomb_blessed_0.csv catcomb.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/examples/surface_chemistry/diamond_cvd/runtest
+++ b/Cantera/python/examples/surface_chemistry/diamond_cvd/runtest
@ -30,7 +30,7 @@ fi
 diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt
 retnStat_0=$?

-csvdiff -a 1.0E-50 diamond_blessed_0.csv diamond.csv  > diff_csv.txt
+csvdiff -a 1.0E-15 diamond_blessed_0.csv diamond.csv  > diff_csv.txt
 retnStat_csv_0=$?

 retnTotal=1
--- a/Cantera/python/winsetup_d.py
+++ b/Cantera/python/winsetup_d.py
@ -0,0 +1,30 @@
+from distutils.core import setup, Extension
+
+libdir = ['../../build/lib/i686-pc-win32']
+    
+#  Below I switched to / from \ because python was interpreting \n in the
+#  string \numpy as a new line character
+#
+setup(name="Cantera",
+          version="1.8.0",
+          description="The Cantera Python Interface",
+          long_description="""
+          """,
+          author="Prof. D. G. Goodwin, Caltech",
+          author_email="dgoodwin@caltech.edu",
+          url="http://code.google.com/p/cantera",
+          package_dir = {'MixMaster':'../../apps/MixMaster'},
+          py_modules = ["ctml_writer"],
+          packages = ["Cantera","Cantera.OneD",
+                      "MixMaster","MixMaster.Units"],
+          ext_modules=[ Extension("Cantera._cantera",
+                                  ["src/pycantera.cpp"],
+                                  include_dirs=["../../build/include",
+                                                "src", "../clib/src",
+                                                "c:\python26/lib/site-packages/numpy/core/include"],
+                                  library_dirs = libdir,
+                                  depends = [libdir[0]+'/clib_d.lib'],
+                                  libraries = ["clib_d"])
+                        ],
+          )
+
--- a/Cantera/src/kinetics/ReactionData.h
+++ b/Cantera/src/kinetics/ReactionData.h
@ -34,7 +34,7 @@ namespace Cantera {
      isReversibleWithFrac = false;
      beta = 0.0;
    }
-    ~ReactionData(){}
+    virtual ~ReactionData(){}

    int reactionType;
    int number;
--- a/config/install-sh
+++ b/config/install-sh
@ -64,6 +64,10 @@ while [ x"$1" != x ]; do
 	    shift
 	    continue;;

+        -move) instcmd="$mvprog"
+            shift
+            continue;;
+
 	-d) dir_arg=true
 	    shift
 	    continue;;
@ -120,6 +124,7 @@ else
 	true
 fi

+
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
@ -147,7 +152,7 @@ else
 	
 	if [ x"$dst" = x ]
 	then
-		echo "install:	no destination specified"
+		echo "       install:	no destination specified"
 		exit 1
 	else
 		true
--- a/11669
+++ b/11669
--- a/configure.in
+++ b/configure.in
@ -1358,7 +1358,7 @@ AC_PROG_INSTALL
 #     needs to have a wildcard capability within Cantera.

 case $ac_sys_system in
-  CYGWIN* )
+  CYGWIN* ) 
     INSTALL=${INSTALL_BIN:=config/install-sh}
     echo 'INSTALL program has been set to ' $INSTALL;;
 esac
--- a/docs/install_examples/cygwin_gcc434_dbg_f2c_numpy.sh
+++ b/docs/install_examples/cygwin_gcc434_dbg_f2c_numpy.sh
@ -0,0 +1,167 @@
+#!/bin/sh
+# ------------------------------------------------------------------------------
+#
+#     Example Cantera pre-preconfig configuration script
+#       10/20/09
+#
+#  Platform:            CYGWIN_NT-5.1 1.7.1(0.218/5/3)
+#  Compiler:            gcc v. 4.3.4
+#  Optimization:        Debug version
+#  python:              v. 2.5.2 (full installation)
+#  matlab:              no
+#  f2c:                 yes
+#  num python:          numpy, which is distributed with cygwin
+#
+#
+# ---------------------------------------------------------------------------
+# The only place where the User must custimize this installation
+# is located at the top here:
+#
+#   Specify the installation directory here:
+#
+Cantera_Install_Dir='/cygdrive/c/cygwin_env/arch/cygwin/cantera-1.8.0'
+#
+#   Specify the Sundials installation directory here (leave it as a null script
+#   if you don't want to link sundials in
+#
+# Sundials_Home=''
+Sundials_Home='/cygdrive/c/cygwin_env/arch/cygwin/sundials-2.3.0_dbg'
+#
+#   Specify the Sundials version number (either 2.2, 2.3, or 2.4)
+Sundials_Version='2.3'
+# Sundials_Version=2.4'
+# -----------------------------------------------------------------------------
+#
+CANTERA_CONFIG_PREFIX=$Cantera_Install_Dir
+export CANTERA_CONFIG_PREFIX
+
+SET_PYTHON_SITE_PACKAGE_TOPDIR=y
+export SET_PYTHON_SITE_PACKAGE_TOPDIR
+
+PYTHON_SITE_PACKAGE_TOPDIR=$CANTERA_CONFIG_PREFIX
+export PYTHON_SITE_PACKAGE_TOPDIR
+
+PYTHON_CMD=/usr/bin/python
+export PYTHON_CMD
+
+#
+# The full python package works within cygwin. Minimal is needed at the least
+#
+PYTHON_PACKAGE='full'
+#PYTHON_PACKAGE='minimal'
+export PYTHON_PACKAGE
+
+WITH_IDEAL_SOLUTIONS="y"
+export WITH_IDEAL_SOLUTIONS
+
+WITH_ELECTROLYTES="y"
+export WITH_ELECTROLYTES
+
+WITH_VCSNONIDEAL="y"
+export WITH_VCSNONIDEAL
+
+#
+#  Matlab on the pc is supported through the windows vc++ 8.0 compilation
+#  environment. Therefore, we turn it off here.
+#
+BUILD_MATLAB_TOOLBOX="n"
+export BUILD_MATLAB_TOOLBOX
+
+NUMARRAY_HOME=''
+export NUMARRAY_HOME
+#
+# Turns on extra debugging
+#
+DEBUG_MODE='y'
+export DEBUG_MODE
+#
+#  Numpy must have already been installed in the
+#              /usr/lib/python2.5/site-packages
+#  directory before the Cantera installation. If not, you can always
+#  do a minimal python installation and forego forming Cantera's python interface.
+#
+USE_NUMPY="y"
+export USE_NUMPY
+#
+#      Specify where to find the include files within the numpy distribution
+#
+NUMPY_INC_DIR="/usr/lib/python2.5/site-packages/numpy/core/include"
+export NUMPY_INC_DIR
+#
+#  We use F2C with the cygwin installation. However, the g77 interface should 
+#  work too.
+#
+BUILD_WITH_F2C="y"
+export BUILD_WITH_F2C
+
+BITCOMPILE="32"
+export BITCOMPILE
+#
+#  We use the default gcc compilers that come with cygwin. Currently, this
+#  is gcc v. 3.4.4.
+#
+CXX='g++'
+export CXX
+#
+CC='gcc'
+export CC
+#
+F77='g77'
+export F77
+#
+# Debug options
+#
+# -DDEBUG_HKM
+# -DDEBUG_BASISOPTIMIZE
+# -DDEBUG_CHEMEQUIL
+#
+CXXFLAGS="-g -Wall "
+export CXXFLAGS
+
+CFLAGS=$CXXFLAGS
+export CFLAGS
+
+FFLAGS="-g "
+export FFLAGS
+
+LDFLAGS='-g'
+export LDFLAGS
+
+LCXX_END_LIBS="-lm -lstdc++"
+export LCXX_END_LIBS
+
+# The gcc compiler in cygwin will put a .exe extension on anyway. So,
+# we might as well define this field as .exe. cygwin will automagically
+# equate executable files with no extension as having an .exe extension.
+# This is very mysterious. However, the mystery goes away if you define
+# these files to have a .exe suffix from the getgo.
+EXE_EXT=".exe"
+export EXE_EXT
+
+EXTRA_LINK=""
+export EXTRA_LINK
+
+MAKE=make
+export MAKE
+#
+# Specify the SUNDIALS option
+#
+if test -n "$Sundials_Home"
+then
+  USE_SUNDIALS='y'
+  SUNDIALS_VERSION=$Sundials_Version
+else
+  USE_SUNDIALS='n'
+fi
+export USE_SUNDIALS
+export SUNDIALS_VERSION
+#
+# Specify where to find the sundials installation directories
+#
+SUNDIALS_HOME=$Sundials_Home
+export SUNDIALS_HOME
+#
+#  Ok, fire off the main preconfig script
+#
+./preconfig
+
--- a/docs/install_examples/sol10_64bit_CC57_opt_py24_numarray
+++ b/docs/install_examples/sol10_64bit_CC57_opt_py24_numarray
@ -104,10 +104,10 @@ export WITH_VCSNONIDEAL
 # Location Variables - set the directory to point to 
 #                      a 64-bit specific directory.
 #
-CANTERA_INSTALL_DIR=${HOME}/arch/sol_py64/cantera-1.8
+CANTERA_INSTALL_DIR=${HOME}/arch/sol_py64/cantera-1.8.0
 export CANTERA_INSTALL_DIR

-CANTERA_CONFIG_PREFIX=${HOME}/arch/sol_py64/cantera-1.8
+CANTERA_CONFIG_PREFIX=${HOME}/arch/sol_py64/cantera-1.8.0
 export CANTERA_CONFIG_PREFIX

 #CANTERA_PYTHON_HOME=${CANTERA_PYTHON_HOME:="$HOME/python_modules"}
@ -116,7 +116,7 @@ export CANTERA_CONFIG_PREFIX
 SET_PYTHON_SITE_PACKAGE_TOPDIR="y"
 export SET_PYTHON_SITE_PACKAGE_TOPDIR

-PYTHON_SITE_PACKAGE_TOPDIR=${HOME}"/arch/sol_py64/cantera-1.8"
+PYTHON_SITE_PACKAGE_TOPDIR=${HOME}"/arch/sol_py64/cantera-1.8.0"
 export PYTHON_SITE_PACKAGE_TOPDIR

 PYTHON_PACKAGE="full"
--- a/tools/doc/Cantera.cfg.in
+++ b/tools/doc/Cantera.cfg.in
@ -663,6 +663,7 @@ FILE_PATTERNS          = Kinetics.h  Kinetics.cpp \
                         PDSS.h \
                         PDSS.cpp \
                         SpeciesThermo.h \
+<<<<<<< .working
                         NasaThermo.h \
                         NasaPoly1.h \
                         NasaPoly2.h \
--- a/win32/vc9/SetupCantera/SetupCantera.vdproj
+++ b/win32/vc9/SetupCantera/SetupCantera.vdproj
@ -87,6 +87,12 @@
        }
        "Entry"
        {
+        "MsmKey" = "8:_056E63AF596746FA840673460F3467BA"
+        "OwnerKey" = "8:_0E292CD01C814FA9945C45A7BA9E1065"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
        "MsmKey" = "8:_058317BC8A364FC684F4FCE559188827"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -753,12 +759,6 @@
        }
        "Entry"
        {
-        "MsmKey" = "8:_27CBA0B644714206B5369CEB15918813"
-        "OwnerKey" = "8:_8654B4467D7E42F7B37671D6962C74D8"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
        "MsmKey" = "8:_27DE8E5E29574E81B2D3ACC4E87B9637"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -1803,12 +1803,6 @@
        }
        "Entry"
        {
-        "MsmKey" = "8:_5BC3883CE3F340CB8FFF56C6195A1121"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
        "MsmKey" = "8:_5CF936560FF2465682DB2D4643C37441"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -2517,12 +2511,6 @@
        }
        "Entry"
        {
-        "MsmKey" = "8:_83E30280260D49DF885434465F6CBC81"
-        "OwnerKey" = "8:_E8C703DFA5C244B3950AF79C4DE4B550"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
        "MsmKey" = "8:_848A110B76D949EDB0ADED7CE6454C31"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -2571,12 +2559,6 @@
        }
        "Entry"
        {
-        "MsmKey" = "8:_8654B4467D7E42F7B37671D6962C74D8"
-        "OwnerKey" = "8:_0E292CD01C814FA9945C45A7BA9E1065"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
        "MsmKey" = "8:_87132C070E1540D8A4B033B0E98880B5"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -2817,6 +2799,12 @@
        }
        "Entry"
        {
+        "MsmKey" = "8:_91ECA244CB1C451DB46B22E1F3C67359"
+        "OwnerKey" = "8:_056E63AF596746FA840673460F3467BA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
        "MsmKey" = "8:_928A4CF19A3E4474AA4EF038E37FE2B3"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -3891,6 +3879,30 @@
        }
        "Entry"
        {
+        "MsmKey" = "8:_C8AF9CA24B964B2BB4BC8FB57F4DA315"
+        "OwnerKey" = "8:_08587955063141779B605860D7FF04D3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C8AF9CA24B964B2BB4BC8FB57F4DA315"
+        "OwnerKey" = "8:_DC0CDC30152E4448A80DDBE817E76A8D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C8AF9CA24B964B2BB4BC8FB57F4DA315"
+        "OwnerKey" = "8:_888BD7BA9EC64ED59283DB69834E4BA9"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C8AF9CA24B964B2BB4BC8FB57F4DA315"
+        "OwnerKey" = "8:_14738B23CCC74201B3F3619639554DD1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
        "MsmKey" = "8:_C9AC5BC6DB9742B79D0BFF153CA39421"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -4155,6 +4167,12 @@
        }
        "Entry"
        {
+        "MsmKey" = "8:_D459FF6207F848EFACC8160512BC04C0"
+        "OwnerKey" = "8:_C8AF9CA24B964B2BB4BC8FB57F4DA315"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
        "MsmKey" = "8:_D49889111E484F5090ED91A8EFF57DD0"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -4569,30 +4587,6 @@
        }
        "Entry"
        {
-        "MsmKey" = "8:_E8C703DFA5C244B3950AF79C4DE4B550"
-        "OwnerKey" = "8:_DC0CDC30152E4448A80DDBE817E76A8D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E8C703DFA5C244B3950AF79C4DE4B550"
-        "OwnerKey" = "8:_888BD7BA9EC64ED59283DB69834E4BA9"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E8C703DFA5C244B3950AF79C4DE4B550"
-        "OwnerKey" = "8:_14738B23CCC74201B3F3619639554DD1"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E8C703DFA5C244B3950AF79C4DE4B550"
-        "OwnerKey" = "8:_08587955063141779B605860D7FF04D3"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
        "MsmKey" = "8:_E8E0F24BF6014C208A93130FC1761DE6"
        "OwnerKey" = "8:_UNDEFINED"
        "MsmSig" = "8:_UNDEFINED"
@ -10809,26 +10803,6 @@
            "IsDependency" = "11:FALSE"
            "IsolateTo" = "8:"
            }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5BC3883CE3F340CB8FFF56C6195A1121"
-            {
-            "SourcePath" = "8:..\\..\\..\\Cantera\\python\\examples\\flames\\npflame1\\npflame1.csv"
-            "TargetName" = "8:npflame1.csv"
-            "Tag" = "8:"
-            "Folder" = "8:_C466AACC518A400CA4AA80226796F0D1"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5CF936560FF2465682DB2D4643C37441"
            {
            "SourcePath" = "8:..\\..\\..\\Cantera\\matlab\\cantera\\@ThermoPhase\\cv_mole.m"
@ -21904,7 +21878,7 @@
                                            }
                                            "{9EF0B969-E518-4E46-987F-47570745A589}:_3823235E9E3E445CBD912A80B866DA0B"
                                            {
-                                            "Name" = "8:stfame1"
+                                            "Name" = "8:stflame1"
                                            "AlwaysCreate" = "11:FALSE"
                                            "Condition" = "8:"
                                            "Transitive" = "11:FALSE"
@ -22114,7 +22088,7 @@
        "Name" = "8:Microsoft Visual Studio"
        "ProductName" = "8:Cantera"
        "ProductCode" = "8:{52E4E337-4FCE-42FC-9AC9-6EEECE8C231E}"
-        "PackageCode" = "8:{FA65D520-2897-4AE3-B299-3D9D195E968A}"
+        "PackageCode" = "8:{6E97D128-40CD-443D-AF01-5687B8884515}"
        "UpgradeCode" = "8:{1E20CBE3-A0E1-4DF5-AC48-85FF68A24B77}"
        "RestartWWWService" = "11:FALSE"
        "RemovePreviousVersions" = "11:FALSE"
@ -22760,35 +22734,7 @@
        }
        "MergeModule"
        {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_27CBA0B644714206B5369CEB15918813"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_83E30280260D49DF885434465F6CBC81"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8654B4467D7E42F7B37671D6962C74D8"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_056E63AF596746FA840673460F3467BA"
            {
            "UseDynamicProperties" = "11:TRUE"
            "IsDependency" = "11:TRUE"
@ -22802,7 +22748,21 @@
            "Feature" = "8:"
            "IsolateTo" = "8:"
            }
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E8C703DFA5C244B3950AF79C4DE4B550"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_91ECA244CB1C451DB46B22E1F3C67359"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"
+                "Properties"
+                {
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_C8AF9CA24B964B2BB4BC8FB57F4DA315"
            {
            "UseDynamicProperties" = "11:TRUE"
            "IsDependency" = "11:TRUE"
@ -22816,6 +22776,20 @@
            "Feature" = "8:"
            "IsolateTo" = "8:"
            }
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D459FF6207F848EFACC8160512BC04C0"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:microsoft_vc90_crt_x86.msm"
+                "Properties"
+                {
+                }
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
+            }
        }
        "ProjectOutput"
        {
--- a/win32/vc9/cantera.sln
+++ b/win32/vc9/cantera.sln
@ -197,6 +197,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clibstatic", "clibstatic\cl
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "SetupCanteraDebug", "SetupCanteraDebug\SetupCanteraDebug.vdproj", "{58191424-3B9D-4571-BC76-98D05A1CA424}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolnFolder", "SolnFolder", "{01747726-ACD9-4CA0-8809-BEA24CFF4E2E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
--- a/win32/vc9/clib/clib.vcproj
+++ b/win32/vc9/clib/clib.vcproj
@ -71,6 +71,7 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>
--- a/win32/vc9/ctmatlab/buildmlab_d.cmd
+++ b/win32/vc9/ctmatlab/buildmlab_d.cmd
@ -0,0 +1,3 @@
+cd ..\..\..\Cantera\matlab
+%PYTHON_CMD% setup_winmatlab_d.py build
+
--- a/win32/vc9/ctmatlab/ctmatlab.vcproj
+++ b/win32/vc9/ctmatlab/ctmatlab.vcproj
@ -27,7 +27,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cmd /c buildmlab.cmd"
+				Description="running a python script to create the matlab build environment"
+				CommandLine="cmd /c buildmlab_d.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
--- a/win32/vc9/ctmatlab/runmlab.cmd
+++ b/win32/vc9/ctmatlab/runmlab.cmd
@ -1,3 +1,7 @@
 cd ..\..\..\Cantera\matlab
 "%MATLAB_CMD%" -nodisplay -nosplash -nojvm -r setup
+
 echo 'ok' > status
+
+more 
+
--- a/win32/vc9/ctpython/ctpython.vcproj
+++ b/win32/vc9/ctpython/ctpython.vcproj
@ -27,8 +27,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="run runpython.cmd"
-				CommandLine="cmd /c runpython.cmd"
+				Description="run runpython_d.cmd"
+				CommandLine="cmd /c runpython_d.cmd"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
--- a/win32/vc9/ctpython/runpython_d.cmd
+++ b/win32/vc9/ctpython/runpython_d.cmd
@ -0,0 +1,8 @@
+cd ..\..\..\Cantera\python
+%PYTHON_CMD% winsetup.py build
+copy ..\..\build\lib\i686-pc-win32\clib_d.dll build\lib.win32-2.6\Cantera
+copy ..\..\build\lib\i686-pc-win32\clib_d.exp build\lib.win32-2.6\Cantera
+copy ..\..\build\lib\i686-pc-win32\clib_d.lib build\lib.win32-2.6\Cantera
+%PYTHON_CMD% winsetup_d.py bdist_wininst
+%PYTHON_CMD% winsetup_d.py install
+echo 'ok' > status
--- a/win32/vc9/oneD/docopy.cmd
+++ b/win32/vc9/oneD/docopy.cmd
@ -4,6 +4,7 @@ if not exist build\include\cantera\kernel mkdir build\include\cantera\kernel

 cd Cantera\src\oneD

+echo on
 copy Domain1D.h  ..\..\..\build\include\cantera\kernel
 copy Inlet1D.h  ..\..\..\build\include\cantera\kernel
 copy MultiJac.h  ..\..\..\build\include\cantera\kernel
@ -12,8 +13,10 @@ copy OneDim.h  ..\..\..\build\include\cantera\kernel
 copy refine.h  ..\..\..\build\include\cantera\kernel
 copy Resid1D.h  ..\..\..\build\include\cantera\kernel
 copy Sim1D.h  ..\..\..\build\include\cantera\kernel
+copy Solid1D.h  ..\..\..\build\include\cantera\kernel
 copy StFlow.h  ..\..\..\build\include\cantera\kernel
 copy Surf1D.h  ..\..\..\build\include\cantera\kernel
+echo off

 cd ..\..\..\win32\vc9\oneD
-echo 'ok' > status
+echo 'ok'  > status.tmp
--- a/win32/vc9/oneD/oneD.vcproj
+++ b/win32/vc9/oneD/oneD.vcproj
@ -29,6 +29,7 @@
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Outputs="status"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@ -80,6 +81,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="copying include files to the cantera kernel directory"
+				CommandLine="cmd /c docopy.cmd &gt; docopy.out  &#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -143,6 +146,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="copying include files to the cantera/kernel directory"
+				CommandLine="cmd /c docopy.cmd &gt; status&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@ -209,6 +214,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="copying include files to the cantera/kernel directory"
+				CommandLine="cmd /c docopy.cmd &gt; status&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@ -308,6 +315,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\status"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
--- a/win32/vc9/thermo/docopy.cmd
+++ b/win32/vc9/thermo/docopy.cmd
@ -73,4 +73,4 @@ copy WaterSSTP.h          ..\..\..\build\include\cantera\kernel

 cd ..\..\..\win32\vc9\thermo
 echo off
-echo 'ok'
+echo 'ok' > status.tmp
--- a/win32/vc9/thermo/thermo.vcproj
+++ b/win32/vc9/thermo/thermo.vcproj
@ -79,7 +79,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying include files to cantera/kernel directory"
-				CommandLine="cmd  /c docopy.cmd &gt;status&#x0D;&#x0A;"
+				CommandLine="cmd  /c docopy.cmd &gt; docopy.out &#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
--- a/win32/vc9/transport/docopy.cmd
+++ b/win32/vc9/transport/docopy.cmd
@ -1,3 +1,4 @@
+echo on
 cd ..\..\..\

 if not exist build\include\cantera\kernel mkdir build\include\cantera\kernel
@ -19,4 +20,5 @@ copy TransportFactory.h    ..\..\..\build\include\cantera\kernel
 copy TransportParams.h    ..\..\..\build\include\cantera\kernel

 cd ..\..\..\win32\vc9\transp~1
-echo 'ok' > status
+echo off
+echo 'ok'  > status
--- a/win32/vc9/zeroD/docopy.cmd
+++ b/win32/vc9/zeroD/docopy.cmd
@ -1,4 +1,4 @@
-# echo on
+REM echo on
 cd ..\..\..\

 if not exist build\include\cantera\kernel mkdir build\include\cantera\kernel
@ -18,5 +18,5 @@ copy Reservoir.h ..\..\..\build\include\cantera\kernel
 copy Wall.h ..\..\..\build\include\cantera\kernel

 cd ..\..\..\win32\vc9\zeroD
-# echo off
+REM echo off
 echo 'ok'