GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling errors

Browse Source
This commit is contained in:
Ray Speth
2015-04-08 19:36:55 -04:00
parent 7fdef37e4b
commit ecb6242b79
40 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/sphinx/cti/input-files.rst
View File

@@ -361,7 +361,7 @@ by hand, but is much easier to parse, particularly since it is not necessary to
write a custom parser---virtually any standard XML parser, of which there are
many, can be used to read the CTML data.
So in general files that are easy for knowledgable users (you) to write are more
So in general files that are easy for knowledgeable users (you) to write are more
difficult for machines to parse, because they make use of high-level
application-specific knowledge and conventions to simplify the
notation. Conversely, files that are designed to be easily parsed are tedious to
@@ -490,7 +490,7 @@ the definition is modified to declare these additional elements::
it may be imported successfully.
Errors of this type do not have to be fatal, as long as you tell Cantera how you
want to handle them. You can, for example, instruct Cantera to quitely skip
want to handle them. You can, for example, instruct Cantera to quietly skip
importing any species that contain undeclared elements, instead of flagging them
as errors. You can also specify that reactions containing undeclared species
(also usually an error) should be skipped. This allows you to very easily

2
include/cantera/base/Array.h
View File

@@ -284,7 +284,7 @@ public:
//! Returns a changeable reference to position in the matrix
/*!
* This is a key entry. Returns a reference to the matrixes (i,j)
* This is a key entry. Returns a reference to the matrix's (i,j)
* element. This may be used as an L value.
*
* @param i The row index

2
include/cantera/base/ctexceptions.h
View File

@@ -119,7 +119,7 @@ public:
//! Function to put this error onto Cantera's error stack
void save();
//! Method overridden by derived classes to formatted the error message
//! Method overridden by derived classes to format the error message
virtual std::string getMessage() const;
//! Method overridden by derived classes to indicate their type

2
include/cantera/base/xml.h
View File

@@ -572,7 +572,7 @@ public:
void getChildren(const std::string& name, std::vector<XML_Node*>& children) const;
//! Get a vector of pointers to XML_Node containing all of the children
//! of the current node which matche the given name
//! of the current node which match the given name
/*!
* @param name Name of the XML_Node children to search for
* @return vector of pointers to child XML_Nodes with the matching name

4
include/cantera/kinetics/ElectrodeKinetics.h
View File

@@ -4,7 +4,7 @@
* @ingroup chemkinetics
*/
/*
* Copywrite (2005) Sandia Corporation. Under the terms of
* Copyright (2005) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
@@ -23,7 +23,7 @@ namespace Cantera
//! reactions are assumed to occur at a 2D interface between two 3D phases.
/*!
* This class is a slight addition to the InterfaceKinetics class, adding
* several concepts. First we explicity identify the electrode and solution
* several concepts. First we explicitly identify the electrode and solution
* phases. We will also assume that there is an electron phase.
*
* @ingroup chemkinetics

2
include/cantera/kinetics/ExtraGlobalRxn.h
View File

@@ -3,7 +3,7 @@
*
*/
/*
* Copywrite (2005) Sandia Corporation. Under the terms of
* Copyright (2005) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/

4
include/cantera/kinetics/InterfaceKinetics.h
View File

@@ -309,7 +309,7 @@ public:
*/
void updateKc();
//! Apply modifications for the fowward reaction rate for interfacial charge transfer reactions
//! Apply modifications for the forward reaction rate for interfacial charge transfer reactions
/*!
* For reactions that transfer charge across a potential difference,
* the activation energies are modified by the potential difference.
@@ -535,7 +535,7 @@ protected:
//! Pointer to the Implicit surface chemistry object
/*!
* Note this object is owned by this InterfaceKinetics object. It may only
* be used to solve this single InterfaceKinetics objects's surface
* be used to solve this single InterfaceKinetics object's surface
* problem uncoupled from other surface phases.
*/
ImplicitSurfChem* m_integrator;

2
include/cantera/kinetics/ReactionData.h
View File

@@ -128,7 +128,7 @@ public:
//! Power of the "One minus Affinity" term within the Affinity representation
/*!
* Only valud for Affinity representation
* Only value for Affinity representation
* default = 1.0
*/
doublereal affinityPower;

2
include/cantera/kinetics/RxnMolChange.h
View File

@@ -3,7 +3,7 @@
*
*/
/*
* Copywrite (2005) Sandia Corporation. Under the terms of
* Copyright (2005) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/

2
include/cantera/kinetics/reaction_defs.h
View File

@@ -76,7 +76,7 @@ const int INTERFACE_RXN = 20;
//! This is a surface reaction that is formulated using the Butler-Volmer
//! formulation and using concentrations instead of activity concentrations
//! for its exchange current density formulat.
//! for its exchange current density formula.
const int BUTLERVOLMER_NOACTIVITYCOEFFS_RXN = 25;
//! This is a surface reaction that is formulated using the Butler-Volmer

4
include/cantera/thermo/PDSS_ConstVol.h
View File

@@ -63,7 +63,7 @@ public:
PDSS_ConstVol(VPStandardStateTP* vptp_ptr, size_t spindex, const XML_Node& speciesNode,
const XML_Node& phaseRef, bool spInstalled);
//! Copy Constructur
//! Copy Constructor
/*!
* @param b Object to be copied
*/
@@ -71,7 +71,7 @@ public:
//! Assignment operator
/*!
* @param b Object to be copeid
* @param b Object to be copied
*/
PDSS_ConstVol& operator=(const PDSS_ConstVol& b);

4
include/cantera/thermo/PDSS_IdealGas.h
View File

@@ -35,7 +35,7 @@ public:
*/
PDSS_IdealGas(VPStandardStateTP* tp, int spindex);
//! Copy Constructur
//! Copy Constructor
/*!
* @param b Object to be copied
*/
@@ -43,7 +43,7 @@ public:
//! Assignment operator
/*!
* @param b Object to be copeid
* @param b Object to be copied
*/
PDSS_IdealGas& operator=(const PDSS_IdealGas& b);

2
include/cantera/thermo/PDSS_IonsFromNeutral.h
View File

@@ -76,7 +76,7 @@ public:
//! Assignment operator
/*!
* @param b Object to be copeid
* @param b Object to be copied
*/
PDSS_IonsFromNeutral& operator=(const PDSS_IonsFromNeutral& b);

8
include/cantera/thermo/PDSS_SSVol.h
View File

@@ -67,7 +67,7 @@ namespace Cantera
* \f]
*
* The enthalpy is calculated mostly from the SpeciesThermo object's enthalpy
* evalulator. The dependence on pressure originates from the Maxwell relation
* evaluator. The dependence on pressure originates from the Maxwell relation
*
* \f[
* {\left(\frac{dH^o_k}{dP}\right)}_T = T {\left(\frac{dS^o_k}{dP}\right)}_T + V^o_k
@@ -79,7 +79,7 @@ namespace Cantera
* \f]
*
* The entropy is calculated mostly from the SpeciesThermo objects entropy
* evalulator. The dependence on pressure originates from the Maxwell relation:
* evaluator. The dependence on pressure originates from the Maxwell relation:
*
* \f[
* {\left(\frac{dS^o_k}{dP}\right)}_T = - {\left(\frac{dV^o_k}{dT}\right)}_P
@@ -196,7 +196,7 @@ public:
PDSS_SSVol(VPStandardStateTP* vptp_ptr, size_t spindex, const XML_Node& speciesNode,
const XML_Node& phaseRef, bool spInstalled);
//! Copy Constructur
//! Copy Constructor
/*!
* @param b Object to be copied
*/
@@ -204,7 +204,7 @@ public:
//! Assignment operator
/*!
* @param b Object to be copeid
* @param b Object to be copied
*/
PDSS_SSVol& operator=(const PDSS_SSVol& b);

6
include/cantera/thermo/Phase.h
View File

@@ -81,7 +81,7 @@ namespace Cantera
*
* Specify that the input mole, mass, and volume fraction vectors must sum to one on entry to the set state routines.
* Non-conforming mole/mass fraction vectors are not thermodynamically consistent.
* Moreover, ynless we do this, the calculation of jacobians will be altered whenever the treatment of non-conforming mole
* Moreover, unless we do this, the calculation of jacobians will be altered whenever the treatment of non-conforming mole
* fractions is changed. Add setState functions corresponding to specifying mole numbers, which is actually what
* is being done (well one of the options, there are many) when non-conforming mole fractions are input.
* Note, we realize that most numerical jacobian and some analytical jacobians use non-conforming calculations.
@@ -752,7 +752,7 @@ public:
//! if used will cause Cantera to throw an error.
//! @param elem_type Specifies the type of the element constraint
//! equation. This defaults to CT_ELEM_TYPE_ABSPOS, i.e., an element.
//! @deprecated. Equivalentto addElement. To be removed after Cantera 2.2.
//! @deprecated. Equivalent to addElement. To be removed after Cantera 2.2.
size_t addUniqueElementAfterFreeze(const std::string& symbol,
doublereal weight, int atomicNumber,
doublereal entropy298 = ENTROPY298_UNKNOWN,
@@ -799,7 +799,7 @@ public:
//!@} end group adding species and elements
//! Returns a bool indicating wether the object is ready for use
//! Returns a bool indicating whether the object is ready for use
/*!
* @return returns true if the object is ready for calculation, false otherwise.
*/

2
include/cantera/thermo/RedlichKwongMFTP.h
View File

@@ -197,7 +197,7 @@ protected:
/*!
* This is useful when the normalization
* condition is being handled by some other means, for example
* by a constraint equation as part of a larger set ofequations.
* by a constraint equation as part of a larger set of equations.
*
* @param x Input vector of mole fractions. Length is m_kk.
*/

4
include/cantera/thermo/ShomatePoly.h
View File

@@ -194,7 +194,7 @@ public:
* J/(gmol*K) for cp_r and s_R and kJ/(gmol) for h.
* However, Cantera assumes default MKS units of
* J/(kmol*K). This requires us to multiply cp and s
* by 1.e3 and h by 1.e6, before we then nondimensionlize
* by 1.e3 and h by 1.e6, before we then nondimensionalize
* the results by dividing by (GasConstant * T),
* where GasConstant has units of J/(kmol * K).
*/
@@ -264,7 +264,7 @@ public:
}
protected:
//! Array of coeffcients
//! Array of coefficients
vector_fp m_coeff;
};

2
include/cantera/thermo/SingleSpeciesTP.h
View File

@@ -95,7 +95,7 @@ public:
/**
* Returns the equation of state type flag.
* This is a modified base class.
* Therefore, if not overridden in derivied classes,
* Therefore, if not overridden in derived classes,
* this call will throw an exception.
*/
virtual int eosType() const;

2
include/cantera/thermo/SpeciesThermo.h
View File

@@ -118,7 +118,7 @@ class SpeciesThermoInterpType;
* - ConstCpPoly in file ConstCpPoly.h
* - This is a one-zone constant heat capacity model.
* - Mu0Poly in file Mu0Poly.h
* - This is a multizoned model. The chemical potential is given
* - This is a multi-zone model. The chemical potential is given
* at a set number of temperatures. Between each temperature
* the heat capacity is treated as a constant.
* - Nasa9Poly1 in file Nasa9Poly1.h

2
include/cantera/thermo/SpeciesThermoInterpType.h
View File

@@ -95,7 +95,7 @@ class VPSSMgr;
* - This is a one-zone constant heat capacity model.
* .
* - Mu0Poly in file Mu0Poly.h
* - This is a multizoned model. The chemical potential is given
* - This is a multi-zone model. The chemical potential is given
* at a set number of temperatures. Between each temperature
* the heat capacity is treated as a constant.
* .

2
include/cantera/thermo/SurfPhase.h
View File

@@ -493,7 +493,7 @@ public:
* may involve the solution of a nonlinear equation. Within %Cantera,
* the independent variable is the density. Therefore, this function
* solves for the density that will yield the desired input pressure.
* The temperature and composition iare held constant during this process.
* The temperature and composition are held constant during this process.
*
* This base class function will print an error, if not overwritten.
*

2
include/cantera/thermo/ThermoPhase.h
View File

@@ -286,7 +286,7 @@ public:
* may involve the solution of a nonlinear equation. Within %Cantera,
* the independent variable is the density. Therefore, this function
* solves for the density that will yield the desired input pressure.
* The temperature and composition iare held constant during this process.
* The temperature and composition are held constant during this process.
*
* This base class function will print an error, if not overwritten.
*

4
include/cantera/transport/GasTransport.h
View File

@@ -300,10 +300,10 @@ protected:
//! are calculated (Kelvin).
doublereal m_temp;
//! Current value of Boltzman's constant times the temperature (Joules)
//! Current value of Boltzmann constant times the temperature (Joules)
doublereal m_kbt;
//! current value of Boltzman's constant times the temperature.
//! current value of Boltzmann constant times the temperature.
//! (Joules) to 1/2 power
doublereal m_sqrt_kbt;

2
include/cantera/transport/TransportBase.h
View File

@@ -764,7 +764,7 @@ public:
* same order. The idea here is to allow copy constructors and duplicators
* to work. In order for them to work, we need a method to switch the
* internal pointer within the Transport object after the duplication
* takes place. Also, different thermodynamic instanteations of the same
* takes place. Also, different thermodynamic instantiations of the same
* species should also work.
*
* @param thermo Reference to the ThermoPhase object that

2
interfaces/cython/cantera/ctml_writer.py
View File

