From bd515a947a91755a18962a57d5e3d10e46099cb4 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Sat, 8 Jan 2005 00:31:45 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/cxx/demos/rankine.cpp | 8 ++++++-- Cantera/src/ChemEquil.cpp | 2 +- Cantera/src/config.h | 26 ++++++-------------------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Cantera/cxx/demos/rankine.cpp b/Cantera/cxx/demos/rankine.cpp index 78df43f09..61f2b9622 100644 --- a/Cantera/cxx/demos/rankine.cpp +++ b/Cantera/cxx/demos/rankine.cpp @@ -71,8 +71,12 @@ void openRankine() { double heat_in = h["3"] - h["2"]; double efficiency = work/heat_in; - cout << "efficiency = " << efficiency << endl; - + cout << "efficiency = " << efficiency << endl; +#ifdef WIN32 + cout << "press any key to end" << endl; + char ch; + cin >> ch; +#endif } diff --git a/Cantera/src/ChemEquil.cpp b/Cantera/src/ChemEquil.cpp index eeb0b3eb2..2133130f6 100755 --- a/Cantera/src/ChemEquil.cpp +++ b/Cantera/src/ChemEquil.cpp @@ -5,7 +5,7 @@ * Chemical equilibrium. * Implementation file for class ChemEquil * - * $Author$ + * $Author$ * $Date$ * $Revision$ * 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