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
2004-02-03 16:42:43 +00:00
parent d57b9c8f2a
commit ea1b61e3d9
9 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cantera/matlab/Makefile.in
View File

@@ -24,6 +24,8 @@ SRCS = cantera/private/ctmethods.cpp \
cantera/private/surfmethods.cpp
CANTERA_LIBDIR=@buildlib@
os_is_win=@OS_IS_WIN@
ifeq ($(os_is_win),0)
LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/liboneD.a \
@@ -34,8 +36,6 @@ LIB_DEPS = $(CANTERA_LIBDIR)/cantera.lib $(CANTERA_LIBDIR)/zeroD.lib \
$(CANTERA_LIBDIR)/transport.lib
endif
os_is_win=@OS_IS_WIN@
all: cantera/ctmethods.@mex_ext@
cantera/ctmethods.@mex_ext@: $(SRCS) $(LIBDEPS) Makefile

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

@@ -11,7 +11,7 @@ namespace Cantera {
int n = 0;
while (ch != '\0') {
if (ch =='\n') {
ss += " ');";
ss += "');";
mexEvalString(ss.c_str());
ss = "disp('";
}

3
Cantera/python/Cantera/__init__.py
View File

@@ -3,9 +3,10 @@
#
import types
ok = 0
from constants import *
from gases import *
from exceptions import *
from gases import *
from set import set
from importFromFile import *

27
Cantera/python/Cantera/ctml_writer.py
View File

@@ -13,8 +13,8 @@
"""
from Cantera import CanteraError
from Cantera import GasConstant
from Cantera.exceptions import CanteraError
from Cantera.constants import *
from Cantera.XML import XML_Node
import types, math, copy
@@ -1347,15 +1347,15 @@ class Lindemann:
validate()
if __name__ == "__main__":
from Cantera import *
import sys, os, os.path
file = sys.argv[1]
base = os.path.basename(file)
root, ext = os.path.splitext(base)
dataset(root)
execfile(file)
write()
## if __name__ == "__main__":
## from Cantera import *
## import sys, os, os.path
## file = sys.argv[1]
## base = os.path.basename(file)
## root, ext = os.path.splitext(base)
## dataset(root)
## execfile(file)
## write()
##########################################
@@ -1364,7 +1364,10 @@ if __name__ == "__main__":
# $Revision$
# $Date$
# $Log$
# Revision 1.26 2004-02-03 03:31:06 dggoodwin
# Revision 1.27 2004-02-03 16:42:54 dggoodwin
# *** empty log message ***
#
# Revision 1.26 2004/02/03 03:31:06 dggoodwin
# *** empty log message ***
#
# Revision 1.25 2003/11/24 16:39:33 dggoodwin

7
Cantera/src/ct2ctml.cpp
View File

@@ -47,7 +47,7 @@ namespace ctml {
if (!f) {
throw CanteraError("checkPython","cannot open "+path+" for writing");
}
f << "from Cantera import *\n";
f << "from Cantera import ctml_writer\n";
f.close();
int ierr = 0;
#ifdef WIN32
@@ -85,8 +85,7 @@ namespace ctml {
if (!f) {
throw CanteraError("ct2ctml","cannot open "+path+" for writing.");
}
f << "from Cantera import *\n"
<< "from Cantera.ctml_writer import *\n"
f << "from Cantera.ctml_writer import *\n"
<< "import sys, os, os.path\n"
<< "file = \"" << file << "\"\n"
<< "base = os.path.basename(file)\n"
@@ -96,7 +95,7 @@ namespace ctml {
<< "write()\n";
f.close();
#ifdef WIN32
string cmd = pypath() + " " + path + ">> ct2ctml.log 2>&1";
string cmd = pypath() + " " + path + "> ct2ctml.log 2>&1";
#else
string cmd = pypath() + " " + path + " &> ct2ctml.log";
#endif

3
Makefile.in
View File

@@ -145,6 +145,7 @@ endif
finish-install:
@INSTALL@ -d @ct_docdir@
@INSTALL@ -d @ct_bindir@
#@INSTALL@ doc/*.pdf @ct_docdir@
@INSTALL@ -d @ct_demodir@/cxx
@@ -169,7 +170,6 @@ ifeq ($(os_is_win),0)
ln -s @ct_datadir@ @prefix@/cantera/data
ln -s @ct_templdir@ @prefix@/cantera/templates
ln -s @ct_tutdir@ @prefix@/cantera/tutorials
@INSTALL@ README*.txt @prefix@/cantera
@INSTALL@ License.* @prefix@/cantera
@INSTALL@ tools/src/finish_install.py tools/bin
(PYTHONPATH=''; @PYTHON_CMD@ tools/bin/finish_install.py @prefix@ @PYTHON_CMD@)
@@ -177,7 +177,6 @@ ifeq ($(os_is_win),0)
else
cd Cantera/fortran/f77demos; sed s'/isentropic/ctlib/g' isentropic.dsp > ctlib.dsp
@INSTALL@ Cantera/fortran/f77demos/*.dsp @ct_demodir@/f77
@INSTALL@ README.txt @ct_dir@
@INSTALL@ @buildbin@/* @ct_bindir@
endif

2
config/configure vendored
View File

@@ -578,7 +578,7 @@ fi
local_inst=1
if test "x${prefix}" = "xNONE"; then
if test "x${OS_IS_CYGWIN}" = "x1"; then
prefix="/cygdrive/c/cantera"
prefix=${CANTERA_INSTALL_DIR}
# mkdir ${prefix}
else
prefix=${ac_default_prefix}

2
config/configure.in
View File

@@ -45,7 +45,7 @@ AC_SUBST(CVF_LIBDIR)
local_inst=1
if test "x${prefix}" = "xNONE"; then
if test "x${OS_IS_CYGWIN}" = "x1"; then
prefix="/cygdrive/c/cantera"
prefix=${CANTERA_INSTALL_DIR}
# mkdir ${prefix}
else
prefix=${ac_default_prefix}

7
configure vendored
View File

@@ -29,7 +29,11 @@ CANTERA_VERSION=${CANTERA_VERSION:="1.5.3"}
#
# These options only need to be set if you are building Cantera on
# a Windows PC.
#
#
# Cantera will be installed by default in c:\cantera. Change this to
# install it somewhere else
CANTERA_INSTALL_DIR=${CANTERA_INSTALL_DIR:="c:\cantera"}
# On a PC running MS-Windows, Cantera can be built either using
# Microsoft Visual Studio, with the Visual C++ and Visual Fortran
# compilers, or using the linux-like cygwin environment with the
@@ -309,6 +313,7 @@ export MAKE
export RPFONT
export USE_VISUAL_STUDIO
export FORTRAN_LIB_DIR
export CANTERA_INSTALL_DIR
cd config
chmod +x ./configure