Merged changes from the 1.8.0 branch ontl the main trunk.
This commit is contained in:
Harry Moffat
commit
e381001c95
216 changed files with 5122 additions and 4994 deletions
|
|
@ -2,7 +2,7 @@
|
|||
* @file Cabinet.h
|
||||
*/
|
||||
/*
|
||||
* $Id: Cabinet.h,v 1.9 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#/bin/sh
|
||||
###############################################################
|
||||
# $Author: hkmoffa $
|
||||
# $Date: 2008/12/30 21:49:41 $
|
||||
# $Revision: 1.19 $
|
||||
# $Author$
|
||||
# $Date$
|
||||
# $Revision$
|
||||
#
|
||||
# Copyright 2001 California Institute of Technology
|
||||
#
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file Storage.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: Storage.cpp,v 1.6 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file Storage.h
|
||||
*/
|
||||
/*
|
||||
* $Id: Storage.h,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_STORAGE_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file clib_defs.h
|
||||
*/
|
||||
/*
|
||||
* $Id: clib_defs.h,v 1.5 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* pointers are passed to or from the calling application.
|
||||
*/
|
||||
|
||||
/* $Id: ct.cpp,v 1.45 2009/07/22 01:23:40 hkmoffa Exp $ */
|
||||
/* $Id$ */
|
||||
|
||||
// turn off warnings under Windows
|
||||
#ifdef WIN32
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ct.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ct.h,v 1.24 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_CT_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctbdry.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctbdry.cpp,v 1.7 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctbdry.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctbdry.h,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_BDRY_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctfunc.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctfunc.cpp,v 1.10 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctfunc.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctfunc.h,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_FUNC1_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctmultiphase.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctmultiphase.cpp,v 1.15 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctmultiphase.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctmultiphase.h,v 1.7 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_MULTIPHASE_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctnum.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctnum.h,v 1.2 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_CTNUM_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctonedim.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctonedim.cpp,v 1.25 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// turn off warnings under Windows
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctonedim.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctonedim.h,v 1.16 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_ONEDIM_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctreactor.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctreactor.cpp,v 1.19 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctreactor.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctreactor.h,v 1.7 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_REACTOR_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctrpath.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctrpath.cpp,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#define CANTERA_USE_INTERNAL
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctrpath.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctrpath.h,v 1.2 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_RXNPATH_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctstagn.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctstagn.h,v 1.2 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_STAGN_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctsurf.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctsurf.cpp,v 1.6 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// turn off warnings under Windows
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctsurf.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctsurf.h,v 1.3 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_SURF_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctxml.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: ctxml.cpp,v 1.13 2009/07/22 01:21:35 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file ctxml.h
|
||||
*/
|
||||
/*
|
||||
* $Id: ctxml.h,v 1.6 2009/07/11 17:16:09 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CTC_XML_H
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.11 $
|
||||
* $Date: 2009/01/05 23:34:40 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id: GRI30.h,v 1.8 2008/02/16 21:35:30 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
#ifndef CXX_GRI30H
|
||||
#define CXX_GRI30H
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Id: Interface.h,v 1.10 2008/01/09 13:43:26 dggoodwin Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CXX_INTERFACE
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id: PureFluid.h,v 1.7 2007/12/21 02:58:41 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
#ifndef CXX_PUREFLUID
|
||||
#define CXX_PUREFLUID
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* (see \ref equilfunctions)
|
||||
*/
|
||||
/*
|
||||
* $Id: equilibrium.h,v 1.11 2009/04/04 03:27:43 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
#ifndef CT_EQUIL_INCL
|
||||
#define CT_EQUIL_INCL
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id: kinetics.h,v 1.4 2007/05/04 15:18:41 dggoodwin Exp $
|
||||
* $Id$
|
||||
*/
|
||||
#ifndef CXX_INCL_KINETICS
|
||||
#define CXX_INCL_KINETICS
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id: zerodim.h,v 1.8 2009/07/22 01:21:35 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
#ifndef CT_INCL_ZERODIM_H
|
||||
#define CT_INCL_ZERODIM_H
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#/bin/sh
|
||||
###############################################################
|
||||
# $Author: hkmoffa $
|
||||
# $Date: 2008/12/30 21:49:41 $
|
||||
# $Revision: 1.17 $
|
||||
# $Author$
|
||||
# $Date$
|
||||
# $Revision$
|
||||
#
|
||||
# Copyright 2001 California Institute of Technology
|
||||
#
|
||||
|
|
|
|||
94
Cantera/matlab/setup_winmatlab_d.py
Normal file
94
Cantera/matlab/setup_winmatlab_d.py
Normal file
|
|
@ -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()
|
||||
|
||||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
30
Cantera/python/winsetup_d.py
Executable file
30
Cantera/python/winsetup_d.py
Executable file
|
|
@ -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"])
|
||||
],
|
||||
)
|
||||
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.5 $
|
||||
* $Date: 2009/01/15 23:05:34 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
* (see \ref Cantera::LogPrintCtrl).
|
||||
*/
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.1 $
|
||||
* $Date: 2008/04/08 20:19:26 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
* (see \ref Cantera::LogPrintCtrl).
|
||||
*/
|
||||
/*
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2009/01/15 20:08:50 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#/bin/sh
|
||||
###############################################################
|
||||
# $Author: hkmoffa $
|
||||
# $Date: 2009/02/11 19:55:56 $
|
||||
# $Revision: 1.8 $
|
||||
# $Author$
|
||||
# $Date$
|
||||
# $Revision$
|
||||
#
|
||||
# Copyright 2002 California Institute of Technology
|
||||
#
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
* (see \ref Cantera::PrintCtrl).
|
||||
*/
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.3 $
|
||||
* $Date: 2009/03/14 00:27:10 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
* (see \ref Cantera::PrintCtrl).
|
||||
*/
|
||||
/*
|
||||
* $Revision: 1.3 $
|
||||
* $Date: 2009/03/14 00:27:10 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
* check for the presence of NaNs in the code.
|
||||
*/
|
||||
/*
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2009/03/27 00:39:43 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
* (see \ref Cantera::clockWC).
|
||||
*/
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.1 $
|
||||
* $Date: 2007/06/11 15:20:03 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
* (see \ref Cantera::clockWC).
|
||||
*/
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.1 $
|
||||
* $Date: 2007/06/11 15:20:03 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.14 $
|
||||
* $Date: 2009/07/13 16:47:40 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001-2005 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.9 $
|
||||
* $Date: 2009/01/24 00:15:00 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Date: 2009/02/11 19:55:57 $
|
||||
* $Revision: 1.7 $
|
||||
* $Date$
|
||||
* $Revision$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 255 $
|
||||
* $Date: 2009-11-09 16:36:49 -0700 (Mon, 09 Nov 2009) $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2002 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 255 $
|
||||
* $Date: 2009-11-09 16:36:49 -0700 (Mon, 09 Nov 2009) $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2002 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.8 $
|
||||
* $Date: 2009/07/06 23:52:40 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* (see \ref textlogs and class \link Cantera::Logger Logger\endlink).
|
||||
*/
|
||||
/*
|
||||
* $Id: logger.h,v 1.3 2008/12/17 17:13:35 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifndef CT_LOGGER_H
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
* Definitions for dynamic allocation of multidimensional pointer arrays
|
||||
*/
|
||||
/*
|
||||
* $Revision: 1.3 $
|
||||
* $Date: 2009/07/22 01:21:35 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
* one call.
|
||||
*/
|
||||
/*
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2009/03/27 00:39:43 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
/*
|
||||
* Copywrite 2004 Sandia Corporation. Under the terms of Contract
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* HTML_logs
|
||||
*/
|
||||
/*
|
||||
* $Id: misc.cpp,v 1.16 2009/07/13 16:47:40 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2009/01/14 23:16:24 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2002 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2009/01/14 23:16:24 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Id: stringUtils.cpp,v 1.22 2009/01/15 20:08:50 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.15 $
|
||||
* $Date: 2009/01/15 20:08:50 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* This header is included only by file misc.cpp.
|
||||
*/
|
||||
/*
|
||||
* $Id: units.h,v 1.5 2007/12/15 17:15:50 dggoodwin Exp $
|
||||
* $Id$
|
||||
*/
|
||||
// Copyright 2002 California Institute of Technology
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
/*
|
||||
* $Id: utilities.h,v 1.9 2008/08/22 14:41:07 hkmoffa Exp $
|
||||
* $Id$
|
||||
|
||||
*/
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
* Templates for operations on vector-like objects.
|
||||
*/
|
||||
/*
|
||||
* $Date: 2009/01/15 20:08:50 $
|
||||
* $Revision: 1.3 $
|
||||
* $Date$
|
||||
* $Revision$
|
||||
*
|
||||
* Copyright 2001 California Institute of Technology
|
||||
*
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.27 $
|
||||
* $Date: 2009/07/22 01:21:35 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Revision: 1.23 $
|
||||
* $Date: 2009/07/22 01:21:35 $
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
//
|
||||
// $Id: CKParser.cpp,v 1.23 2009/03/13 03:26:18 hkmoffa Exp $
|
||||
// $Id$
|
||||
|
||||
// turn off warnings about truncating long names under Windows
|
||||
#ifdef WIN32
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#/bin/sh
|
||||
###############################################################
|
||||
# $Author: hkmoffa $
|
||||
# $Date: 2008/12/30 21:49:41 $
|
||||
# $Revision: 1.19 $
|
||||
# $Author$
|
||||
# $Date$
|
||||
# $Revision$
|
||||
#
|
||||
# Copyright 2002 California Institute of Technology
|
||||
#
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
//
|
||||
// $Id: NASA9Parser.cpp,v 1.2 2009/03/13 03:26:18 hkmoffa Exp $
|
||||
// $Id$
|
||||
//
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
*/
|
||||
/*
|
||||
* $Id: Species.h,v 1.2 2007/09/13 15:05:39 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Convert CK-format reaction mechanism files to Cantera input format.
|
||||
*/
|
||||
/*
|
||||
* $Id: ck2ct.cpp,v 1.27 2009/01/10 18:03:31 hkmoffa Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
#ifdef WIN32
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Id: BasisOptimize.cpp,v 1.9 2009/01/05 23:20:43 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "ct_defs.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
/*
|
||||
*
|
||||
*
|
||||
* $Id: ChemEquil.cpp,v 1.15 2009/03/14 03:28:04 hkmoffa Exp $
|
||||
* $Id$
|
||||
*
|
||||
* Copyright 2001 California Institute of Technology
|
||||
*
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
*
|
||||
* Chemical equilibrium.
|
||||
*
|
||||
* $Author: hkmoffa $
|
||||
* $Date: 2008/09/04 17:03:42 $
|
||||
* $Revision: 1.6 $
|
||||
* $Author$
|
||||
* $Date$
|
||||
* $Revision$
|
||||
*
|
||||
* Copyright 2001 California Institute of Technology
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#/bin/sh
|
||||
###############################################################
|
||||
# $Author: hkmoffa $
|
||||
# $Date: 2008/12/30 21:49:41 $
|
||||
# $Revision: 1.16 $
|
||||
# $Author$
|
||||
# $Date$
|
||||
# $Revision$
|
||||
#
|
||||
# Copyright 2002 California Institute of Technology
|
||||
#
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
/*
|
||||
*
|
||||
* $Date: 2009/04/17 00:40:48 $
|
||||
* $Revision: 1.15 $
|
||||
* $Date$
|
||||
* $Revision$
|
||||
*/
|
||||
|
||||
#include "MultiPhase.h"
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Date: 2009/04/17 00:40:48 $
|
||||
* $Revision: 1.11 $
|
||||
* $Date$
|
||||
* $Revision$
|
||||
*/
|
||||
|
||||
// Copyright 2004 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file MultiPhaseEquil.cpp
|
||||
*/
|
||||
/*
|
||||
* $Id: MultiPhaseEquil.cpp,v 1.12 2009/04/22 00:33:35 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "MultiPhaseEquil.h"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/**
|
||||
* @file PropertyCalculator.h
|
||||
*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2008/12/17 16:56:43 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/***********************************************************************
|
||||
* $RCSfile: equil.h,v $
|
||||
* $Author: hkmoffa $
|
||||
* $Date: 2008/04/11 22:44:49 $
|
||||
* $Revision: 1.3 $
|
||||
* $Author$
|
||||
* $Date$
|
||||
* $Revision$
|
||||
***********************************************************************/
|
||||
// Copyright 2001 California Institute of Technology
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
*/
|
||||
/*
|
||||
* $Id: equilibrate.cpp,v 1.11 2009/03/18 17:27:20 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
#include "equil.h"
|
||||
#include "ChemEquil.h"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2008/08/01 16:05:38 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
#include "vcs_DoubleStarStar.h"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2008/08/01 16:05:38 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
#ifndef VCS_DOUBLESTARSTAR_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @file vcs_Exception.h
|
||||
*/
|
||||
/*
|
||||
* $Id: vcs_Exception.h,v 1.2 2008/07/22 16:23:55 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
/*
|
||||
* Copywrite (2005) Sandia Corporation. Under the terms of
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Functions which calculate the extrinsic Gibbs Free energies
|
||||
*/
|
||||
/*
|
||||
* $Id: vcs_Gibbs.cpp,v 1.12 2009/03/27 21:32:33 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.1 $
|
||||
* $Date: 2007/12/19 21:19:28 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
#include "vcs_IntStarStar.h"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.1 $
|
||||
* $Date: 2007/12/19 21:19:28 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
#ifndef VCS_INTSTARSTAR_H
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Driver routine for the VCSnonideal equilibrium solver package
|
||||
*/
|
||||
/*
|
||||
* $Id: vcs_MultiPhaseEquil.cpp,v 1.48 2009/03/28 03:07:23 hkmoffa Exp $
|
||||
* $Id$
|
||||
*/
|
||||
/*
|
||||
* Copywrite (2006) Sandia Corporation. Under the terms of
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* $Author: hkmoffa $
|
||||
* $Revision: 1.12 $
|
||||
* $Date: 2008/05/06 16:53:37 $
|
||||
* $Author$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*/
|
||||
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue