GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Dave Goodwin
2003-09-06 21:00:13 +00:00
parent 1e64a4fe52
commit d39052fba7
13 changed files with 1555 additions and 2964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Cantera/clib/src/Makefile.in
View File

@@ -14,7 +14,7 @@ SUFFIXES= .cpp .d .o
CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT)
OBJS = ct.o Storage.o ctstagn.o ctsurf.o ctrpath.o ctbdry.o ctreactor.o ctfunc.o ctxml.o ctonedim.o
OBJS = ct.o Storage.o ctsurf.o ctrpath.o ctbdry.o ctreactor.o ctfunc.o ctxml.o ctonedim.o
DEPENDS = $(OBJS:.o=.d)
@@ -71,6 +71,9 @@ clean:
install:
@INSTALL@ $(CTLIB) @prefix@/lib/cantera
win-install:
@INSTALL@ ../../../lib/clib.lib @prefix@/lib/cantera
%.d:
g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d

2
Cantera/matlab/Makefile.in
View File

@@ -28,6 +28,8 @@ LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a \
$(CANTERA_LIBDIR)/libtransport.a
os_is_win=@OS_IS_WIN@
all: cantera/ctmethods.@mex_ext@
cantera/ctmethods.@mex_ext@: $(SRCS) $(LIB_DEPS)

12
Cantera/matlab/cantera/buildwin.m
View File

@@ -6,9 +6,11 @@ mex private/ctmethods.cpp private/ctfunctions.cpp ...
private/transportmethods.cpp private/reactormethods.cpp ...
private/wallmethods.cpp private/flowdevicemethods.cpp ...
private/onedimmethods.cpp private/surfmethods.cpp private/write.cpp ...
../../../../../lib/clib.lib ../../../../../lib/oneD.lib ...
../../../../../lib/zeroD.lib ../../../../../lib/transport.lib ...
../../../../../lib/cantera.lib ../../../../../lib/recipes.lib ...
../../../../../lib/cvode.lib ../../../../../lib/ctlapack.lib ...
../../../../../lib/ctmath.lib ../../../../../lib/ctblas.lib
../../../lib/clib.lib ../../../lib/oneD.lib ...
../../../lib/zeroD.lib ../../../lib/transport.lib ...
../../../lib/cantera.lib ../../../lib/recipes.lib ...
../../../lib/cvode.lib ../../../lib/ctlapack.lib ...
../../../lib/ctmath.lib ../../../lib/ctblas.lib ...
../../../lib/dformd.lib ../../../lib/dfconsol.lib ...
../../../lib/dfport.lib
disp('done.');

2
Cantera/matlab/cantera/examples/equil.m
View File

@@ -9,7 +9,7 @@ help equil;
if nargin == 1 & isa(g,'GasMix')
gas = g;
else
gas = IdealGasMix('gri30.xml');
gas = IdealGasMix('gri30.cti');
end
nsp = nSpecies(gas);

2
Cantera/matlab/cantera/private/ctfunctions.cpp
View File

