research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2004-01-04 21:34:11 +00:00
parent 13f9b7c583
commit be9e63c0ed
7 changed files with 3851 additions and 1524 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cantera/python/Makefile.in
View file

@ -42,7 +42,7 @@ _build: $(SRCS) $(LIB_DEPS)
echo 'ok' > _build
_winbuild: $(SRCS)
_winbuild: $(SRCS) $(LIB_DEPS)
touch src/pycantera.cpp
(@PYTHON_CMD@ setup.py build)
echo 'ok' > _winbuild

6
Cantera/python/setup.py.in
View file

@ -13,6 +13,12 @@ if platform == "win32":
"cantera","recipes","ctlapack",
"ctblas", "ctmath", "cvode", "tpx"]
else:
# The library 'g2c' is needed if the g77 Fortran compiler is
# used to compile the Fortran-77 procedures in libraries
# 'recipes', 'ctlapack', 'ctblas', and 'ctmath'. If a different
# compiler is used, add the appropriate libraries here.
libs = ["clib", "zeroD","oneD","transport",
"cantera","recipes","ctlapack",
"ctblas", "ctmath", "cvode", "tpx", "stdc++", "g2c", "m"]

2
Cantera/src/ct2ctml.cpp
View file

@ -45,7 +45,7 @@ namespace ctml {
string path = tmpDir() + "/.check.py";
ofstream f(path.c_str());
if (!f) {
throw CanteraError("checkPython","cannot open "+path+" for writing);
throw CanteraError("checkPython","cannot open "+path+" for writing");
}
f << "from Cantera import *\n";
f.close();

22
Cantera/src/oneD/StFlow.cpp
View file

@ -719,26 +719,6 @@ namespace Cantera {
}
break;
// case c_Multi_Transport:
// for (m = j0; m < j1; m++) {
// wtm = m_wtm[m];
// rho = density(m);
// dz = z(m+1) - z(m);
// fluxsum = 0.0;
// for (k = 0; k < m_nsp; k++) {
// sum = 0.0;
// for (j = 0; j < m_nsp; j++) {
// if (j != k) {
// s = m_wt[j]*m_diff[mindex(k,j,m)];
// s *= (X(x,j,m+1) - X(x,j,m))/dz;
// sum += s;
// }
// }
// m_flux(k,m) = sum*rho*m_wt[k]/(wtm*wtm);
// fluxsum -= m_flux(k,m);
// }
// }
// break;
default:
throw CanteraError("updateDiffFluxes","unknown transport model");
}
@ -795,7 +775,7 @@ namespace Cantera {
int nd = d.size();
vector_fp x;
int n, np, j, ks, k;
int n, np = 0, j, ks, k;
string nm;
bool readgrid = false, wrote_header = false;
for (n = 0; n < nd; n++) {

5322
config/configure vendored
View file

File diff suppressed because it is too large Load diff

19
config/configure.in
View file

@ -22,13 +22,21 @@ ac_sys_release=`uname -r`
SHARED_CTLIB=0
OS_IS_DARWIN=0
OS_IS_WIN=0
OS_IS_CYGWIN=0
mex_ext=mexglx
case $ac_sys_system in
Darwin*) OS_IS_DARWIN=1; mex_ext=mexmac;;
CYGWIN*) OS_IS_WIN=1; mex_ext=dll;;
CYGWIN*) OS_IS_CYGWIN=1; mex_ext=dll;;
esac
if test "x${OS_IS_CYGWIN}" = "x1"; then
if test "${USE_VISUAL_STUDIO}" = "y"; then
OS_IS_WIN=1;
fi
fi
#AC_PREFIX_DEFAULT([/usr/local])
local_inst=1
@ -121,12 +129,13 @@ AC_SUBST(CANTERA_EXAMPLES_DIR)
AC_SUBST(CANTERA_DATADIR)
AC_CANONICAL_SYSTEM()
ctroot=`(cd ..;pwd)`
builddir=$target
if test "x${OS_IS_WIN}" = "x1"; then
ctroot=`cygpath -a -w "${ctroot}" | sed 's/\\\/\\//g'`
builddir="i686-pc-win32"
else
builddir=$target
fi
if test -z "$username"; then username=$USER; fi
@ -134,9 +143,6 @@ AC_SUBST(username)
AC_SUBST(ctroot)
AC_CANONICAL_SYSTEM()
buildinc=$ctroot/build/include
AC_SUBST(buildinc)
@ -443,6 +449,7 @@ AC_SUBST(CXX_DEPENDS)
AC_SUBST(FLIBS)
AC_SUBST(OS_IS_DARWIN)
AC_SUBST(OS_IS_WIN)
AC_SUBST(OS_IS_CYGWIN)
AC_SUBST(SHARED_CTLIB)
AC_SUBST(mex_ext)

2
tools/src/Makefile.in
View file

@ -2,7 +2,7 @@
LIBDIR = @buildlib@
INCDIR = -I@ctroot@/Cantera/src
BINDIR = @buildbin@/bin
BINDIR = @buildbin@
build_ck = @BUILD_CK@
LCXX_FLAGS = -L$(LIBDIR) @CXXFLAGS@