[Doc] Fix spelling errors

This commit is contained in:
Ray Speth 2016-06-27 14:30:49 -04:00
parent b88e2cb00d
commit fd4cbb8718
21 changed files with 41 additions and 41 deletions

View file

@ -681,10 +681,10 @@ in the report for Chemkin referenced above. These errors include:
| 1 | An integer with value 0, 1, or 2 indicating | | 1 | An integer with value 0, 1, or 2 indicating |
| | monatomic, linear, or non-linear molecular geometry. | | | monatomic, linear, or non-linear molecular geometry. |
+------------------+------------------------------------------------------+ +------------------+------------------------------------------------------+
| 2 | The Lennerd-Jones potential well depth | | 2 | The Lennard-Jones potential well depth |
| | :math:`\varepsilon/k_B` in Kelvin | | | :math:`\varepsilon/k_B` in Kelvin |
+------------------+------------------------------------------------------+ +------------------+------------------------------------------------------+
| 3 | The Lennerd-Jones collision diameter :math:`\sigma` | | 3 | The Lennard-Jones collision diameter :math:`\sigma` |
| | in Angstrom | | | in Angstrom |
+------------------+------------------------------------------------------+ +------------------+------------------------------------------------------+
| 4 | The dipole moment :math:`\mu` in Debye | | 4 | The dipole moment :math:`\mu` in Debye |

View file

@ -34,7 +34,7 @@ class ThermoPhase;
#define VCS_EOS_STOICH_SUB 5 #define VCS_EOS_STOICH_SUB 5
#define VCS_EOS_IDEAL_SOLN 22 #define VCS_EOS_IDEAL_SOLN 22
#define VCS_EOS_DEBEYE_HUCKEL 23 #define VCS_EOS_DEBEYE_HUCKEL 23
#define VCS_EOS_REDLICK_KWONG 24 #define VCS_EOS_REDLICH_KWONG 24
#define VCS_EOS_REGULAR_SOLN 25 #define VCS_EOS_REGULAR_SOLN 25
#define VCS_EOS_UNK_CANTERA -1 #define VCS_EOS_UNK_CANTERA -1

View file

@ -912,7 +912,7 @@ public:
//! Redimensionalize the problem data //! Redimensionalize the problem data
/*! /*!
* Reddimensionalize the free energies using the multiplier R * T * Redimensionalize the free energies using the multiplier R * T
* *
* Essentially the internal data can either be in dimensional form or in * Essentially the internal data can either be in dimensional form or in
* nondimensional form. This routine switches the data from nondimensional * nondimensional form. This routine switches the data from nondimensional
@ -1069,7 +1069,7 @@ public:
private: private:
//! Zero out the concentration of a species. //! Zero out the concentration of a species.
/*! /*!
* Make sure to conserveelements and keep track of the total moles in all * Make sure to conserve elements and keep track of the total moles in all
* phases. * phases.
* - w[] * - w[]
* - m_tPhaseMoles_old[] * - m_tPhaseMoles_old[]
@ -1429,7 +1429,7 @@ public:
* *
* m_stoichCoeffRxnMatrix(j,irxn) : j refers to the component number, and * m_stoichCoeffRxnMatrix(j,irxn) : j refers to the component number, and
* irxn refers to the irxn_th non-component species. The stoichiometric * irxn refers to the irxn_th non-component species. The stoichiometric
* coefficients multilplied by the Formula coefficients of the component * coefficients multiplied by the Formula coefficients of the component
* species add up to the negative value of the number of elements in the * species add up to the negative value of the number of elements in the
* species kspec. * species kspec.
* *
@ -1469,7 +1469,7 @@ public:
vector_fp m_feSpecies_old; vector_fp m_feSpecies_old;
//! Dimensionless new free energy for all the species in the mechanism //! Dimensionless new free energy for all the species in the mechanism
//! at the new tentatite T, P, and mole numbers. //! at the new tentative T, P, and mole numbers.
/*! /*!
* The first NC entries are for components. The following * The first NC entries are for components. The following
* NR entries are for the current non-component species in the mechanism. * NR entries are for the current non-component species in the mechanism.
@ -1746,7 +1746,7 @@ public:
*/ */
char m_unitsState; char m_unitsState;
//! Multiplier for the mole numbers within the nondimensionless formulation //! Multiplier for the mole numbers within the nondimensional formulation
/*! /*!
* All numbers within the main routine are on an absolute basis. This * All numbers within the main routine are on an absolute basis. This
* presents some problems wrt very large and very small mole numbers. We get * presents some problems wrt very large and very small mole numbers. We get
@ -1787,7 +1787,7 @@ public:
//! Molar-based Activity Coefficients for Species based on old mole numbers //! Molar-based Activity Coefficients for Species based on old mole numbers
/*! /*!
* These activity coefficients are based on the m_molNumSpecies_old * These activity coefficients are based on the m_molNumSpecies_old
* values Molar based activity coeffients. Length = number of species * values Molar based activity coefficients. Length = number of species
*/ */
vector_fp m_actCoeffSpecies_old; vector_fp m_actCoeffSpecies_old;
@ -1814,7 +1814,7 @@ public:
std::vector<std::vector<size_t> > phasePopProblemLists_; std::vector<std::vector<size_t> > phasePopProblemLists_;
//! Vector of pointers to thermostructures which identify the model //! Vector of pointers to thermo structures which identify the model
//! and parameters for evaluating the thermodynamic functions for that //! and parameters for evaluating the thermodynamic functions for that
//! particular species. //! particular species.
/*! /*!
@ -1847,10 +1847,10 @@ public:
//! Debug printing lvl //! Debug printing lvl
/*! /*!
* Levels correspond to the following guidlines * Levels correspond to the following guidelines
* * 0 No printing at all * * 0 No printing at all
* * 1 Serious warnings or fatal errors get one line * * 1 Serious warnings or fatal errors get one line
* * 2 one line per eacdh successful vcs package call * * 2 one line per each successful vcs package call
* * 3 one line per every successful solve_TP calculation * * 3 one line per every successful solve_TP calculation
* * 4 one line for every successful operation -> solve_TP gets a summary report * * 4 one line for every successful operation -> solve_TP gets a summary report
* * 5 each iteration in solve_TP gets a report with one line per species * * 5 each iteration in solve_TP gets a report with one line per species

View file

@ -77,7 +77,7 @@ public:
*/ */
virtual void setMaxNumSteps(int n); virtual void setMaxNumSteps(int n);
//! Sset the initial step size //! Set the initial step size
/*! /*!
* @param h0 initial step size value * @param h0 initial step size value
*/ */

