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

Fixed some spelling errors

Browse source
This commit is contained in:
Ray Speth 2012-06-22 22:36:15 +00:00
parent 1f4616ea29
commit a16d56a637
19 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/base/ct_defs.h
View file

@ -159,7 +159,7 @@ const doublereal Undef = -999.1234;
//! Small number to compare differences of mole fractions against.
/*!
* This number is used for the interconversion of mole fraction and mass fraction quantities
* when the molecuar weight of a species is zero. It's also used for the matrix inversion
* when the molecular weight of a species is zero. It's also used for the matrix inversion
* of transport properties when mole fractions must be positive.
*/
const doublereal Tiny = 1.e-20;

20
include/cantera/equil/vcs_solve.h
View file

@ -140,7 +140,7 @@ public:
* 1 = Range space error encountered. The element abundance criteria are
* only partially satisfied. Specifically, the first NC= (number of
* components) conditions are satisfied. However, the full NE
* (number of elements) conditions are not satisfied. The equilibrirum
* (number of elements) conditions are not satisfied. The equilibrium
* condition is returned.
* -1 = Maximum number of iterations is exceeded. Convergence was not
* found.
@ -177,8 +177,8 @@ public:
* @param aw Vector of mole fractions which will be used to construct an
* optimal basis from.
*
* @param sa Gramm-Schmidt orthog work space (nc in length) sa[j]
* @param ss Gramm-Schmidt orthog work space (nc in length) ss[j]
* @param sa Gram-Schmidt orthog work space (nc in length) sa[j]
* @param ss Gram-Schmidt orthog work space (nc in length) ss[j]
* @param sm QR matrix work space (nc*ne in length) sm[i+j*ne]
* @param test This is a small negative number dependent upon whether
* an estimate is supplied or not.
@ -727,7 +727,7 @@ public:
* 1 = Range space error encountered. The element abundance criteria are
* only partially satisfied. Specifically, the first NC= (number of
* components) conditions are satisfied. However, the full NE
* (number of elements) conditions are not satisfied. The equilibrirum
* (number of elements) conditions are not satisfied. The equilibrium
* condition is returned.
* -1 = Maximum number of iterations is exceeded. Convergence was not
* found.
@ -755,7 +755,7 @@ public:
* ---------------
* @param tkelvin Temperature in kelvin()
* @param pres Pressure in Pascal
* @param w w[] is thevector containing the current mole numbers
* @param w w[] is the vector containing the current mole numbers
* in units of kmol.
*
* Output
@ -870,9 +870,9 @@ public:
*
* Other Variables
* @param aw aw[i[ Mole fraction work space (ne in length)
* @param sa sa[j] = Gramm-Schmidt orthog work space (ne in length)
* @param sa sa[j] = Gram-Schmidt orthog work space (ne in length)
* @param sm sm[i+j*ne] = QR matrix work space (ne*ne in length)
* @param ss ss[j] = Gramm-Schmidt orthog work space (ne in length)
* @param ss ss[j] = Gram-Schmidt orthog work space (ne in length)
*
*/
int vcs_elem_rearrange(double* const aw, double* const sa,
@ -1367,9 +1367,9 @@ private:
* Linear programming module is based on using dbolm.
*
* @param aw aw[i[ Mole fraction work space (ne in length)
* @param sa sa[j] = Gramm-Schmidt orthog work space (ne in length)
* @param sa sa[j] = Gram-Schmidt orthog work space (ne in length)
* @param sm sm[i+j*ne] = QR matrix work space (ne*ne in length)
* @param ss ss[j] = Gramm-Schmidt orthog work space (ne in length)
* @param ss ss[j] = Gram-Schmidt orthog work space (ne in length)
* @param test This is a small negative number.
*/
void vcs_inest(double* const aw, double* const sa, double* const sm,
@ -1399,7 +1399,7 @@ private:
* @param ac output Activity coefficients (length = totalNumSpecies)
* Note this is only partially formed. Only species in
* phases that participate in the reaction will be updated
* @param mu_i diemsionless chemical potentials (length - totalNumSpecies
* @param mu_i dimensionless chemical potentials (length - totalNumSpecies
* Note this is only partially formed. Only species in
* phases that participate in the reaction will be updated
*

2
include/cantera/numerics/Integrator.h
View file

@ -86,7 +86,7 @@ public:
warn("setTolerances");
}
//! Set the sensitvity error tolerances
//! Set the sensitivity error tolerances
/*!
* @param reltol scalar relative tolerance
* @param abstol scalar absolute tolerance

2
include/cantera/thermo/AdsorbateThermo.h
View file

@ -184,7 +184,7 @@ public:
protected:
//! lowest valid temperature
doublereal m_lowT;
//! Highest valid temperatre
//! Highest valid temperature
doublereal m_highT;
//! Reference state pressure
doublereal m_Pref;

6
include/cantera/thermo/GibbsExcessVPSSTP.h
View file

@ -33,14 +33,14 @@ namespace Cantera
* variable pressure standard state methods for calculating
* thermodynamic properties that are further based on
* expressing the Excess Gibbs free energy as a function of
* the mole fractions (or pseudo mole fractions) of consitituents.
* the mole fractions (or pseudo mole fractions) of constituents.
* This category is the workhorse for describing molten salts,
* solid-phase mixtures of semiconductors, and mixtures of miscible
* and semi-miscible compounds.
*
* It includes
* . regular solutions
* . Margueles expansions
* . Margules expansions
* . NTRL equation
* . Wilson's equation
* . UNIQUAC equation of state.
@ -621,7 +621,7 @@ protected:
//! Storage for the current derivative values of the
//! gradients with respect to logarithm of the mole fraction of the
//! log of theactivity coefficients of the species @deprecated
//! log of the activity coefficients of the species @deprecated
mutable std::vector<doublereal> dlnActCoeffdlnX_diag_;
//! Storage for the current derivative values of the gradients with respect to logarithm of the species mole number of the

2
include/cantera/thermo/HMWSoln.h
View file

@ -912,7 +912,7 @@ class PDSS_Water;
* - \f$ e \f$ is the electronic charge
* - \f$ \epsilon = K \epsilon_o \f$ is the permittivity of water
* where \f$ K \f$ is the dielectric constant of water,
* and \f$ \epsilon_o \f$ is thepermittivityy of free space.
* and \f$ \epsilon_o \f$ is the permittivity of free space.
* - \f$ \rho_o \f$ is the density of the solvent in its standard state.
*
* Nominal value at 298 K and 1 atm = 1.172576 (kg/gmol)<SUP>1/2</SUP>

2
include/cantera/thermo/MolarityIonicVPSSTP.h
View file

@ -35,7 +35,7 @@ namespace Cantera
* variable pressure standard state methods for calculating
* thermodynamic properties that are further based on
* expressing the Excess Gibbs free energy as a function of
* the mole fractions (or pseudo mole fractions) of the consitituents.
* the mole fractions (or pseudo mole fractions) of the constituents.
* This category is the workhorse for describing ionic systems which are not on the molality scale.
*
* This class adds additional functions onto the %ThermoPhase interface

4
include/cantera/thermo/PseudoBinaryVPSSTP.h
View file

@ -34,14 +34,14 @@ namespace Cantera
* variable pressure standard state methods for calculating
* thermodynamic properties that are further based on
* expressing the Excess Gibbs free energy as a function of
* the mole fractions (or pseudo mole fractions) of consitituents.
* the mole fractions (or pseudo mole fractions) of constituents.
* This category is the workhorse for describing molten salts,
* solid-phase mixtures of semiconductors, and mixtures of miscible
* and semi-miscible compounds.
*
* It includes
* . regular solutions
* . Margueles expansions
* . Margules expansions
* . NTRL equation
* . Wilson's equation
* . UNIQUAC equation of state.

4
include/cantera/thermo/WaterProps.h
View file

@ -80,7 +80,7 @@ class PDSS_Water;
*
* The following classes are used to compute the electrical and electrothermochemical properties of
* phases of matter. The main property currently is the dielectric
* constant, which is an important parameter for electolyte solutions.
* constant, which is an important parameter for electrolyte solutions.
* The class WaterProps calculate the dielectric constant of water as a function of
* temperature and pressure.
*
@ -205,7 +205,7 @@ public:
//! ADebye calculates the value of A_Debye as a function
//! of temperature and pressure according to relations
//! that take into account the temperature and pressure
//! dependence of the water density and dieletric constant.
//! dependence of the water density and dielectric constant.
/*!
* The A_Debye expression appears on the top of the
* ln actCoeff term in the general Debye-Huckel expression

8
src/apps/tok_input_util.cpp
View file

@ -273,7 +273,7 @@ int tok_to_int(const TOKEN* tokPtr, const int maxVal, const int minVal,
* default or "" defaultVal
*
* A default may be specified on the command line. The absence of a
* default may also be specified by setting devault_value to
* default may also be specified by setting default_value to
* NO_DEFAULT_INT.
*
* If there is an error, *error is set to true. *error isn't touched
@ -310,7 +310,7 @@ int str_to_int(const char* int_string, const int maxVal, const int minVal,
* default default_value
*
* A default may be specified on the command line. The absence of a
* default may also be specified by setting devault_value to
* default may also be specified by setting default_value to
* NO_DEFAULT_INT.
*
* If there is an error, *error is set to true. *error isn't touched
@ -569,7 +569,7 @@ char* tok_to_string(const TOKEN* tokPtr, const int maxTok,
* default or "" defaultVal
*
* A default may be specified on the command line. The absence of a
* default may also be specified by setting devault_value to
* default may also be specified by setting default_value to
* NO_DEFAULT_INT.
*
* If there is an error, *error is set to true. *error isn't touched
@ -608,7 +608,7 @@ char* str_to_string(const char* str, const char* defaultVal,
* default defaultVal
*
* A default may be specified on the command line. The absence of a
* default may also be specified by setting devault_value to
* default may also be specified by setting default_value to
* NO_DEFAULT_INT.
*
* If there is an error, *error is set to true. *error isn't touched

4
src/converters/NASA9Parser.cpp
View file

@ -144,7 +144,7 @@ static int de_atoi(std::ostream& log, std::string s, int line = -1)
* @param names List of species names (input).
* @param species Table of species objects holding data from records
* in THERMO section (output).
* @param temp Devault vector of temperature region boundaries
* @param temp Default vector of temperature region boundaries
* There are one more temperatures than there are
* temperature regions.
*
@ -213,7 +213,7 @@ bool CKParser::readNASA9ThermoSection(std::vector<string>& names,
// next time.
dup[spec.name] = 2;
// Check to see whether we need this particlar species name
// Check to see whether we need this particular species name
if (!already_read && (getAllSpecies
|| (find(names.begin(), names.end(), spec.name)
< names.end()))) {

4
src/equil/vcs_TP.cpp
View file

@ -36,7 +36,7 @@ int VCS_SOLVE::vcs_TP(int ipr, int ip1, int maxit, double T_arg, double pres_arg
* 1 = Range space error encountered. The element abundance criteria are
* only partially satisfied. Specifically, the first NC= (number of
* components) conditions are satisfied. However, the full NE
* (number of elements) conditions are not satisfied. The equilibrirum
* (number of elements) conditions are not satisfied. The equilibrium
* condition is returned.
* -1 = Maximum number of iterations is exceeded. Convergence was not
* found.
@ -125,7 +125,7 @@ int VCS_SOLVE::vcs_evalSS_TP(int ipr, int ip1, double Temp, double pres)
* cpc_ts_GStar_calc() returns units of Kelvin. Also, the temperature
* comes into play in calculating the ideal equation of state
* contributions, and other equations of state also. Therefore,
* we will emulate the VCS_UNITS_KELVIN case, here by chaning
* we will emulate the VCS_UNITS_KELVIN case, here by changing
* the initial gibbs free energy units to Kelvin before feeding
* them to the cpc_ts_GStar_calc() routine. Then, we will revert
* them back to unitless at the end of this routine.

2
src/equil/vcs_rxnadj.cpp
View file

@ -769,7 +769,7 @@ void VCS_SOLVE::vcs_CalcLnActCoeffJac(const double* const moleSpeciesVCS)
* @param ac output Activity coefficients (length = totalNumSpecies)
* Note this is only partially formed. Only species in
* phases that participate in the reaction will be updated
* @param mu_i diemsionless chemical potentials (length - totalNumSpecies
* @param mu_i dimensionless chemical potentials (length - totalNumSpecies
* Note this is only partially formed. Only species in
* phases that participate in the reaction will be updated
*

2
src/equil/vcs_solve_TP.cpp
View file

@ -94,7 +94,7 @@ void VCS_SOLVE::checkDelta1(double* const dsLocal,
* 1 = Range space error encountered. The element abundance criteria are
* only partially satisfied. Specifically, the first NC= (number of
* components) conditions are satisfied. However, the full NE
* (number of elements) conditions are not satisfied. The equilibrirum
* (number of elements) conditions are not satisfied. The equilibrium
* condition is returned.
* -1 = Maximum number of iterations is exceeded. Convergence was not
* found.

2
src/equil/vcs_solve_phaseStability.cpp
View file

@ -190,7 +190,7 @@ int VCS_SOLVE::vcs_PS(VCS_PROB* vprob, int iphase, int printLvl, double& feStabl
* 1 = Range space error encountered. The element abundance criteria are
* only partially satisfied. Specifically, the first NC= (number of
* components) conditions are satisfied. However, the full NE
* (number of elements) conditions are not satisfied. The equilibrirum
* (number of elements) conditions are not satisfied. The equilibrium
* condition is returned.
* -1 = Maximum number of iterations is exceeded. Convergence was not
* found.

2
src/thermo/NasaPoly2.h
View file

@ -283,7 +283,7 @@ protected:
doublereal m_lowT;
//! Midrange temperature
doublereal m_midT;
//! Highest valid temperatre
//! Highest valid temperature
doublereal m_highT;
//! Reference state pressure
doublereal m_Pref;

2
src/thermo/SpeciesThermoFactory.cpp
View file

@ -737,7 +737,7 @@ void SpeciesThermoFactory::installThermoForSpecies
const XML_Node& thermo = speciesNode.child("thermo");
// Get the children of the thermo XML node. In the next bit of code we take out the comments that
// may have been childrent of the thermo XML node by doing a selective copy.
// may have been children of the thermo XML node by doing a selective copy.
// These shouldn't interfere with the algorithm at any point.
const std::vector<XML_Node*>& tpWC = thermo.children();
std::vector<XML_Node*> tp;

2
src/thermo/WaterProps.cpp
View file

@ -189,7 +189,7 @@ doublereal WaterProps::density_T(doublereal T, doublereal P, int ifunc)
* and its derivatives.
*
* ifunc = 0 value
* ifunc = 1 Temperature deriviative
* ifunc = 1 Temperature derivative
* ifunc = 2 second temperature derivative
* ifunc = 3 return pressure first derivative
*

4
src/thermo/WaterPropsIAPWS.cpp
View file

@ -166,7 +166,7 @@ doublereal WaterPropsIAPWS::density(doublereal temperature, doublereal pressure,
} else if (phase == WATER_LIQUID) {
/*
* Provide a guess about the liquid density that is
* relatively high -> convergnce from above seems robust.
* relatively high -> convergence from above seems robust.
*/
rhoguess = 1000.;
} else if (phase == WATER_UNSTABLELIQUID || phase == WATER_UNSTABLEGAS) {
@ -253,7 +253,7 @@ doublereal WaterPropsIAPWS::density_const(doublereal pressure,
} else if (phase == WATER_LIQUID) {
/*
* Provide a guess about the liquid density that is
* relatively high -> convergnce from above seems robust.
* relatively high -> convergence from above seems robust.
*/
rhoguess = 1000.;
} else if (phase == WATER_UNSTABLELIQUID || phase == WATER_UNSTABLEGAS) {