From 7f64be6f6cbe9ed0f00dadca25e034ce913e3180 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Thu, 6 Jan 2005 23:42:23 +0000 Subject: [PATCH] cleanup --- Cantera/python/Cantera/num.py | 2 +- Cantera/src/config.h | 26 +++-------- config.h | 26 +++-------- winconfig.h | 86 +++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 41 deletions(-) create mode 100644 winconfig.h diff --git a/Cantera/python/Cantera/num.py b/Cantera/python/Cantera/num.py index de53d9de0..4a97d889d 100644 --- a/Cantera/python/Cantera/num.py +++ b/Cantera/python/Cantera/num.py @@ -27,4 +27,4 @@ array = nummodule.array asarray = nummodule.asarray transpose = nummodule.transpose ravel = nummodule.ravel - +shape = nummodule.shape diff --git a/Cantera/src/config.h b/Cantera/src/config.h index c36970874..9cc9f7918 100755 --- a/Cantera/src/config.h +++ b/Cantera/src/config.h @@ -11,7 +11,7 @@ // These flags turn on or off features that are still in // development and are not yet stable. -#define DEV_EQUIL +#undef DEV_EQUIL //------------------------ Fortran settings -------------------// @@ -59,8 +59,8 @@ 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 1 -#define HAS_SSTREAM 1 +#define DARWIN 0 +/* #undef HAS_SSTREAM */ // Identify whether the operating system is cygwin's overlay of // windows, with gcc being used as the compiler. @@ -68,33 +68,19 @@ typedef int ftnlen; // Fortran hidden string length type // Identify whether the operating system is windows based, with // microsoft vc++ being used as the compiler -/* #undef WINMSVC */ +#define WINMSVC //--------- Fonts for reaction path diagrams ---------------------- #define RXNPATH_FONT "Helvetica" //--------------------- Python ------------------------------------ -// This path to the python executable is created during -// Cantera's setup. It identifies the python executable -// used to run Python to process .cti files. Note that this is only -// used if environment variable PYTHON_CMD is not set. -#define PYTHON_EXE "python" - // If this is defined, the Cantera Python interface will use the // Numeric package; otherwise, it will use numarray. -#define HAS_NUMERIC 1 - -//--------------------- Cantera ----------------------------------- - -/* #undef CANTERA_ROOT */ -// This data pathway is used to locate a directory where datafiles -// are to be found. Note, the local directory is always searched -// as well. -#define CANTERA_DATA "/Applications/Cantera/data" +/* #define HAS_NUMERIC 1 */ #define INCL_PURE_FLUIDS 1 //--------------------- compile options ---------------------------- -#define USE_PCH 1 +/* #define USE_PCH 1 */ #endif diff --git a/config.h b/config.h index c36970874..9cc9f7918 100755 --- a/config.h +++ b/config.h @@ -11,7 +11,7 @@ // These flags turn on or off features that are still in // development and are not yet stable. -#define DEV_EQUIL +#undef DEV_EQUIL //------------------------ Fortran settings -------------------// @@ -59,8 +59,8 @@ 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 1 -#define HAS_SSTREAM 1 +#define DARWIN 0 +/* #undef HAS_SSTREAM */ // Identify whether the operating system is cygwin's overlay of // windows, with gcc being used as the compiler. @@ -68,33 +68,19 @@ typedef int ftnlen; // Fortran hidden string length type // Identify whether the operating system is windows based, with // microsoft vc++ being used as the compiler -/* #undef WINMSVC */ +#define WINMSVC //--------- Fonts for reaction path diagrams ---------------------- #define RXNPATH_FONT "Helvetica" //--------------------- Python ------------------------------------ -// This path to the python executable is created during -// Cantera's setup. It identifies the python executable -// used to run Python to process .cti files. Note that this is only -// used if environment variable PYTHON_CMD is not set. -#define PYTHON_EXE "python" - // If this is defined, the Cantera Python interface will use the // Numeric package; otherwise, it will use numarray. -#define HAS_NUMERIC 1 - -//--------------------- Cantera ----------------------------------- - -/* #undef CANTERA_ROOT */ -// This data pathway is used to locate a directory where datafiles -// are to be found. Note, the local directory is always searched -// as well. -#define CANTERA_DATA "/Applications/Cantera/data" +/* #define HAS_NUMERIC 1 */ #define INCL_PURE_FLUIDS 1 //--------------------- compile options ---------------------------- -#define USE_PCH 1 +/* #define USE_PCH 1 */ #endif diff --git a/winconfig.h b/winconfig.h new file mode 100644 index 000000000..9cc9f7918 --- /dev/null +++ b/winconfig.h @@ -0,0 +1,86 @@ +/* ../config.h. Generated by configure. */ +// +// Run the 'configure' script to generate 'config.h' from this input file. +// +#ifndef CT_CONFIG_H +#define CT_CONFIG_H + + +//------------------------ Development flags ------------------// +// +// These flags turn on or off features that are still in +// development and are not yet stable. + +#undef DEV_EQUIL + + +//------------------------ Fortran settings -------------------// + + +// 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 int integer; // Fortran integer +typedef int ftnlen; // Fortran hidden string length type + + + +// Fortran compilers pass character strings in argument lists by +// 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 +// 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. +#define STRING_LEN_AT_END + + +// Define this if Fortran adds a trailing underscore to names in object files. +// For linux and most unix systems, this is the case. +#define FTN_TRAILING_UNDERSCORE + + +//-------- LAPACK / BLAS --------- + +// Define if you are using LAPACK and BLAS from the Intel Math Kernel +// Library +/* #undef HAVE_INTEL_MKL */ + +#define LAPACK_FTN_STRING_LEN_AT_END +#define LAPACK_NAMES_LOWERCASE +#define LAPACK_FTN_TRAILING_UNDERSCORE + + +//--------- operating system -------------------------------------- + +// 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 +/* #undef HAS_SSTREAM */ + +// Identify whether the operating system is cygwin's overlay of +// windows, with gcc being used as the compiler. +/* #undef CYGWIN */ + +// Identify whether the operating system is windows based, with +// microsoft vc++ being used as the compiler +#define WINMSVC + +//--------- Fonts for reaction path diagrams ---------------------- +#define RXNPATH_FONT "Helvetica" + +//--------------------- Python ------------------------------------ +// If this is defined, the Cantera Python interface will use the +// Numeric package; otherwise, it will use numarray. +/* #define HAS_NUMERIC 1 */ + +#define INCL_PURE_FLUIDS 1 + +//--------------------- compile options ---------------------------- +/* #define USE_PCH 1 */ + +#endif