View file

@ -96,7 +96,7 @@ namespace Cantera
* ResidEval * ec; * ResidEval * ec;
* // Instantiate the root finder with the residual to be solved, ec. * // Instantiate the root finder with the residual to be solved, ec.
* RootFind rf(&ec); * RootFind rf(&ec);
* // Set the relative and absolute tolerancess for f and x. * // Set the relative and absolute tolerances for f and x.
* rf.setTol(1.0E-5, 1.0E-10, 1.0E-5, 1.0E-11); * rf.setTol(1.0E-5, 1.0E-10, 1.0E-5, 1.0E-11);
* // Give a hint about the function's dependence on x. This is needed, for example, if the function has * // Give a hint about the function's dependence on x. This is needed, for example, if the function has
* // flat regions. * // flat regions.

View file

@ -438,7 +438,7 @@ public:
* returns an array of partial molar volumes of the species * returns an array of partial molar volumes of the species
* in the solution. Units: m^3 kmol-1. * in the solution. Units: m^3 kmol-1.
* *
* For this solution, thepartial molar volumes are equal to the * For this solution, the partial molar volumes are equal to the
* constant species molar volumes. * constant species molar volumes.
* *
* @param vbar Output vector of partial molar volumes. Length: m_kk. * @param vbar Output vector of partial molar volumes. Length: m_kk.

View file

@ -381,7 +381,7 @@ public:
* returns an array of partial molar volumes of the species in the solution. * returns an array of partial molar volumes of the species in the solution.
* Units: m^3 kmol-1. * Units: m^3 kmol-1.
* *
* For this solution, thepartial molar volumes are equal to the constant * For this solution, the partial molar volumes are equal to the constant
* species molar volumes. * species molar volumes.
* *
* @param vbar Output vector of partial molar volumes. Length: m_kk. * @param vbar Output vector of partial molar volumes. Length: m_kk.

View file

