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

Merge of the main branch into the LiquidTransportDevelop branch.

Browse source
This commit is contained in:
Harry Moffat 2010-11-12 21:37:41 +00:00
commit ff3ebb25c2
59 changed files with 1479 additions and 1410 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2565
Cantera/clib/src/ct.cpp
View file

File diff suppressed because it is too large Load diff

12
Cantera/clib/src/ctonedim.cpp
View file

@ -47,16 +47,18 @@ inline Domain1D* _domain(int i) {
static StFlow* _stflow(int i) {
Domain1D* d = _domain(i);
if (d->domainType() == cFlowType) return (StFlow*)d;
else
else {
throw CanteraError("_stflow","wrong domain type");
}
return 0;
}
static Bdry1D* _bdry(int i) {
Domain1D* d = _domain(i);
if (d->isConnector()) return (Bdry1D*)d;
else
throw CanteraError("_bdry","wrong domain type: "
+int2str(d->domainType()));
if (! d->isConnector()) {
throw CanteraError("_bdry","wrong domain type: " +int2str(d->domainType()));
}
return (Bdry1D*)d;
}
inline ThermoPhase* _phase(int n) {

4
Cantera/cxx/include/Cantera.mak.in
View file

@ -25,6 +25,10 @@ in_CanteraBuildTree = 0
#
CANTERA_VERSION=@ctversion@
#
CANTERA_VERSION=@ctversion@
CANTERA_VERSION=@ctversion@
###############################################################################
# CANTERA CORE
###############################################################################

4
Cantera/cxx/include/Cantera_bt.mak.in
View file

@ -25,6 +25,10 @@ in_CanteraBuildTree = 0
#
CANTERA_VERSION=@ctversion@
#
CANTERA_VERSION=@ctversion@
CANTERA_VERSION=@ctversion@
###############################################################################
# CANTERA CORE
###############################################################################

3
Cantera/fortran/src/fct.cpp
View file

@ -33,7 +33,7 @@
// Assert that there is storage
// for the templated classes' static member
// (needed to compile on solaris)
template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage;
//template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage;
inline XML_Node* _xml(const integer* n) {
return Cabinet<XML_Node>::cabinet()->item(*n);
@ -93,6 +93,7 @@ extern "C" {
catch (CanteraError) {
handleError(); return -1;
}
return -1;
}
//--------------- Phase ---------------------//

2
Cantera/src/base/checkFinite.cpp
View file

@ -14,6 +14,8 @@
* See file License.txt for licensing information.
*/
#include "ct_defs.h"
#include <stdexcept>
#include <string>

4
Cantera/src/base/ctml.cpp
View file

@ -370,7 +370,9 @@ namespace ctml {
const std::string typeString) {
XML_Node& f = node.addChild("string", valueString);
f.addAttribute("title", titleString);
if (typeString != "") f.addAttribute("type", typeString);
if (typeString != "") {
f.addAttribute("type", typeString);
}
}
XML_Node* getByTitle(const Cantera::XML_Node& node, const std::string &title) {

26
Cantera/src/base/misc.cpp
View file

@ -1489,28 +1489,34 @@ protected:
doublereal toSI(std::string unit) {
doublereal f = Unit::units()->toSI(unit);
if (f) return f;
else throw CanteraError("toSI","unknown unit string: "+unit);
//return 1.0;
if (f) {
return f;
} else {
throw CanteraError("toSI","unknown unit string: "+unit);
}
return 1.0;
}
doublereal actEnergyToSI(std::string unit) {
doublereal f = Unit::units()->actEnergyToSI(unit);
if (f) return f;
else return 1.0;
if (f) {
return f;
}
return 1.0;
}
string canteraRoot() {
char* ctroot = 0;
ctroot = getenv("CANTERA_ROOT");
if (ctroot != 0) { return string(ctroot); }
else {
if (ctroot != 0) {
return string(ctroot);
}
#ifdef CANTERA_ROOT
return string(CANTERA_ROOT);
return string(CANTERA_ROOT);
#else
return "";
return "";
#endif
}
}
// exceptions

15
Cantera/src/base/units.h
View file

@ -173,10 +173,9 @@ namespace Cantera {
static boost::mutex units_mutex;
#endif
/*!
* Units class constructor, containing the default mappings between
* strings and units.
*/
//! Units class constructor, containing the default mappings between
//! strings and units.
Unit() :
m_u(),
m_act_u()
@ -234,13 +233,16 @@ namespace Cantera {
m_u["hr"] = 3600.0;
m_u["ms"] = 0.001;
/*// frequency
/*
// frequency - Took frequency out to reevaluate it. Inverse cm is probably the wrong default unit
m_u["hZ"] = 0.01/(lightSpeed);
m_u["cm^-1"] = 1.0;
m_u["m^-1"] = 0.1;
m_u["cm-1"] = m_u["cm^-1"];
m_u["m-1"] = m_u["m^-1"];
m_u["wavenumbers"] = m_u["cm^-1"];*/
m_u["wavenumbers"] = m_u["cm^-1"];
*/
// viscosity
m_u["Pa-s"] = 1;
@ -258,7 +260,6 @@ namespace Cantera {
m_u["ml"] = 1.0e-6;
m_u["cc"] = 1.0e-6;
m_act_u["eV"] = m_u["eV"]; // /m_u["molec"];
m_act_u["K"] = GasConstant;
m_act_u["Kelvin"] = GasConstant;

1
Cantera/src/base/utilities.h
View file

@ -687,7 +687,6 @@ namespace Cantera {
}
//@}
}

5
Cantera/src/equil/ChemEquil.cpp
View file

@ -59,7 +59,10 @@ namespace Cantera {
else if (flag == "SP") return SP;
else if (flag == "SV") return SV;
else if (flag == "UP") return UP;
else throw CanteraError("_equilflag","unknown property pair "+flag);
else {
throw CanteraError("_equilflag","unknown property pair "+flag);
}
return -1;
}

6
Cantera/src/equil/equilibrate.cpp
View file

@ -27,7 +27,7 @@ namespace Cantera {
doublereal equilibrate(MultiPhase& s, const char* XY,
doublereal tol, int maxsteps, int maxiter,
int loglevel) {
if (loglevel > 0) {
beginLogGroup("equilibrate",loglevel);
addLogEntry("multiphase equilibrate function");
@ -65,9 +65,9 @@ namespace Cantera {
endLogGroup("equilibrate");
}
throw CanteraError("equilibrate","unsupported option");
//return -1.0;
return -1.0;
}
return 0.0;
}
/*

6
Cantera/src/kinetics/Kinetics.cpp
View file

@ -260,6 +260,7 @@ namespace Cantera {
if (k >= 0) return thermo(n);
}
throw CanteraError("speciesPhase", "unknown species "+nm);
return thermo(0);
}
//==============================================================================================
@ -276,8 +277,8 @@ namespace Cantera {
return n;
}
}
throw CanteraError("speciesPhaseIndex",
"illegal species index: "+int2str(k));
throw CanteraError("speciesPhaseIndex", "illegal species index: "+int2str(k));
return -1;
}
/*
@ -338,7 +339,6 @@ namespace Cantera {
}
}
// Private function of the class Kinetics, indicating that a function
// inherited from the base class hasn't had a definition assigned to it
/*

9
Cantera/src/kinetics/RxnRates.h
View file

@ -29,7 +29,6 @@ namespace Cantera {
*
*/
class Arrhenius {
public:
//! return the rate coefficient type.
@ -128,10 +127,10 @@ namespace Cantera {
class ArrheniusSum {
public:
static int type() {
return ARRHENIUS_SUM_REACTION_RATECOEFF_TYPE;
}
ArrheniusSum() : m_nterms(0) {}
void addArrheniusTerm(doublereal A, doublereal b, doublereal E) {
@ -350,6 +349,7 @@ namespace Cantera {
//! Arrhenius reaction rate type depends only on temperature
/**
* A reaction rate coefficient of the following form.
@ -360,9 +360,8 @@ namespace Cantera {
*
*/
class ExchangeCurrent {
public:
//! return the rate coefficient type.
static int type() {
return EXCHANGE_CURRENT_REACTION_RATECOEFF_TYPE;
@ -436,7 +435,6 @@ namespace Cantera {
doublereal updateRC(doublereal logT, doublereal recipT) const {
return m_A * exp(m_b*logT - m_E*recipT);
}
void writeUpdateRHS(std::ostream& s) const {
s << " exp(" << m_logA;
@ -483,7 +481,6 @@ namespace Cantera {
// };
//}
}
#endif

1
Cantera/src/numerics/ODE_integrators.cpp
View file

@ -22,6 +22,7 @@ namespace Cantera {
throw CanteraError("newIntegrator",
"unknown ODE integrator: "+itype);
}
return 0;
}
void deleteIntegrator(Integrator *cv) {

3
Cantera/src/oneD/Domain1D.cpp
View file

@ -190,7 +190,8 @@ namespace Cantera {
doublereal Domain1D::initialValue(int n, int j) {
throw CanteraError("Domain1D::initialValue",
"base class method called!");
"base class method called!");
return 0.0;
}

1
Cantera/src/oneD/OneDim.cpp
View file

@ -64,6 +64,7 @@ namespace Cantera {
if (domain(n).id() == name) return n;
}
throw CanteraError("OneDim::domainIndex","no domain named >>"+name+"<<");
return -1;
}

45
Cantera/src/oneD/boundaries1D.cpp
View file

@ -117,10 +117,14 @@ namespace Cantera {
string Inlet1D::
componentName(int n) const {
switch (n) {
case 0: return "mdot"; break;
case 1: return "temperature"; break;
default: return "unknown";
case 0:
return "mdot";
case 1:
return "temperature";
default:
break;
}
return "unknown";
}
void Inlet1D::
@ -271,9 +275,12 @@ namespace Cantera {
string Empty1D::componentName(int n) const {
switch (n) {
case 0: return "dummy"; break;
default: return "<unknown>";
case 0:
return "dummy";
default:
break;
}
return "<unknown>";
}
void Empty1D::
@ -326,9 +333,12 @@ namespace Cantera {
string Symm1D::componentName(int n) const {
switch (n) {
case 0: return "dummy"; break;
default: return "<unknown>";
case 0:
return "dummy";
default:
break;
}
return "<unknown>";
}
void Symm1D::
@ -405,9 +415,12 @@ namespace Cantera {
string Outlet1D::componentName(int n) const {
switch (n) {
case 0: return "outlet dummy"; break;
default: return "<unknown>";
case 0:
return "outlet dummy";
default:
break;
}
return "<unknown>";
}
void Outlet1D::
@ -522,9 +535,12 @@ namespace Cantera {
string OutletRes1D::componentName(int n) const {
switch (n) {
case 0: return "dummy"; break;
default: return "<unknown>";
case 0:
return "dummy";
default:
break;
}
return "<unknown>";
}
void OutletRes1D::
@ -641,9 +657,12 @@ namespace Cantera {
string Surf1D::componentName(int n) const {
switch (n) {
case 0: return "temperature"; break;
default: return "<unknown>";
case 0:
return "temperature";
default:
break;
}
return "<unknown>";
}
void Surf1D::

7
Cantera/src/thermo/Elements.cpp
View file

@ -321,14 +321,13 @@ namespace Cantera {
* index. If m < 0 or m >= nElements() an exception is thrown.
*/
string Elements::elementName(int m) const {
if (m >= 0 && m < nElements())
return m_elementNames[m];
else
if (m < 0 || m >= nElements()) {
throw ElementRangeError("Elements::elementName", m, nElements());
}
return m_elementNames[m];
}
doublereal Elements::entropyElement298(int m) const {
AssertThrowMsg(m_entropy298[m] != ENTROPY298_UNKNOWN,
"Elements::entropy298",

22
Cantera/src/thermo/GibbsExcessVPSSTP.h
View file

@ -326,6 +326,28 @@ namespace Cantera {
virtual void getdlnActCoeffdlnN(const int ld, doublereal * const dlnActCoeffdlnN) const {
err(" getdlnActCoeffdlnN: nonzero and nonimplemented");
}
//! Get the array of log concentration-like derivatives of the
//! log activity coefficients
/*!
* This function is a virtual method. For ideal mixtures
* (unity activity coefficients), this can return zero.
* Implementations should take the derivative of the
* logarithm of the activity coefficient with respect to the
* logarithm of the concentration-like variable (i.e. number of moles in
* in a unit volume. ) that represents the standard state.
* This quantity is to be used in conjunction with derivatives of
* that concentration-like variable when the derivative of the chemical
* potential is taken.
*
* units = dimensionless
*
* @param dlnActCoeffdlnX Output vector of derivatives of the
* log Activity Coefficients. length = m_kk
*/
virtual void getdlnActCoeffdlnX(doublereal *dlnActCoeffdlnX) const {
err("getdlnActCoeffdlnX");
}
//@}

2
Cantera/src/thermo/HMWSoln.cpp
View file

@ -792,7 +792,7 @@ namespace Cantera {
doublereal HMWSoln::isothermalCompressibility() const {
throw CanteraError("HMWSoln::isothermalCompressibility",
"unimplemented");
//return 0.0;
return 0.0;
}
/*

6
Cantera/src/thermo/IdealSolidSolnPhase.cpp
View file

@ -494,13 +494,10 @@ namespace Cantera {
switch (m_formGC) {
case 0:
return 1.0;
break;
case 1:
return 1.0 / m_speciesMolarVolume[k];
break;
case 2:
return 1.0/m_speciesMolarVolume[m_kk-1];
break;
}
return 0.0;
}
@ -509,13 +506,10 @@ namespace Cantera {
switch (m_formGC) {
case 0:
return 1.0;
break;
case 1:
return 1.0 / m_speciesMolarVolume[k];
break;
case 2:
return 1.0 / m_speciesMolarVolume[m_kk-1];
break;
}
return 0.0;
}

1
Cantera/src/thermo/MargulesVPSSTP.cpp
View file

@ -746,6 +746,7 @@ namespace Cantera {
}
//===================================================================================================================
// Update the activity coefficients
/*
* This function will be called to update the internally storred

7
Cantera/src/thermo/MargulesVPSSTP.h
View file

@ -85,15 +85,16 @@ namespace Cantera {
* that has more than 2 species.
*
* \f[
* G^E = \sum_i \left( H_{Ei} - T S_{Ei} \right)
* G^E = \sum_i \left( H_{Ei} - T S_{Ei} \right)
* \f]
* \f[
* H^E_i = X_{Ai} X_{Bi} \left( h_{o,i} + h_{1,i} X_{Bi} \right)
* H^E_i = n X_{Ai} X_{Bi} \left( h_{o,i} + h_{1,i} X_{Bi} \right)
* \f]
* \f[
* S^E_i = X_{Ai} X_{Bi} \left( s_{o,i} + s_{1,i} X_{Bi} \right)
* S^E_i = n X_{Ai} X_{Bi} \left( s_{o,i} + s_{1,i} X_{Bi} \right)
* \f]
*
* where n is the total moles in the solution.
*
* The activity of a species defined in the phase is given by an excess
* Gibbs free energy formulation.

4
Cantera/src/thermo/PureFluidPhase.cpp
View file

@ -743,9 +743,7 @@ namespace Cantera {
catch (CanteraError) {
;
}
}
}
}
#endif // WITH_PURE_FLUIDS

13
Cantera/src/thermo/State.cpp
View file

@ -96,6 +96,7 @@ namespace Cantera {
throw CanteraError("State:moleFraction",
"illegal species index number");
}
return 0.0;
}
void State::setMoleFractions(const doublereal* const x) {
@ -126,20 +127,16 @@ namespace Cantera {
if (k >= 0 && k < m_kk) {
return m_y[k];
}
else {
throw CanteraError("State:massFraction",
"illegal species index number");
}
throw CanteraError("State:massFraction", "illegal species index number");
return 0.0;
}
doublereal State::concentration(const int k) const {
if (k >= 0 && k < m_kk) {
return m_y[k] * m_dens * m_rmolwts[k] ;
}
else {
throw CanteraError("State:massFraction",
"illegal species index number");
}
throw CanteraError("State:massFraction", "illegal species index number");
return 0.0;
}
void State::setMassFractions(const doublereal* const y) {

5
Cantera/src/thermo/VPSSMgrFactory.cpp
View file

@ -361,22 +361,17 @@ namespace Cantera {
switch (type) {
case cVPSSMGR_IDEALGAS:
return new VPSSMgr_IdealGas(vp_ptr, &spthermoRef);
break;
case cVPSSMGR_CONSTVOL:
return new VPSSMgr_ConstVol(vp_ptr, &spthermoRef);
break;
case cVPSSMGR_PUREFLUID:
throw CanteraError("VPSSMgrFactory::newVPSSMgr",
"unimplemented");
case cVPSSMGR_WATER_CONSTVOL:
return new VPSSMgr_Water_ConstVol(vp_ptr, &spthermoRef);
break;
case cVPSSMGR_WATER_HKFT:
return new VPSSMgr_Water_HKFT(vp_ptr, &spthermoRef);
break;
case cVPSSMGR_GENERAL:
return new VPSSMgr_General(vp_ptr, &spthermoRef);
break;
case cVPSSMGR_UNDEF:
default:
throw UnknownVPSSMgrModel("VPSSMgrFactory::newVPSSMgr", int2str(type));

2
Cantera/src/thermo/WaterPropsIAPWS.cpp
View file

@ -875,4 +875,4 @@ doublereal WaterPropsIAPWS::molarVolume() const {
return (M_water / rho);
}
};
}

1
Cantera/src/zeroD/ReactorFactory.cpp
View file

@ -67,6 +67,7 @@ namespace CanteraZeroD {
throw CanteraError("ReactorFactory::newReactor",
"unknown reactor type!");
}
return 0;
}
}

6
config.h.in
View file

@ -4,6 +4,11 @@
#ifndef CT_CONFIG_H
#define CT_CONFIG_H
//---------------------------- Version Flags ------------------//
// Cantera version -> this will be a double-quoted string value
// refering to branch number within svn
#undef CANTERA_VERSION
//---------------------------- Version Flags ------------------//
//
// Cantera version -> this will be a double-quoted string value
@ -19,6 +24,7 @@
// Flag indictaing that its part of 1.8_LiquidTransportDevelop branch
#define CANTERA_VERSION_18_LTD 1
//
//------------------------ Development flags ------------------//
//
// Compile in additional debug printing where available.

2
test_problems/ChemEquil_gri_matrix/Makefile.in
View file

@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/ChemEquil_gri_pairs/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/ChemEquil_ionizedGas/Makefile.in
View file

@ -43,7 +43,7 @@ CXX = @CXX@
# LOCAL_DEFS=-DDEBUG_CHEMEQUIL
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

32
test_problems/ChemEquil_ionizedGas/output_blessed.txt
View file

@ -322,7 +322,7 @@ Initial T = 414.143, pres = 1.17767e-06 atm
NO 5.58575e-12 5.80828e-12 -38.5785
NO+ 4.52092e-104 4.70095e-104 12.1169
Electron 4.52092e-104 8.53846e-109 -254.253
N+ 8.08849e-210 3.92595e-210 32.1429
N+ 8.0885e-210 3.92595e-210 32.1429
O+ 3.41902e-171 1.8956e-171 30.6695
N2+ 6.99476e-169 6.79029e-169 13.5903
O2+ 3.64494e-127 4.04179e-127 10.6435
@ -355,7 +355,7 @@ Initial T = 414.143, pres = 1.17767e-05 atm
NO 5.58575e-12 5.80828e-12 -36.2759
NO+ 2.7933e-104 2.90453e-104 13.938
Electron 2.7933e-104 5.27558e-109 -252.432
N+ 1.58037e-210 7.67069e-211 32.8127
N+ 1.58037e-210 7.6707e-211 32.8127
O+ 6.68024e-172 3.70371e-172 31.3393
N2+ 4.32179e-169 4.19545e-169 15.4114
O2+ 2.25207e-127 2.49726e-127 12.4646
@ -424,7 +424,7 @@ Initial T = 414.143, pres = 0.00117767 atm
N+ 6.03308e-212 2.9283e-212 34.1523
O+ 2.55019e-173 1.4139e-173 32.6789
N2+ 1.64985e-169 1.60162e-169 19.0536
O2+ 8.5973e-128 9.53333e-128 16.1068
O2+ 8.5973e-128 9.53334e-128 16.1068
Final T = 414.143, pres = 0.00117767 atm
Initial T = 414.143, pres = 0.0117767 atm
@ -457,7 +457,7 @@ Initial T = 414.143, pres = 0.0117767 atm
N+ 1.17877e-212 5.72145e-213 34.8221
O+ 4.98269e-174 2.76254e-174 33.3487
N2+ 1.01938e-169 9.89578e-170 20.8747
O2+ 5.31193e-128 5.89027e-128 17.9279
O2+ 5.31194e-128 5.89027e-128 17.9279
Final T = 414.143, pres = 0.0117767 atm
Initial T = 1153.16, pres = 3.27918e-08 atm
@ -485,10 +485,10 @@ Initial T = 1153.16, pres = 3.27918e-08 atm
N 2.86312e-15 1.38975e-15 -21.3563
O 2.23425e-05 1.23879e-05 -22.8775
NO 0.000134494 0.000139854 -44.2338
NO+ 9.19995e-24 9.56641e-24 7.08807
Electron 9.19995e-24 1.73757e-28 -74.3227
N+ 1.62751e-56 7.89959e-57 29.9656
O+ 3.109e-43 1.72373e-43 28.4444
NO+ 9.19996e-24 9.56642e-24 7.08807
Electron 9.19996e-24 1.73757e-28 -74.3227
N+ 1.62751e-56 7.8996e-57 29.9656
O+ 3.109e-43 1.72374e-43 28.4444
N2+ 1.23423e-46 1.19817e-46 8.60924
O2+ 3.28303e-32 3.64051e-32 5.5669
@ -523,7 +523,7 @@ Initial T = 1152.46, pres = 3.27723e-07 atm
N+ 1.39651e-56 6.7783e-57 32.0898
O+ 2.65657e-43 1.47288e-43 30.5686
N2+ 3.33238e-46 3.23497e-46 11.8846
O2+ 8.8243e-32 9.78508e-32 8.8423
O2+ 8.8243e-32 9.78509e-32 8.8423
Final T = 1152.61, pres = 3.27763e-07 atm
Initial T = 1152.61, pres = 3.27763e-06 atm
@ -551,11 +551,11 @@ Initial T = 1152.61, pres = 3.27763e-06 atm
N 2.88709e-16 1.40138e-16 -19.0539
O 2.24413e-06 1.24425e-06 -20.575
NO 0.000134716 0.000140083 -39.6289
NO+ 6.55508e-23 6.81612e-23 13.6391
Electron 6.55508e-23 1.23803e-27 -67.7541
NO+ 6.55509e-23 6.81613e-23 13.6391
Electron 6.55509e-23 1.23803e-27 -67.7541
N+ 1.17797e-56 5.71759e-57 34.2141
O+ 2.23788e-43 1.24075e-43 32.693
N2+ 8.87483e-46 8.6154e-46 15.1603
N2+ 8.87483e-46 8.61541e-46 15.1603
O2+ 2.34675e-31 2.60226e-31 12.1179
Final T = 1152.66, pres = 3.27775e-06 atm
@ -617,11 +617,11 @@ Initial T = 1152.67, pres = 0.000327779 atm
N 2.88951e-17 1.40255e-17 -16.7513
O 2.24513e-07 1.24481e-07 -18.2725
NO 0.000134738 0.000140106 -35.0238
NO+ 4.59472e-22 4.77768e-22 20.1897
NO+ 4.59472e-22 4.77769e-22 20.1897
Electron 4.59472e-22 8.67784e-27 -61.2017
N+ 8.26992e-57 4.014e-57 38.4622
O+ 1.57022e-43 8.70576e-44 36.941
N2+ 6.22643e-45 6.04441e-45 21.7109
N+ 8.26992e-57 4.01401e-57 38.4622
O+ 1.57022e-43 8.70577e-44 36.941
N2+ 6.22643e-45 6.04442e-45 21.7109
O2+ 1.64546e-30 1.82461e-30 18.6686
Final T = 1152.68, pres = 0.00032778 atm

2
test_problems/ChemEquil_red1/Makefile.in
View file

@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/CpJump/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/VCSnonideal/NaCl_equil/Makefile.in
View file

@ -45,7 +45,7 @@ CANTERA_INCDIR=@ctroot@/build/include/cantera
INCLUDE_DIRS = -I$(CANTERA_INCDIR)
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS)
CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/DH_graph_1/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/DH_graph_NM/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/DH_graph_acommon/Makefile.in
View file

@ -38,7 +38,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_dupl_test/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_CpvT/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_GvI/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_GvT/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_HvT/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_VvT/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/VPissp/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/issp/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/stoichSubSSTP/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/testWaterTP/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

3
test_problems/cathermo/wtWater/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@
@ -101,7 +101,6 @@ endif
clean:
$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends
../../../bin/rm_cvsignore
(if test -d SunWS_cache ; then \
$(RM) -rf SunWS_cache ; \
fi )

1
test_problems/cxx_ex/Makefile.in
View file

@ -11,7 +11,6 @@ test:
clean:
(cd ../../examples/cxx ; @MAKE@ clean )
../../bin/rm_cvsignore
depends:

2
test_problems/fracCoeff/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/negATest/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/python/flame1/runtest
View file

@ -76,7 +76,7 @@ then
fi
else
echo " Unsuccessful test comparison on "`pwd` " test"
if test $retnStat_csv != "1"
if test $retnStat_csv != "0"
then
echo " csv files are different - see diff_csv.txt"
fi

2
test_problems/python/runtest
View file

@ -68,7 +68,7 @@ then
echo "diamond.py returned with bad status, $retnStat, check output"
fi
$CANTERA_BIN/csvdiff diamond.csv diamond_blessed.csv > diamond_test.out
$CANTERA_BIN/csvdiff diamond.csv diamond_blessed.csv > diamond_test_csv.out
retnStat=$?
if [ $retnStat = "0" ]
then

2
test_problems/rankine_democxx/Makefile.in
View file

@ -51,7 +51,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/surfSolverTest/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

15
winconfig.h
View file

@ -8,7 +8,6 @@
// Cantera version -> this will be a double-quoted string value
// refering to branch number within svn
#define CANTERA_VERSION "1.8_liquidTransportDevelop"
// Integer for major number of Cantera
#define CANTERA_VERSION_MAJORNUMBER 18
// Flag indicating it's part of major version 18
@ -18,6 +17,19 @@
// Flag indictaing that its part of 1.8_LiquidTransportDevelop branch
#define CANTERA_VERSION_18_LTD 1
//---------------------------- Version Flags ------------------//
// Cantera version -> this will be a double-quoted string value
// refering to branch number within svn
#define CANTERA_VERSION "1.8.x"
// Integer for major number of Cantera
#define CANTERA_VERSION_MAJORNUMBER 18
// Flag indicating it's part of major version 18
#define CANTERA_VERSION_18 1
// Flag indicating it's a development version
#define CANTERA_VERSION_18_XXX 1
//------------------------ Development flags ------------------//
//
// Compile in additional debug printing where available.
@ -76,6 +88,7 @@ typedef int ftnlen; // Fortran hidden string length type
/* #undef DARWIN */
#define HAS_SSTREAM 1
// Identify whether the operating system is cygwin's overlay of
// windows, with gcc being used as the compiler.
/* #undef CYGWIN */