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

General commit due to windows port.

Browse source
This commit is contained in:
Harry Moffat 2009-03-27 21:32:32 +00:00
parent b0884a7bad
commit 7d7a9315fa
8 changed files with 6164 additions and 4603 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cantera/python/examples/Makefile
View file

@ -2,7 +2,7 @@
PY_DEMO_DIRS = equilibrium flames gasdynamics kinetics liquid_vapor \
misc reactors surface_chemistry transport fuel_cells
MAKE = gmake
MAKE = make
all:
@(for d in $(PY_DEMO_DIRS) ; do \
echo "entering directory $${d}..."; \
@ -22,9 +22,9 @@ test:
done)
install:
/usr/bin/install -c -d /home/hkmoffa/arch/linux/cantera-1.7_develop/demos/python
/usr/bin/install -c -c -m ug+rw,o+r Makefile /home/hkmoffa/arch/linux/cantera-1.7_develop/demos/python
/usr/bin/install -c -c -m ug+rw,o+r run_examples.py /home/hkmoffa/arch/linux/cantera-1.7_develop/demos/python
/usr/bin/install -c -d C:/cygwin/usr/local/cantera/demos/python
/usr/bin/install -c -c -m ug+rw,o+r Makefile C:/cygwin/usr/local/cantera/demos/python
/usr/bin/install -c -c -m ug+rw,o+r run_examples.py C:/cygwin/usr/local/cantera/demos/python
@(for d in $(PY_DEMO_DIRS) ; do \
echo "entering directory $${d}..."; \
(cd $${d}; $(MAKE) install) ; \

42
Cantera/src/equil/vcs_Gibbs.cpp
View file

@ -39,22 +39,22 @@ namespace VCSnonideal {
{
double g = 0.0;
for (int iph = 0; iph < m_numPhases; iph++) {
vcs_VolPhase *Vphase = m_VolPhaseList[iph];
if ((TPhInertMoles[iph] > 0.0) && (tPhMoles[iph] > 0.0)) {
g += TPhInertMoles[iph] *
log(TPhInertMoles[iph] / tPhMoles[iph]);
if (Vphase->m_gasPhase) {
g += TPhInertMoles[iph] * log(m_pressurePA/(1.01325E5));
for (int iph = 0; iph < m_numPhases; iph++) {
vcs_VolPhase *Vphase = m_VolPhaseList[iph];
if ((TPhInertMoles[iph] > 0.0) && (tPhMoles[iph] > 0.0)) {
g += TPhInertMoles[iph] *
log(TPhInertMoles[iph] / tPhMoles[iph]);
if (Vphase->m_gasPhase) {
g += TPhInertMoles[iph] * log(m_pressurePA/(1.01325E5));
}
}
}
}
}
for (int kspec = 0; kspec < m_numSpeciesRdc; ++kspec) {
if (m_speciesUnknownType[kspec] != VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) {
g += molesSp[kspec] * chemPot[kspec];
}
}
for (int kspec = 0; kspec < m_numSpeciesRdc; ++kspec) {
if (m_speciesUnknownType[kspec] != VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) {
g += molesSp[kspec] * chemPot[kspec];
}
}
return g;
}
@ -70,14 +70,14 @@ namespace VCSnonideal {
*/
double VCS_SOLVE::vcs_GibbsPhase(int iphase, const double * const w,
const double * const fe) {
double g = 0.0;
double g = 0.0;
double phaseMols = 0.0;
for (int kspec = 0; kspec < m_numSpeciesRdc; ++kspec) {
if (m_phaseID[kspec] == iphase) {
if (m_speciesUnknownType[kspec] != VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) {
g += w[kspec] * fe[kspec];
phaseMols += w[kspec];
}
if (m_speciesUnknownType[kspec] != VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) {
g += w[kspec] * fe[kspec];
phaseMols += w[kspec];
}
}
}
@ -85,8 +85,8 @@ namespace VCSnonideal {
phaseMols += TPhInertMoles[iphase];
g += TPhInertMoles[iphase] * log(TPhInertMoles[iphase] / phaseMols);
vcs_VolPhase *Vphase = m_VolPhaseList[iphase];
if (Vphase->m_gasPhase == iphase) {
g += TPhInertMoles[iphase] * log(m_pressurePA/1.01325E5);
if (Vphase->m_gasPhase) {
g += TPhInertMoles[iphase] * log(m_pressurePA/1.01325E5);
}
}

2
Cantera/src/numerics/CVodesIntegrator.h
View file

@ -2,7 +2,7 @@
* @file CVodesWrapper.h
*/
/* $Author$
/*
* $Date$
* $Revision$
*/

5
Cantera/src/numerics/NonlinearSolver.cpp
View file

@ -16,7 +16,7 @@
* See file License.txt for licensing information.
*/
#include <limits>
#include "SquareMatrix.h"
#include "NonlinearSolver.h"
@ -34,6 +34,7 @@ extern void print_line(const char *, int);
#include <cstdio>
#include <cmath>
#ifndef MAX
#define MAX(x,y) (( (x) > (y) ) ? (x) : (y))
#define MIN(x,y) (( (x) < (y) ) ? (x) : (y))
@ -93,7 +94,7 @@ namespace Cantera {
m_rowScales.resize(neq_, 1.0);
m_resid.resize(neq_, 0.0);
atolk_.resize(neq_, atolBase_);
doublereal hb = numeric_limits<double>::max();
doublereal hb = std::numeric_limits<double>::max();
m_y_high_bounds.resize(neq_, hb);
m_y_low_bounds.resize(neq_, -hb);

6
Cantera/src/spectra/Makefile.in
View file

@ -28,9 +28,11 @@ PIC_FLAG=@PIC@
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) $(CXX_OPT) $(PIC_FLAG) $(DEBUG_FLAG)
SPECTRA_OBJ = rotor.o LineBroadener.o spectralUtilities.o
#SPECTRA_OBJ = rotor.o LineBroadener.o spectralUtilities.o
SPECTRA_OBJ = rotor.o LineBroadener.o
SPECTRA_H = rotor.h LineBroadener.h Nuclei.h spectralUtilities.h
#SPECTRA_H = rotor.h LineBroadener.h Nuclei.h spectralUtilities.h
SPECTRA_H = rotor.h LineBroadener.h
CXX_INCLUDES = -I. @CXX_INCLUDES@ -I../base
LIB = @buildlib@/libctspectra.a

10592
configure vendored
View file

File diff suppressed because one or more lines are too long

10
ext/f2c_math/polfit.c
View file

@ -167,6 +167,16 @@
--y;
--x;
/* Uninitialized local variables -> note, I don't see how this
* function can be working */
k1=0;
k2 = 0;
k3 = 0;
k4 = 0;
k5 = 0;
etst = 1.0E-13;
xm = 1.0;
/* Function Body */
m = abs(*n);
if (m == 0) {

102
winconfig.h
View file

@ -1,6 +1,6 @@
/* config.h. Generated from config.h.in by configure. */
//
// Run the 'configure' script to generate 'config.h' from this input file.
// Run the 'preconfig' script to generate 'config.h' from this input file.
//
#ifndef CT_CONFIG_H
#define CT_CONFIG_H
@ -8,16 +8,14 @@
//------------------------ Development flags ------------------//
//
// These flags turn on or off features that are still in
// development and are not yet stable.
#define DEV_EQUIL
// Compile in additional debug printing where available.
// Note, the printing may need to be turned on via a switch.
// This just compiles in the code.
/* #undef DEBUG_MODE */
// Compiling with PURIFY instrumentation
/* #undef PURIFY_MODE */
//------------------------ Fortran settings -------------------//
@ -44,25 +42,25 @@ typedef int ftnlen; // Fortran hidden string length type
// 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
#define FTN_TRAILING_UNDERSCORE 1
#define HAS_SUNDIALS 1
/* #undef HAS_SUNDIALS */
/* #undef SUNDIALS_VERSION_22 */
/* #undef SUNDIALS_VERSION_23 */
//-------- 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
#define LAPACK_FTN_STRING_LEN_AT_END 1
#define LAPACK_NAMES_LOWERCASE 1
#define LAPACK_FTN_TRAILING_UNDERSCORE 1
//--------- 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.
/* #undef DARWIN */
#define HAS_SSTREAM 1
@ -77,18 +75,33 @@ typedef int ftnlen; // Fortran hidden string length type
// microsoft vc++ being used as the compiler
#define WINMSVC 1
#define HAS_SUNDIALS 1
#define SUNDIALS_VERSION_23
// Identify whether the operating system is solaris
// with a native compiler
/* #undef SOLARIS */
//--------- Fonts for reaction path diagrams ----------------------
#define RXNPATH_FONT "Helvetica"
//---------- C++ Compiler Variations ------------------------------
// This define is needed to account for the variability for how
// static variables in templated classes are defined. Right now
// this is only turned on for the SunPro compiler on solaris.
// in that system , you need to declare the static storage variable.
// with the following line in the include file
//
// template<class M> Cabinet<M>* Cabinet<M>::__storage;
//
// Note, on other systems that declaration is treated as a definition
// and this leads to multiple defines at link time
/* #undef NEEDS_GENERIC_TEMPL_STATIC_DECL */
//--------------------- 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 "/usr/bin/python"
#define PYTHON_EXE "c:/python25/python.exe"
// If this is defined, the Cantera Python interface will use the
// Numeric package; otherwise, it will use numarray.
@ -98,7 +111,18 @@ typedef int ftnlen; // Fortran hidden string length type
// present to support conversions
/* #undef HAS_NO_PYTHON */
#define WITH_HTML_LOGS
//--------------------- Cantera -----------------------------------
// This is the data pathway used to locate the top of the
// build directory.
/* #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 "C:/cygwin/usr/local/cantera/data"
#define WITH_HTML_LOGS 1
// define STORE_MOLE_FRACTIONS if you want Cantera to internally
// represent the composition of a mixture as mole fractions. Usually
@ -111,9 +135,39 @@ typedef int ftnlen; // Fortran hidden string length type
//#define STORE_MASS_FRACTIONS
/* #undef STORE_MASS_FRACTIONS */
#define WITH_METAL
#define WITH_STOICH_SUBSTANCE
#define WITH_PURE_FLUIDS
#define WITH_LATTICE_SOLID
//--------------------- compile options ----------------------------
/* #undef USE_PCH */
/* #undef THREAD_SAFE_CANTERA */
//--------------------- optional phase models ----------------------
// This define indicates the enabling of the inclusion of
// accurate liquid/vapor equations
// of state for several fluids, including water, nitrogen, hydrogen,
// oxygen, methane, andd HFC-134a.
#define INCL_PURE_FLUIDS 1
#define WITH_PURE_FLUIDS 1
#define WITH_LATTICE_SOLID 1
#define WITH_METAL 1
#define WITH_STOICH_SUBSTANCE 1
// Enable expanded thermodynamic capabilities, adding
// ideal solid solutions
#define WITH_IDEAL_SOLUTIONS 1
// Enable expanded electrochemistry capabilities, include thermo
// models for electrolyte solutions.
#define WITH_ELECTROLYTES 1
/* #undef WITH_PRIME */
// Enable the VCS NonIdeal equilibrium solver. This is
// accessed by specifying the solver=2 option
#define WITH_VCSNONIDEAL 1
//-------------- Optional Cantera Capabilities ----------------------
// Enable sensitivity analysis via changing H298 directly
// for species
/* #undef H298MODIFY_CAPABILITY */
#endif