From 5af88d3283e3ec858a5aa10ec20045907cb44638 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Tue, 23 Dec 2003 16:33:37 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/matlab/setup_matlab.py | 8 ++++---- Cantera/src/config.h | 20 ++++++++++---------- config.h | 20 ++++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cantera/matlab/setup_matlab.py b/Cantera/matlab/setup_matlab.py index 1c2b25d6e..ba9116c3d 100644 --- a/Cantera/matlab/setup_matlab.py +++ b/Cantera/matlab/setup_matlab.py @@ -1,10 +1,10 @@ import sys -bindir = 'd:/dgg/ct153/bin' -libdir = 'd:/dgg/dv/sf/cantera/build/lib/i686-pc-cygwin' -incdir = 'd:/dgg/dv/sf/cantera/build/include' -libs = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -lg2c -L/usr/lib/gcc-lib/i686-pc-cygwin/2.95.2-6 -L/usr/lib/mingw -lcygwin -luser32 -lkernel32 -ladvapi32 -lshell32' +bindir = '/usr/local/bin' +libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.0.0' +incdir = '/Users/dgg/dv/sf/cantera/build/include' +libs = ' -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -lg2c -lgcc' f = open('setup.m','w') f.write('cd cantera\nbuildux\nexit\n') diff --git a/Cantera/src/config.h b/Cantera/src/config.h index ced83343e..656ac8921 100755 --- a/Cantera/src/config.h +++ b/Cantera/src/config.h @@ -1,4 +1,4 @@ -/* ../config.h. Generated automatically by configure. */ +/* ../config.h. Generated by configure. */ // // Run the 'configure' script to generate 'config.h' from this input 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 @@ -50,7 +50,7 @@ typedef int ftnlen; // Fortran hidden string length type // The configure script defines this if the operatiing system is Mac // OS X, This used to add some Mac-specific directories to the default // data file search path. -#define DARWIN 0 +#define DARWIN 1 //--------- Fonts for reaction path diagrams ---------------------- @@ -60,13 +60,13 @@ typedef int ftnlen; // Fortran hidden string length type //--------------------- Python ------------------------------------ // used to run Python to process .cti files -#define PYTHON_EXE "c:/python23/python" +#define PYTHON_EXE "/usr/bin/python" -//--------------------- Cantera ----------------------------------- +//--------------------- Cantera ----------------------------------- -// used to find data files -#define CANTERA_ROOT "d:/dgg/ct153/cantera" +// used to find data files +#define CANTERA_ROOT "/usr/local/cantera" diff --git a/config.h b/config.h index ced83343e..656ac8921 100755 --- a/config.h +++ b/config.h @@ -1,4 +1,4 @@ -/* ../config.h. Generated automatically by configure. */ +/* ../config.h. Generated by configure. */ // // Run the 'configure' script to generate 'config.h' from this input 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 @@ -50,7 +50,7 @@ typedef int ftnlen; // Fortran hidden string length type // The configure script defines this if the operatiing system is Mac // OS X, This used to add some Mac-specific directories to the default // data file search path. -#define DARWIN 0 +#define DARWIN 1 //--------- Fonts for reaction path diagrams ---------------------- @@ -60,13 +60,13 @@ typedef int ftnlen; // Fortran hidden string length type //--------------------- Python ------------------------------------ // used to run Python to process .cti files -#define PYTHON_EXE "c:/python23/python" +#define PYTHON_EXE "/usr/bin/python" -//--------------------- Cantera ----------------------------------- +//--------------------- Cantera ----------------------------------- -// used to find data files -#define CANTERA_ROOT "d:/dgg/ct153/cantera" +// used to find data files +#define CANTERA_ROOT "/usr/local/cantera"