@ -16,7 +16,7 @@
namespace Cantera namespace Cantera
{ {
//! MixedSolventElectrolyte is a derived class of GibbsExcessVPSSTP that employs //! MixedSolventElectrolyte is a derived class of GibbsExcessVPSSTP that employs
//! the DH and local Marguless approximations for the excess Gibbs free energy //! the DH and local Margules approximations for the excess Gibbs free energy
/*! /*!
* MixedSolventElectrolyte derives from class GibbsExcessVPSSTP which is derived * MixedSolventElectrolyte derives from class GibbsExcessVPSSTP which is derived
* from VPStandardStateTP. * from VPStandardStateTP.

View file

@ -23,7 +23,7 @@ namespace Cantera
* location of where we are in (T,rho) space. * location of where we are in (T,rho) space.
* *
* WATER_UNSTABLELIQUID indicates that we are in the unstable region, inside the * WATER_UNSTABLELIQUID indicates that we are in the unstable region, inside the
* spinodal curve where dpdrho < 0.0 amonst other properties. The difference * spinodal curve where dpdrho < 0.0 amongst other properties. The difference
* between WATER_UNSTABLELIQUID and WATER_UNSTABLEGAS is that * between WATER_UNSTABLELIQUID and WATER_UNSTABLEGAS is that
* for WATER_UNSTABLELIQUID d2pdrho2 > 0 and dpdrho < 0.0 * for WATER_UNSTABLELIQUID d2pdrho2 > 0 and dpdrho < 0.0
* for WATER_UNSTABLEGAS d2pdrho2 < 0 and dpdrho < 0.0 * for WATER_UNSTABLEGAS d2pdrho2 < 0 and dpdrho < 0.0
@ -38,7 +38,7 @@ namespace Cantera
//! Class for calculating the equation of state of water. //! Class for calculating the equation of state of water.
/*! /*!
* The reference is W. Wagner, A. Prub, "The IAPWS Formulation 1995 for the * The reference is W. Wagner, A. Pruss, "The IAPWS Formulation 1995 for the
* Thermodynamic Properties of Ordinary Water Substance for General and * Thermodynamic Properties of Ordinary Water Substance for General and
* Scientific Use," J. Phys. Chem. Ref. Dat, 31, 387, 2002. * Scientific Use," J. Phys. Chem. Ref. Dat, 31, 387, 2002.
* *

View file

@ -21,7 +21,7 @@ namespace Cantera
//! Low level class for the real description of water. //! Low level class for the real description of water.
/*! /*!
* The reference is W. Wagner, A. Prub, "The IAPWS Formulation 1995 for the * The reference is W. Wagner, A. Pruss, "The IAPWS Formulation 1995 for the
* Thermodynamic Properties of Ordinary Water Substance for General and * Thermodynamic Properties of Ordinary Water Substance for General and
* Scientific Use," J. Phys. Chem. Ref. Dat, 31, 387, 2002. * Scientific Use," J. Phys. Chem. Ref. Dat, 31, 387, 2002.
* *
@ -35,7 +35,7 @@ public:
//! Calculate the Phi function, which is the base function //! Calculate the Phi function, which is the base function
/*! /*!
* The phi function is basically the helmholtz free energy Eqn. (6.4) All * The phi function is basically the Helmholtz free energy Eqn. (6.4) All
* internal polynomials are recalculated. * internal polynomials are recalculated.
* *
* @param tau Dimensionless temperature = T_c/T * @param tau Dimensionless temperature = T_c/T

View file

@ -23,7 +23,7 @@ class WaterProps;
//! Class for single-component water. This is designed to cover just the liquid //! Class for single-component water. This is designed to cover just the liquid
//! part of water. //! part of water.
/*! /*!
* The reference is W. Wagner, A. Prub, "The IAPWS Formulation 1995 for the * The reference is W. Wagner, A. Pruss, "The IAPWS Formulation 1995 for the
* Thermodynamic Properties of Ordinary Water Substance for General and * Thermodynamic Properties of Ordinary Water Substance for General and
* Scientific Use," J. Phys. Chem. Ref. Dat, 31, 387, 2002. * Scientific Use," J. Phys. Chem. Ref. Dat, 31, 387, 2002.
* *
@ -172,9 +172,9 @@ public:
//@} //@}
//! @name Thermodynamic Values for the Species Reference State //! @name Thermodynamic Values for the Species Reference State
/*! /*!
* All functions in this group need to be overrided, because the m_spthermo * All functions in this group need to be overridden, because the
* MultiSpeciesThermo function is not adequate for the real equation of * m_spthermo MultiSpeciesThermo function is not adequate for the real
* state. * equation of state.
*/ */
//@{ //@{

View file

@ -31,7 +31,7 @@ const int cEST_strongAcidAssociated = 3; // Species which always breaks
// in the speciation vector. // in the speciation vector.
const int cEST_polarNeutral = 4; // Polar neutral species const int cEST_polarNeutral = 4; // Polar neutral species
const int cEST_nonpolarNeutral = 5; // Nonpolar neutral species. These const int cEST_nonpolarNeutral = 5; // Nonpolar neutral species. These
// usually have activity coefficnt // usually have activity coefficient
// corrections applied to them to // corrections applied to them to
// account for salting-out effects // account for salting-out effects

View file

@ -31,18 +31,18 @@ public:
//! Object that specifies the viscosity interaction for the mixture //! Object that specifies the viscosity interaction for the mixture
LiquidTranInteraction* viscosity; LiquidTranInteraction* viscosity;
//! Object that specifes the ionic Conductivity of the mixture //! Object that specifies the ionic Conductivity of the mixture
LiquidTranInteraction* ionConductivity; LiquidTranInteraction* ionConductivity;
//! Vector of pointer to the LiquidTranInteraction object which handles the //! Vector of pointer to the LiquidTranInteraction object which handles the
//! calculation of the mobility ratios for the phase //! calculation of the mobility ratios for the phase
/*! /*!
* The mobility ratio is defined via the following quantity where i and j * The mobility ratio is defined via the following quantity where i and j
* are species indecises. * are species indices.
* *
* mobRat(i,j) = mu_i / mu_j * mobRat(i,j) = mu_i / mu_j
* *
* It is returned in fortran-ordering format. ie. it is returned as * It is returned in fortran-ordering format. i.e. it is returned as
* mobRat[k], where * mobRat[k], where
* *
* k = j * nsp + i * k = j * nsp + i

View file

@ -276,7 +276,7 @@ public:
* *
* mobRat(i,j) = mu_i / mu_j * mobRat(i,j) = mu_i / mu_j
* *
* It is returned in fortran-ordering format. ie. it is returned as * It is returned in fortran-ordering format. i.e. it is returned as
* mobRat[k], where * mobRat[k], where
* *
* k = j * nsp + i * k = j * nsp + i

View file

@ -839,7 +839,7 @@ std::string string16_EOSType(int EOSType)
case VCS_EOS_DEBEYE_HUCKEL: case VCS_EOS_DEBEYE_HUCKEL:
sprintf(st,"Debeye Huckel "); sprintf(st,"Debeye Huckel ");
break; break;
case VCS_EOS_REDLICK_KWONG: case VCS_EOS_REDLICH_KWONG:
sprintf(st,"Redlick_Kwong "); sprintf(st,"Redlick_Kwong ");
break; break;
case VCS_EOS_REGULAR_SOLN: case VCS_EOS_REGULAR_SOLN:
@ -1142,8 +1142,8 @@ std::string vcs_VolPhase::eos_name() const
return "Ideal Soln"; return "Ideal Soln";
case VCS_EOS_DEBEYE_HUCKEL: case VCS_EOS_DEBEYE_HUCKEL:
return "Debeye Huckel"; return "Debeye Huckel";
case VCS_EOS_REDLICK_KWONG: case VCS_EOS_REDLICH_KWONG:
return "Redlick_Kwong"; return "Redlich_Kwong";
case VCS_EOS_REGULAR_SOLN: case VCS_EOS_REGULAR_SOLN:
return "Regular Soln"; return "Regular Soln";
default: default:

View file

@ -323,8 +323,8 @@ int VCS_SOLVE::vcs_rxn_adj_cg()
if (m_molNumSpecies_old[kspec] == 0.0 && (!m_SSPhase[kspec])) { if (m_molNumSpecies_old[kspec] == 0.0 && (!m_SSPhase[kspec])) {
// MULTISPECIES PHASE WITH total moles equal to zero // MULTISPECIES PHASE WITH total moles equal to zero
// //
// HKM -> the statment below presupposes units in m_deltaGRxn_new[]. // HKM -> the statement below presupposes units in m_deltaGRxn_new[].
// It probably should be replaced with something more relativistic // It probably should be replaced with something more relative
if (m_deltaGRxn_new[irxn] < -1.0e-4) { if (m_deltaGRxn_new[irxn] < -1.0e-4) {
sprintf(ANOTE, "MultSpec: come alive DG = %11.3E", m_deltaGRxn_new[irxn]); sprintf(ANOTE, "MultSpec: come alive DG = %11.3E", m_deltaGRxn_new[irxn]);
m_deltaMolNumSpecies[kspec] = 1.0e-10; m_deltaMolNumSpecies[kspec] = 1.0e-10;

View file

@ -287,7 +287,7 @@ void GasKinetics::addFalloffReaction(FalloffReaction& r)
if (k != npos) { if (k != npos) {
efficiencies[k] = eff.second; efficiencies[k] = eff.second;
} else if (!m_skipUndeclaredThirdBodies) { } else if (!m_skipUndeclaredThirdBodies) {
throw CanteraError("GasKinetics::addTFalloffReaction", "Found " throw CanteraError("GasKinetics::addFalloffReaction", "Found "
"third-body efficiency for undefined species '" + eff.first + "third-body efficiency for undefined species '" + eff.first +
"' while adding reaction '" + r.equation() + "'"); "' while adding reaction '" + r.equation() + "'");
} }

View file

@ -124,7 +124,7 @@ int solveSP::solveSurfProb(int ifunc, doublereal time_scale, doublereal TKelvin,
int label_d = -1; // Species IDs for damping control int label_d = -1; // Species IDs for damping control
int label_t_old=-1; int label_t_old=-1;
doublereal label_factor = 1.0; doublereal label_factor = 1.0;
int iter=0; // iteration number on numlinear solver int iter=0; // iteration number on nonlinear solver
int iter_max=1000; // maximum number of nonlinear iterations int iter_max=1000; // maximum number of nonlinear iterations
doublereal deltaT = 1.0E-10; // Delta time step doublereal deltaT = 1.0E-10; // Delta time step
doublereal damp=1.0; doublereal damp=1.0;

View file

@ -100,7 +100,7 @@ void IdealGasConstPressureReactor::evalEqs(doublereal time, doublereal* y,
mcpdTdt -= m_Q; mcpdTdt -= m_Q;
for (size_t n = 0; n < m_nsp; n++) { for (size_t n = 0; n < m_nsp; n++) {
// heat release from gas phase and surface reations // heat release from gas phase and surface reactions
mcpdTdt -= m_wdot[n] * m_hk[n] * m_vol; mcpdTdt -= m_wdot[n] * m_hk[n] * m_vol;
mcpdTdt -= m_sdot[n] * m_hk[n]; mcpdTdt -= m_sdot[n] * m_hk[n];
// production in gas phase and from surfaces // production in gas phase and from surfaces

View file

@ -102,7 +102,7 @@ void IdealGasReactor::evalEqs(doublereal time, doublereal* y,
mcvdTdt += - m_pressure * m_vdot - m_Q; mcvdTdt += - m_pressure * m_vdot - m_Q;
for (size_t n = 0; n < m_nsp; n++) { for (size_t n = 0; n < m_nsp; n++) {
// heat release from gas phase and surface reations // heat release from gas phase and surface reactions
mcvdTdt -= m_wdot[n] * m_uk[n] * m_vol; mcvdTdt -= m_wdot[n] * m_uk[n] * m_vol;
mcvdTdt -= m_sdot[n] * m_uk[n]; mcvdTdt -= m_sdot[n] * m_uk[n];
// production in gas phase and from surfaces // production in gas phase and from surfaces
@ -128,7 +128,7 @@ void IdealGasReactor::evalEqs(doublereal time, doublereal* y,
// flow of species into system and dilution by other species // flow of species into system and dilution by other species
dYdt[n] += (mdot_spec - mdot_in * Y[n]) / m_mass; dYdt[n] += (mdot_spec - mdot_in * Y[n]) / m_mass;
// In combintion with h_in*mdot_in, flow work plus thermal // In combination with h_in*mdot_in, flow work plus thermal
// energy carried with the species // energy carried with the species
mcvdTdt -= m_uk[n] / mw[n] * mdot_spec; mcvdTdt -= m_uk[n] / mw[n] * mdot_spec;
} }

View file

@ -210,7 +210,7 @@ void Reactor::evalEqs(doublereal time, doublereal* y,
applySensitivity(params); applySensitivity(params);
evalWalls(time); evalWalls(time);
double mdot_surf = evalSurfaces(time, ydot + m_nsp + 3); double mdot_surf = evalSurfaces(time, ydot + m_nsp + 3);
dmdt += mdot_surf; // mass added to gas phase from surface reations dmdt += mdot_surf; // mass added to gas phase from surface reactions
// volume equation // volume equation
ydot[1] = m_vdot; ydot[1] = m_vdot;