research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2005-01-09 20:58:22 +00:00
parent 363cce0203
commit 320f882050
2 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cantera/src/MultiPhase.cpp
View file

@ -266,14 +266,11 @@ namespace Cantera {
doublereal MultiPhase::equilibrate(int XY, doublereal err,
int maxsteps) {
cout << "in equil" << endl;
init();
if (m_equil == 0) {
m_equil = new MultiPhaseEquil(this);
}
m_equil->equilibrate(XY, err, maxsteps);
delete m_equil;
m_equil = 0;
return m_equil->equilibrate(XY, err, maxsteps);
}
}

26
Cantera/src/config.h
View file

@ -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.
/* #undef HAS_NUMERIC */
//--------------------- 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