From ff498f5381c8430a5270a8640bee704380de56d8 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Fri, 12 Dec 2003 16:46:16 +0000 Subject: [PATCH] - --- Cantera/matlab/cantera/private/flowdevicemethods.cpp | 2 +- Cantera/matlab/cantera/private/reactormethods.cpp | 2 +- Cantera/matlab/cantera/private/wallmethods.cpp | 2 +- Cantera/matlab/setup_matlab.py.in | 8 ++++---- config/configure | 3 ++- config/configure.in | 1 + 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cantera/matlab/cantera/private/flowdevicemethods.cpp b/Cantera/matlab/cantera/private/flowdevicemethods.cpp index 89e3ddc06..a8cd270b3 100644 --- a/Cantera/matlab/cantera/private/flowdevicemethods.cpp +++ b/Cantera/matlab/cantera/private/flowdevicemethods.cpp @@ -5,7 +5,7 @@ #include "../../../clib/src/ct.h" -const double Undef = -999.123; +//const double Undef = -999.123; void flowdevicemethods( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] ) diff --git a/Cantera/matlab/cantera/private/reactormethods.cpp b/Cantera/matlab/cantera/private/reactormethods.cpp index 3c4b09c7a..0e2a4e968 100644 --- a/Cantera/matlab/cantera/private/reactormethods.cpp +++ b/Cantera/matlab/cantera/private/reactormethods.cpp @@ -4,7 +4,7 @@ #include "../../../clib/src/ct.h" #include "ctmatutils.h" -const double Undef = -999.123; +//const double Undef = -999.123; void reactormethods( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] ) diff --git a/Cantera/matlab/cantera/private/wallmethods.cpp b/Cantera/matlab/cantera/private/wallmethods.cpp index 7f1787c32..86bf02edc 100644 --- a/Cantera/matlab/cantera/private/wallmethods.cpp +++ b/Cantera/matlab/cantera/private/wallmethods.cpp @@ -4,7 +4,7 @@ #include "../../../clib/src/ct.h" #include "ctmatutils.h" -const double Undef = -999.123; +//const double Undef = -999.123; void wallmethods( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] ) diff --git a/Cantera/matlab/setup_matlab.py.in b/Cantera/matlab/setup_matlab.py.in index 5b5a6c46b..e0a8314a0 100644 --- a/Cantera/matlab/setup_matlab.py.in +++ b/Cantera/matlab/setup_matlab.py.in @@ -1,10 +1,10 @@ import sys -bindir = @ct_bindir@ -libdir = @ct_libdir@ -incdir = @ct_incroot@ -libs = @LOCAL_LIBS@ @LIBS@ @FLIBS@ +bindir = '@ct_bindir@' +libdir = '@ct_libdir@' +incdir = '@ct_incroot@' +libs = '@LOCAL_LIBS@ @LIBS@ @FLIBS@' f = open('setup.m','w') f.write('cd cantera\nbuildux\nexit\n') diff --git a/config/configure b/config/configure index f6e01f3f2..86c8552d6 100755 --- a/config/configure +++ b/config/configure @@ -3661,7 +3661,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_config_files="$ac_config_files ../Cantera/Makefile ../Cantera/src/Makefile ../Cantera/src/zeroD/Makefile ../Cantera/src/oneD/Makefile ../Cantera/src/converters/Makefile ../Cantera/src/transport/Makefile ../Cantera/clib/src/Makefile ../Cantera/fortran/src/Makefile ../Cantera/fortran/f77demos/f77demos.mak ../Cantera/matlab/Makefile ../Cantera/python/Makefile ../Cantera/python/setup.py ../Cantera/cxx/Makefile ../Cantera/user/Makefile ../Cantera/python/src/Makefile ../ext/lapack/Makefile ../ext/blas/Makefile ../ext/cvode/Makefile ../ext/math/Makefile ../ext/tpx/Makefile ../ext/Makefile ../ext/recipes/Makefile ../examples/Makefile ../examples/cxx/Makefile ../Makefile ../tools/Makefile ../tools/src/Makefile ../tools/src/sample.mak ../tools/src/finish_install.py ../tools/src/package4mac ../tools/templates/f77/demo.mak ../tools/templates/cxx/demo.mak ../tools/testtools/Makefile ../data/inputs/Makefile ../test_problems/Makefile ../test_problems/cxx_ex/Makefile ../test_problems/silane_equil/Makefile ../test_problems/surfkin/Makefile ../test_problems/diamondSurf/Makefile" + ac_config_files="$ac_config_files ../Cantera/Makefile ../Cantera/src/Makefile ../Cantera/src/zeroD/Makefile ../Cantera/src/oneD/Makefile ../Cantera/src/converters/Makefile ../Cantera/src/transport/Makefile ../Cantera/clib/src/Makefile ../Cantera/fortran/src/Makefile ../Cantera/fortran/f77demos/f77demos.mak ../Cantera/matlab/Makefile ../Cantera/matlab/setup_matlab.py ../Cantera/python/Makefile ../Cantera/python/setup.py ../Cantera/cxx/Makefile ../Cantera/user/Makefile ../Cantera/python/src/Makefile ../ext/lapack/Makefile ../ext/blas/Makefile ../ext/cvode/Makefile ../ext/math/Makefile ../ext/tpx/Makefile ../ext/Makefile ../ext/recipes/Makefile ../examples/Makefile ../examples/cxx/Makefile ../Makefile ../tools/Makefile ../tools/src/Makefile ../tools/src/sample.mak ../tools/src/finish_install.py ../tools/src/package4mac ../tools/templates/f77/demo.mak ../tools/templates/cxx/demo.mak ../tools/testtools/Makefile ../data/inputs/Makefile ../test_problems/Makefile ../test_problems/cxx_ex/Makefile ../test_problems/silane_equil/Makefile ../test_problems/surfkin/Makefile ../test_problems/diamondSurf/Makefile" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -4143,6 +4143,7 @@ do "../Cantera/fortran/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/fortran/src/Makefile" ;; "../Cantera/fortran/f77demos/f77demos.mak" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/fortran/f77demos/f77demos.mak" ;; "../Cantera/matlab/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/matlab/Makefile" ;; + "../Cantera/matlab/setup_matlab.py" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/matlab/setup_matlab.py" ;; "../Cantera/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/python/Makefile" ;; "../Cantera/python/setup.py" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/python/setup.py" ;; "../Cantera/cxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/cxx/Makefile" ;; diff --git a/config/configure.in b/config/configure.in index 4508eb80a..4c403a6d7 100755 --- a/config/configure.in +++ b/config/configure.in @@ -467,6 +467,7 @@ AC_OUTPUT(../Cantera/Makefile \ ../Cantera/fortran/src/Makefile \ ../Cantera/fortran/f77demos/f77demos.mak \ ../Cantera/matlab/Makefile \ + ../Cantera/matlab/setup_matlab.py \ ../Cantera/python/Makefile \ ../Cantera/python/setup.py \ ../Cantera/cxx/Makefile \