@@ -416,7 +416,7 @@ def getReactionSpecies(s):
>>> {'CH3':1, 'H':3.7, 'O2':5.2}
"""
# Normalize formatting of falloff third bodies so that there is always as
# Normalize formatting of falloff third bodies so that there is always a
# space following the '+', e.g. '(+M)' -> '(+ M)'
s = s.replace(' (+', ' (+ ')

2
interfaces/cython/cantera/examples/reactors/surf_pfr.py
View File

@@ -84,7 +84,7 @@ upstream = ct.Reservoir(gas, name='upstream')
downstream = ct.Reservoir(gas, name='downstream')
# use a 'Wall' object to implement the reacting surface in the reactor.
# Since walls have to be installed between two reactors/reserviors, we'll
# Since walls have to be installed between two reactors/reservoirs, we'll
# install it between the upstream reservoir and the reactor. The area is
# set to the desired catalyst area in the reactor, and surface reactions
# are included only on the side facing the reactor.

2
samples/f77/demo_ftnlib.cpp
View File

@@ -369,7 +369,7 @@ extern "C" {
/*
* HKM 7/22/09:
* I'm skeptical that you need this for any system.
* Definately creates an error (dupl main()) for the solaris
* Definitely creates an error (dupl main()) for the solaris
* system
*/
#ifdef NEED_ALT_MAIN

2
samples/matlab/prandtl1.m
View File

@@ -1,5 +1,5 @@
function prandtl1(g)
% PRANDTL1 Prandlt number for an equilibrium H/O gas mixture.
% PRANDTL1 Prandtl number for an equilibrium H/O gas mixture.
%
% This example computes and plots the Prandtl number for a
% hydrogen / oxygen mixture in chemical equilibrium for P = 1

2
samples/matlab/prandtl2.m
View File

@@ -1,5 +1,5 @@
function prandtl2(g)
% PRANDTL2 Prandlt number for an equilibrium H/O gas mixture.
% PRANDTL2 Prandtl number for an equilibrium H/O gas mixture.
%
% This example does the same thing as prandtl1, but using
% the multicomponent expression for the thermal conductivity.

2
src/equil/vcs_phaseStability.cpp
View File

@@ -788,7 +788,7 @@ double VCS_SOLVE::vcs_phaseStabilityTest(const size_t iph)
Vphase->setMoleFractionsState(0.0, VCS_DATA_PTR(X_est), VCS_STATECALC_PHASESTABILITY);
/*
* Save fracDelta for later use to initialize the problem better
* @TODO creationGlobalRxnNumbers needs to be calculated here and storred.
* @TODO creationGlobalRxnNumbers needs to be calculated here and stored.
*/
Vphase->setCreationMoleNumbers(VCS_DATA_PTR(fracDelta_new), creationGlobalRxnNumbers);
}

2
src/equil/vcs_rxnadj.cpp
View File

@@ -559,7 +559,7 @@ int VCS_SOLVE::vcs_rxn_adj_cg()
/*
*
* When we form the Hessian we must be careful to ensure that it
* is a symmetric positive definate matrix, still. This means zeroing
* is a symmetric positive definite matrix, still. This means zeroing
* out columns when we zero out rows as well.
* -> I suggest writing a small program to make sure of this
* property.

2
src/equil/vcs_solve_TP.cpp
View File

@@ -2441,7 +2441,7 @@ bool VCS_SOLVE::vcs_globStepDamp()
}
/* *************************************************** */
/* **** FIT PCJ2822ARABOLA ********************************* */
/* **** FIT PARABOLA ********************************* */
/* *************************************************** */
double al = 1.0;
if (fabs(s1 -s2) > 1.0E-200) {

2
src/kinetics/ElectrodeKinetics.cpp
View File

@@ -192,7 +192,7 @@ void ElectrodeKinetics::updateROP()
//
multiply_each(m_ropr.begin(), m_ropr.end(), m_rkcn.begin());
//
// multiply ropf by the actyivity concentration reaction orders to obtain
// multiply ropf by the activity concentration reaction orders to obtain
// the forward rates of progress.
//
m_reactantStoich.multiply(DATA_PTR(m_actConc), DATA_PTR(m_ropf));

2
src/kinetics/ExtraGlobalRxn.cpp
View File

@@ -8,7 +8,7 @@
*/
/*
* Copywrite (2005) Sandia Corporation. Under the terms of
* Copyright (2005) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/

2
src/kinetics/InterfaceKinetics.cpp
View File

@@ -538,7 +538,7 @@ void InterfaceKinetics::updateROP()
// the equilibrium constants
multiply_each(m_ropr.begin(), m_ropr.end(), m_rkcn.begin());
// multiply ropf by the actyivity concentration reaction orders to obtain
// multiply ropf by the activity concentration reaction orders to obtain
// the forward rates of progress.
m_reactantStoich.multiply(DATA_PTR(m_actConc), DATA_PTR(m_ropf));

2
src/kinetics/RxnMolChange.cpp
View File

@@ -6,7 +6,7 @@
*/
/*
* Copywrite (2005) Sandia Corporation. Under the terms of
* Copyright (2005) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/

2
src/numerics/NonlinearSolver.cpp
View File

@@ -1060,7 +1060,7 @@ int NonlinearSolver::doAffineNewtonSolve(const doublereal* const y_curr, const
ct_dpotrf(ctlapack::UpperTriangular, neq_, &(*(HessianPtr_->begin())), neq_, info);
if (info) {
if (m_print_flag >= 2) {
printf("\t\t doAffineNewtonSolve() ERROR: Hessian isn't positive definate DPOTRF returned INFO = %d\n", info);
printf("\t\t doAffineNewtonSolve() ERROR: Hessian isn't positive definite DPOTRF returned INFO = %d\n", info);
}
return info;
}

2
src/oneD/StFlow.cpp
View File

@@ -72,7 +72,7 @@ StFlow::StFlow(IdealGasPhase* ph, size_t nsp, size_t points) :
setBounds(0, -1e20, 1e20); // no bounds on u
setBounds(1, -1e20, 1e20); // V
setBounds(2, 200.0, 1e9); // temperature bounds
setBounds(3, -1e20, 1e20); // lamda should be negative
setBounds(3, -1e20, 1e20); // lambda should be negative
// mass fraction bounds
for (size_t k = 0; k < m_nsp; k++) {

14
src/thermo/MixtureFugacityTP.cpp
View File

@@ -541,7 +541,7 @@ doublereal MixtureFugacityTP::densityCalc(doublereal TKelvin, doublereal presPa,
double dpdVBase = dpdVCalc(TKelvin, molarVolBase, presBase);
/*
* If dpdV is positve, then we are in the middle of the
* If dpdV is positive, then we are in the middle of the
* 2 phase region and beyond the spinodal stability curve. We need to adjust
* the initial guess outwards and start a new iteration.
*/
@@ -552,7 +552,7 @@ doublereal MixtureFugacityTP::densityCalc(doublereal TKelvin, doublereal presPa,
}
/*
* TODO Spawn a calculation for the value of the spinodal point that is
* very accurate. Answer the question as to wethera solution is
* very accurate. Answer the question as to whether a solution is
* possible on the current side of the vapor dome.
*/
if (gasSide) {
@@ -646,7 +646,7 @@ doublereal MixtureFugacityTP::densityCalc(doublereal TKelvin, doublereal presPa,
double densBase = 0.0;
if (! conv) {
molarVolBase = 0.0;
throw CanteraError("MixtureFugacityTP::densityCalc()", "Process didnot converge");
throw CanteraError("MixtureFugacityTP::densityCalc()", "Process did not converge");
} else {
densBase = mmw / molarVolBase;
}
@@ -745,12 +745,12 @@ int MixtureFugacityTP::phaseState(bool checkState) const
doublereal MixtureFugacityTP::densSpinodalLiquid() const
{
throw CanteraError("", "unimplmented");
throw CanteraError("", "unimplemented");
}
doublereal MixtureFugacityTP::densSpinodalGas() const
{
throw CanteraError("", "unimplmented");
throw CanteraError("", "unimplemented");
}
doublereal MixtureFugacityTP::satPressure(doublereal TKelvin)
@@ -884,11 +884,11 @@ doublereal MixtureFugacityTP::calculatePsat(doublereal TKelvin, doublereal& mola
}
}
if (!foundGas || !foundLiquid) {
printf("error coundn't find a starting pressure\n");
printf("error couldn't find a starting pressure\n");
return 0.0;
}
if (presGas != presLiquid) {
printf("error coundn't find a starting pressure\n");
printf("error couldn't find a starting pressure\n");
return 0.0;
}

2
src/thermo/SpeciesThermoFactory.cpp
View File

@@ -653,7 +653,7 @@ SpeciesThermoInterpType* newSpeciesThermoInterpType(const XML_Node& speciesNode)
if (thermo["model"] == "MineralEQ3") {
if (thermoType != "mineq3") {
throw CanteraError("SpeciesThermoFactory::installThermoForSpecies",
"confused: expedted MinEQ3");
"confused: expected MinEQ3");
}
return newShomateForMineralEQ3(specName, *tp[0]);
} else if (thermoType == "shomate") {