@@ -38,7 +38,7 @@ void ctfunctions( int nlhs, mxArray *plhs[],
trfile = getString(prhs[4]);
idtag = getString(prhs[5]);
iok = ck_to_cti(infile, dbfile, trfile, idtag);
iok = -1; //ck_to_cti(infile, dbfile, trfile, idtag);
break;
// get Cantera error

20
Cantera/python/Makefile.in
View File

@@ -11,38 +11,54 @@
CANTERA_LIBDIR= @buildlib@
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a
$(CANTERA_LIBDIR)/liboneD.a $(CANTERA_LIBDIR)/libconverters.a \
$(CANTERA_LIBDIR)/libtransport.a
SRCS = src/ctphase_methods.cpp \
src/ctthermo_methods.cpp \
src/ctkinetics_methods.cpp \
src/cttransport_methods.cpp \
src/ctxml_methods.cpp \
src/ctflow_methods.cpp \
src/ctfuncs.cpp \
src/ctsurf_methods.cpp \
src/ctbndry_methods.cpp \
src/ctrpath_methods.cpp \
src/ctreactor_methods.cpp \
src/ctfunc_methods.cpp \
src/ctonedim_methods.cpp \
src/methods.h
os_is_win = @OS_IS_WIN@
all: _build
_build: $(SRCS) $(LIB_DEPS)
touch src/pycantera.cpp
ifeq ($(os_is_win),0)
(@PYTHON_CMD@ setup.py build)
else
(@PYTHON_CMD@ winsetup.py build)
endif
echo 'ok' > _build
install:
ifeq ($(os_is_win),0)
ifeq (@local_inst@,1)
(@PYTHON_CMD@ setup.py install --prefix=@prefix@)
else
(@PYTHON_CMD@ setup.py install)
endif
else
(@PYTHON_CMD@ winsetup.py install)
endif
clean:
ifeq ($(os_is_win),0)
@PYTHON_CMD@ setup.py clean
cd src; rm -f *.o
else
@PYTHON_CMD@ winsetup.py clean
cd src; rm -f *.obj
endif
depends:
echo '-'

72
Cantera/python/src/methods.h
View File

@@ -88,42 +88,42 @@ static PyMethodDef ct_methods[] = {
//{"ck2cti", ct_ck2cti, METH_VARARGS},
{"buildSolutionFromXML", ct_buildSolutionFromXML, METH_VARARGS},
{"Flow", py_flow_new, METH_VARARGS},
{"flow_delete", py_flow_delete, METH_VARARGS},
{"flow_setupgrid", py_flow_setupgrid, METH_VARARGS},
{"flow_setthermo", py_flow_setthermo, METH_VARARGS},
{"flow_setkinetics", py_flow_setkinetics, METH_VARARGS},
{"flow_settransport", py_flow_settransport, METH_VARARGS},
{"flow_setpressure", py_flow_setpressure, METH_VARARGS},
{"flow_solvespecies", py_flow_solvespecies, METH_VARARGS},
{"flow_settemperature", py_flow_settemperature, METH_VARARGS},
{"flow_setenergyfactor", py_flow_setenergyfactor, METH_VARARGS},
{"flow_setmassfraction", py_flow_setmassfraction, METH_VARARGS},
{"flow_settolerances", py_flow_settolerances, METH_VARARGS},
{"flow_energy", py_flow_energy, METH_VARARGS},
{"flow_showsolution", py_flow_showsolution, METH_VARARGS},
{"flow_resize", py_flow_resize, METH_VARARGS},
{"flow_outputtec", py_flow_outputtec, METH_VARARGS},
{"flow_restore", py_flow_restore, METH_VARARGS},
{"flow_setfixedpoint", py_flow_setfixedpoint, METH_VARARGS},
{"flow_setboundaries", py_flow_setboundaries, METH_VARARGS},
{"copy", py_copy, METH_VARARGS},
{"bdry_new", py_bdry_new, METH_VARARGS},
{"bdry_del", py_bdry_delete, METH_VARARGS},
{"bdry_set", py_bdry_set, METH_VARARGS},
{"onedim_solve", py_onedim_solve, METH_VARARGS},
{"onedim_new", py_onedim_new, METH_VARARGS},
{"onedim_del", py_onedim_delete, METH_VARARGS},
{"onedim_setnewtonoptions", py_onedim_setnewtonoptions, METH_VARARGS},
{"onedim_ssnorm", py_onedim_ssnorm, METH_VARARGS},
{"onedim_setsteadymode", py_onedim_setsteadymode, METH_VARARGS},
{"onedim_settransientmode", py_onedim_settransientmode, METH_VARARGS},
{"onedim_eval", py_onedim_eval, METH_VARARGS},
{"onedim_addflow", py_onedim_addflow, METH_VARARGS},
{"onedim_resize", py_onedim_resize, METH_VARARGS},
{"onedim_writestats", py_onedim_writestats, METH_VARARGS},
{"onedim_timestep", py_onedim_timestep, METH_VARARGS},
{"onedim_save", py_onedim_save, METH_VARARGS},
// {"Flow", py_flow_new, METH_VARARGS},
// {"flow_delete", py_flow_delete, METH_VARARGS},
// {"flow_setupgrid", py_flow_setupgrid, METH_VARARGS},
// {"flow_setthermo", py_flow_setthermo, METH_VARARGS},
// {"flow_setkinetics", py_flow_setkinetics, METH_VARARGS},
// {"flow_settransport", py_flow_settransport, METH_VARARGS},
// {"flow_setpressure", py_flow_setpressure, METH_VARARGS},
// {"flow_solvespecies", py_flow_solvespecies, METH_VARARGS},
// {"flow_settemperature", py_flow_settemperature, METH_VARARGS},
// {"flow_setenergyfactor", py_flow_setenergyfactor, METH_VARARGS},
// {"flow_setmassfraction", py_flow_setmassfraction, METH_VARARGS},
// {"flow_settolerances", py_flow_settolerances, METH_VARARGS},
// {"flow_energy", py_flow_energy, METH_VARARGS},
// {"flow_showsolution", py_flow_showsolution, METH_VARARGS},
// {"flow_resize", py_flow_resize, METH_VARARGS},
// {"flow_outputtec", py_flow_outputtec, METH_VARARGS},
// {"flow_restore", py_flow_restore, METH_VARARGS},
// {"flow_setfixedpoint", py_flow_setfixedpoint, METH_VARARGS},
// {"flow_setboundaries", py_flow_setboundaries, METH_VARARGS},
// {"copy", py_copy, METH_VARARGS},
// {"bdry_new", py_bdry_new, METH_VARARGS},
// {"bdry_del", py_bdry_delete, METH_VARARGS},
// {"bdry_set", py_bdry_set, METH_VARARGS},
// {"onedim_solve", py_onedim_solve, METH_VARARGS},
// {"onedim_new", py_onedim_new, METH_VARARGS},
// {"onedim_del", py_onedim_delete, METH_VARARGS},
// {"onedim_setnewtonoptions", py_onedim_setnewtonoptions, METH_VARARGS},
// {"onedim_ssnorm", py_onedim_ssnorm, METH_VARARGS},
// {"onedim_setsteadymode", py_onedim_setsteadymode, METH_VARARGS},
// {"onedim_settransientmode", py_onedim_settransientmode, METH_VARARGS},
// {"onedim_eval", py_onedim_eval, METH_VARARGS},
// {"onedim_addflow", py_onedim_addflow, METH_VARARGS},
// {"onedim_resize", py_onedim_resize, METH_VARARGS},
// {"onedim_writestats", py_onedim_writestats, METH_VARARGS},
// {"onedim_timestep", py_onedim_timestep, METH_VARARGS},
// {"onedim_save", py_onedim_save, METH_VARARGS},
{"domain_clear", py_domain_clear, METH_VARARGS},
{"domain_del", py_domain_del, METH_VARARGS},

4
Cantera/python/src/pycantera.cpp
View File

@@ -17,7 +17,7 @@
#include "ct.h"
#include "ctxml.h"
#include "ctstagn.h"
//#include "ctstagn.h"
#include "ctsurf.h"
#include "ctbdry.h"
#include "ctrpath.h"
@@ -39,7 +39,7 @@ static PyObject *ErrorObject;
#include "ctkinetics_methods.cpp"
#include "cttransport_methods.cpp"
#include "ctxml_methods.cpp"
#include "ctflow_methods.cpp"
//#include "ctflow_methods.cpp"
#include "ctfuncs.cpp"
#include "ctsurf_methods.cpp"
#include "ctbndry_methods.cpp"

3
Cantera/src/ct2ctml.cpp
View File

@@ -90,7 +90,8 @@ namespace ctml {
<< "write()\n";
f.close();
#ifdef WIN32
string cmd = "cmd /C "+pypath() + " " + path + ">> ct2ctml.log 2>&1";
//string cmd = "cmd /C "+pypath() + " " + path + ">> ct2ctml.log 2>&1";
string cmd = pypath() + " " + path + ">> ct2ctml.log 2>&1";
#else
string cmd = pypath() + " " + path + " &> ct2ctml.log";
#endif

4
Makefile.in
View File

@@ -50,8 +50,8 @@ kernel-install:
win-kernel-install:
@INSTALL@ -d @prefix@/lib/cantera
rm -f @prefix@/lib/cantera/*
@INSTALL@ -m 644 @buildlib@/*.lib @prefix@/lib/cantera
cd Cantera/clib/src; @MAKE@ install
@INSTALL@ -m 644 lib/*.lib @prefix@/lib/cantera
cd Cantera/clib/src; @MAKE@ win-install
data-install:
@INSTALL@ -d @prefix@/cantera/data

10
config.h
View File

@@ -9,11 +9,11 @@
//------------------------ Fortran settings -------------------//
// define types doublereal, integer, and ftnlen to match the
// define types doublereal, integer, and ftnlen to match the
// corresponding Fortran data types on your system. The defaults
// are OK for most systems
typedef double doublereal; // Fortran double precision
typedef double doublereal; // Fortran double precision
typedef int integer; // Fortran integer
typedef int ftnlen; // Fortran hidden string length type
@@ -22,7 +22,7 @@ typedef int ftnlen; // Fortran hidden string length type
// adding a hidden argement with the length of the string. Some
// compilers add the hidden length argument immediately after the
// CHARACTER variable being passed, while others put all of the hidden
// length arguments at the end of the argument list. Define this if
// length arguments at the end of the argument list. Define this if
// the lengths are at the end of the argument list. This is usually the
// case for most unix Fortran compilers, but is (by default) false for
// Visual Fortran under Windows.
@@ -37,7 +37,7 @@ typedef int ftnlen; // Fortran hidden string length type
//-------- LAPACK / BLAS ---------
// Define if you are using LAPACK and BLAS from the Intel Math Kernel
// Library
// Library
/* #undef HAVE_INTEL_MKL */
#define LAPACK_FTN_STRING_LEN_AT_END
@@ -45,7 +45,7 @@ typedef int ftnlen; // Fortran hidden string length type
#define LAPACK_FTN_TRAILING_UNDERSCORE
//--------- Cantera --------------
//--------- Cantera --------------
//--------- CKReader -------------

4378
config/configure vendored
View File

File diff suppressed because it is too large Load Diff

5
config/configure.in
View File

@@ -320,10 +320,9 @@ case $ac_sys_system in
Darwin*) FLIBS='-lg2c -lgcc'; SHARED_CTLIB=0; OS_IS_DARWIN=1; mex_ext=mexmac;;
CYGWIN*) OS_IS_WIN=1; mex_ext=dll;;
esac
AC_SUBST(FLIBS)
AC_SUBST(OS_IS_DARWIN)
AC_SUBST(FLIBS)
AC_SUBST(OS_IS_DARWIN)
AC_SUBST(OS_IS_WIN)
AC_SUBST(SHARED_CTLIB)
AC_SUBST(mex_ext)