Skip to content

Commit

Permalink
Fix miscellaneous spelling errors
Browse files Browse the repository at this point in the history
  • Loading branch information
speth authored and ischoegl committed Nov 20, 2021
1 parent c1c10cb commit 2d211db
Show file tree
Hide file tree
Showing 29 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion data/inputs/ptcombust.cti
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#**** *
#***********************************************************************
#
# Ref:- 1.) Deutschman et al., 26th Symp. (Intl.) on Combustion,1996
# Ref:- 1.) Deutschmann et al., 26th Symp. (Intl.) on Combustion,1996
# pp. 1747-1754
#----------------------------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion data/ptcombust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ description: |-
**** *
***********************************************************************
Ref:- 1.) Deutschman et al., 26th Symp. (Intl.) on Combustion, 1996
Ref:- 1.) Deutschmann et al., 26th Symp. (Intl.) on Combustion, 1996
pp. 1747-1754
-----------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/yaml/reactions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The fields common to all ``reaction`` entries are:
must be separated by a space.

Reversible reactions may be written using ``<=>`` or ``=`` to separate
reactants and products. Irreversible reacions are written using ``=>``.
reactants and products. Irreversible reactions are written using ``=>``.

``type``
A string specifying the type of reaction or rate coefficient
Expand Down Expand Up @@ -292,7 +292,7 @@ Example::
``interface``
-------------

A reaction occuring on a surface between two bulk phases, or along an edge
A reaction occurring on a surface between two bulk phases, or along an edge
at the intersection of two surfaces, as
`described here <https://cantera.org/science/reactions.html#sec-surface>`__.

Expand Down
2 changes: 1 addition & 1 deletion include/cantera/base/Units.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Units

//! Raise these Units to a power, changing both the conversion factor and
//! the dimensions of these Units.
Units pow(double expoonent) const;
Units pow(double exponent) const;

bool operator==(const Units& other) const;

Expand Down
4 changes: 2 additions & 2 deletions include/cantera/equil/MultiPhase.h
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ std::ostream& operator<<(std::ostream& s, MultiPhase& x);
* @param[in] orderVectorElements Order vector for the elements. The element
* rows in the formula matrix are rearranged according to this vector.
* @param[in] orderVectorSpecies Order vector for the species. The species are
* rearranged according to this formula. The first nCompoments of this
* rearranged according to this formula. The first nComponents of this
* vector contain the calculated species components on exit.
* @param[in] doFormRxn If true, the routine calculates the formation
* reaction matrix based on the calculated component species. If
Expand Down Expand Up @@ -748,7 +748,7 @@ void ElemRearrange(size_t nComponents, const vector_fp& elementAbundances,
std::vector<size_t>& orderVectorElements);

//! External int that is used to turn on debug printing for the
//! BasisOptimze program.
//! BasisOptimize program.
/*!
* Set this to 1 if you want debug printing from BasisOptimize.
*/
Expand Down
4 changes: 2 additions & 2 deletions include/cantera/kinetics/Kinetics.h
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ class Kinetics
* concentrations (no change to legacy behavior). After Cantera 2.6,
* results will no longer include third-body concentrations and be
* consistent with conventional definitions (see Eq. 9.75 in
* Kee, Coltrin and Glarborg, 'Chemically eacting Flow', Wiley
* Kee, Coltrin and Glarborg, 'Chemically Reacting Flow', Wiley
* Interscience, 2003).
* For new behavior, set 'Cantera::use_legacy_rate_constants(false)'.
*/
Expand All @@ -706,7 +706,7 @@ class Kinetics
* concentrations (no change to legacy behavior). After Cantera 2.6,
* results will no longer include third-body concentrations and be
* consistent with conventional definitions (see Eq. 9.75 in
* Kee, Coltrin and Glarborg, 'Chemically eacting Flow', Wiley
* Kee, Coltrin and Glarborg, 'Chemically Reacting Flow', Wiley
* Interscience, 2003).
* For new behavior, set 'Cantera::use_legacy_rate_constants(false)'.
*/
Expand Down
2 changes: 1 addition & 1 deletion include/cantera/numerics/FuncEval.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class FuncEval
// If true, errors are accumulated in m_errors. Otherwise, they are printed
bool m_suppress_errors;

//! Errors occuring during function evaluations
//! Errors occurring during function evaluations
std::vector<std::string> m_errors;
};

Expand Down
4 changes: 2 additions & 2 deletions include/cantera/numerics/ResidJacEval.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ enum ResidEval_Type_Enum {
Base_ResidEval = 0,
//! Base residual calculation for the Jacobian calculation
JacBase_ResidEval,
//! Delta residual calculation for the Jacbobian calculation
//! Delta residual calculation for the Jacobian calculation
JacDelta_ResidEval,
//! Base residual calculation for the showSolution routine
/*!
Expand All @@ -32,7 +32,7 @@ enum ResidEval_Type_Enum {
//! Base residual calculation containing any lagged components
/*!
* We use this to calculate residuals when doing line searches along
* irections determined by Jacobians that are missing contributions from
* directions determined by Jacobians that are missing contributions from
* lagged entries.
*/
Base_LaggedSolutionComponents
Expand Down
2 changes: 1 addition & 1 deletion include/cantera/thermo/ThermoPhase.h
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ class ThermoPhase : public Phase
* @param element either "Bilger" to compute the mixture fraction
* in terms of the Bilger mixture fraction, or
* an element name, to compute the mixture fraction
* bsaed on a single element (default: "Bilger")
* based on a single element (default: "Bilger")
* @returns mixture fraction (kg fuel / kg mixture)
*/
double mixtureFraction(const double* fuelComp, const double* oxComp,
Expand Down
2 changes: 1 addition & 1 deletion include/cantera/zeroD/Reactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class Reactor : public ReactorBase
//! @returns True if at least one limit is set, False otherwise
bool getAdvanceLimits(double* limits);

//! Set individual step size limit for compoment name *nm*
//! Set individual step size limit for component name *nm*
//! @param nm component name
//! @param limit value for step size limit
void setAdvanceLimit(const std::string& nm, const double limit);
Expand Down
2 changes: 1 addition & 1 deletion include/cantera/zeroD/flowControllers.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class Valve : public FlowDevice
return m_coeff;
}

/// Compute the currrent mass flow rate, based on the pressure difference.
/// Compute the current mass flow rate, based on the pressure difference.
virtual void updateMassFlowRate(double time);
};

Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/_cantera.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ cdef extern from "cantera/oneD/Boundary1D.h":
CxxSurf1D()

cdef cppclass CxxReactingSurf1D "Cantera::ReactingSurf1D":
CxxRreactingSurf1D()
CxxReactingSurf1D()
void setKineticsMgr(CxxInterfaceKinetics*) except +translate_exception
void enableCoverageEquations(cbool) except +translate_exception
cbool coverageEnabled()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
catalytically on the platinum surface. Gas-phase chemistry is included too,
and has some effect very near the surface.
The catalytic combustion mechanism is from Deutschman et al., 26th
The catalytic combustion mechanism is from Deutschmann et al., 26th
Symp. (Intl.) on Combustion,1996 pp. 1747-1754
Requires: cantera >= 2.5.0
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/examples/thermo/vapordome.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

w = ct.Water()

# create colums
# create columns
columns = ['T', 'P',
'vf', 'vfg', 'vg',
'uf', 'ufg', 'ug',
Expand Down
4 changes: 2 additions & 2 deletions interfaces/cython/cantera/onedim.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ def write_hdf(self, filename, *args, group=None, species='X', mode='a',
"""
Write the solution vector to a HDF container file.
The `write_hdf` method preserves the stucture of a `FlameBase`-derived
The `write_hdf` method preserves the structure of a `FlameBase`-derived
object (such as `FreeFlame`). Each simulation is saved as a *group*,
whereas individual domains are saved as subgroups. In addition to
datasets, information on `Sim1D.settings` and `Domain1D.settings` is
Expand Down Expand Up @@ -1638,7 +1638,7 @@ def __init__(self, gas, grid=None, width=None):

def set_initial_guess(self, data=None, group=None):
"""
Set the initial guess for the solution based on an equiibrium solution.
Set the initial guess for the solution based on an equilibrium solution.
Alternatively, a previously calculated result can be supplied as an
initial guess via 'data' and 'key' inputs (see
`FlameBase.set_initial_guess`).
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/test/test_onedim.py
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ def test_save_restore_xml(self):
u3 = self.sim.velocity
V3 = self.sim.spread_rate

# TODO: These tolereances seem too loose, but the tests fail on some
# TODO: These tolerances seem too loose, but the tests fail on some
# systems with tighter tolerances.
self.assertArrayNear(Y1, Y3, 3e-3)
self.assertArrayNear(u1, u3, 1e-3)
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/test/test_reaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ class ReactionTests:
_equation = None # reaction equation string
_rate = None # parameters for reaction rate object constructor
_rate_obj = None # reaction rate object
_kwargs = {} # additional parameters required by contructor
_kwargs = {} # additional parameters required by constructor
_index = None # index of reaction in "kineticsfromscratch.yaml"
_yaml = None # YAML parameterization
_input = None # input parameters (dict corresponding to YAML)
Expand Down
2 changes: 1 addition & 1 deletion samples/matlab/catcomb.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
% chemistry is included too, and has some effect very near the
% surface.
%
% The catalytic combustion mechanism is from Deutschman et al., 26th
% The catalytic combustion mechanism is from Deutschmann et al., 26th
% Symp. (Intl.) on Combustion,1996 pp. 1747-1754
%

Expand Down
2 changes: 1 addition & 1 deletion samples/matlab/surfreactor.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
set(gas,'T',t,'P',oneatm,'X','CH4:0.01, O2:0.21, N2:0.78');

% The surface reaction mechanism describes catalytic combustion of
% methane on platinum, and is from Deutschman et al., 26th
% methane on platinum, and is from Deutschmann et al., 26th
% Symp. (Intl.) on Combustion,1996, pp. 1747-1754
surf = importInterface('ptcombust.yaml','Pt_surf', gas);
setTemperature(surf, t);
Expand Down
2 changes: 1 addition & 1 deletion src/base/application.h
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class Application
* concentrations (no change to legacy behavior). After Cantera 2.6,
* results will no longer include third-body concentrations and be
* consistent with conventional definitions (see Eq. 9.75 in
* Kee, Coltrin and Glarborg, 'Chemically eacting Flow', Wiley
* Kee, Coltrin and Glarborg, 'Chemically Reacting Flow', Wiley
* Interscience, 2003).
*/
void use_legacy_rate_constants(bool legacy=true) {
Expand Down
2 changes: 1 addition & 1 deletion src/kinetics/BulkKinetics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ bool BulkKinetics::addReaction(shared_ptr<Reaction> r, bool resize)

if (!(r->usesLegacy())) {
shared_ptr<ReactionRateBase> rate = r->rate();
// If neccessary, add new MultiBulkRate evaluator
// If necessary, add new MultiBulkRate evaluator
if (m_bulk_types.find(rate->type()) == m_bulk_types.end()) {
m_bulk_types[rate->type()] = m_bulk_rates.size();
m_bulk_rates.push_back(rate->newMultiRate());
Expand Down
6 changes: 3 additions & 3 deletions src/numerics/IDA_Solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ extern "C" {
* residual routines:
*
* A IDAResFn res should return a value of 0 if successful, a positive value
* if a recoverable error occured (e.g. yy has an illegal value), or a
* negative value if a nonrecoverable error occured. In the latter case, the
* program halts. If a recoverable error occured, the integrator will
* if a recoverable error occurred (e.g. yy has an illegal value), or a
* negative value if a nonrecoverable error occurred. In the latter case, the
* program halts. If a recoverable error occurred, the integrator will
* attempt to correct and retry.
*/
static int ida_resid(realtype t, N_Vector y, N_Vector ydot, N_Vector r, void* f_data)
Expand Down
2 changes: 1 addition & 1 deletion src/oneD/Boundary1D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void Inlet1D::eval(size_t jg, double* xg, double* rg,

} else {
// right inlet
// Array elements corresponding to the flast point in the flow domain
// Array elements corresponding to the last point in the flow domain
double* rb = rg + loc() - m_flow->nComponents();
rb[c_offset_V] -= m_V0;
if (m_flow->doEnergy(m_flow->nPoints() - 1)) {
Expand Down
2 changes: 1 addition & 1 deletion src/oneD/StFlow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel)
debuglog("lambda ", loglevel >= 2);
if (x.size() != np) {
throw CanteraError("StFlow::restore",
"lambda arary size error");
"lambda array size error");
}
for (size_t j = 0; j < np; j++) {
soln[index(c_offset_L,j)] = x[j];
Expand Down
2 changes: 1 addition & 1 deletion src/thermo/Phase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void Phase::setMoleFractions(const double* const x)
sum += m_molwts[k] * xk;
}

// Set m_ym_ to the normalized mole fractions divided by the normalized mean
// Set m_ym to the normalized mole fractions divided by the normalized mean
// molecular weight:
// m_ym_k = X_k / (sum_k X_k M_k)
const double invSum = 1.0/sum;
Expand Down
2 changes: 1 addition & 1 deletion test/data/BM-ptcombust-Motz-Wise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: |-
made by Deutschmann, and it has no physical sense, which should only
be used for tests.
See https://www.detchem.com/mechanisms for original model.
Ref:- 1.) Deutschman et al., 26th Symp. (Intl.) on Combustion, 1996
Ref:- 1.) Deutschmann et al., 26th Symp. (Intl.) on Combustion, 1996
pp. 1747-1754
-----------------------------------------------------------------------
generator: cti2yaml
Expand Down
2 changes: 1 addition & 1 deletion test/data/BM_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: |-
This file is tweaked from the model made by Deutschmann, and it has
no physical sense, which should only be used for tests.
See https://www.detchem.com/mechanisms for original model.
Ref:- 1.) Deutschman et al., 26th Symp. (Intl.) on Combustion, 1996
Ref:- 1.) Deutschmann et al., 26th Symp. (Intl.) on Combustion, 1996
pp. 1747-1754
-----------------------------------------------------------------------
generator: cti2yaml
Expand Down
2 changes: 1 addition & 1 deletion test/thermo/PengRobinson_Test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ TEST_F(PengRobinson_Test, getPressure)
* b_coeff = 0.077796(RT_crit)/p_crit
* The temperature dependent parameter in P-R EoS is calculated as
* \alpha = [1 + \kappa(1 - sqrt{T/T_crit}]^2
* kappa is a function calulated based on the accentric factor.
* kappa is a function calculated based on the acentric factor.
*/

double a_coeff = 3.958095109E+5;
Expand Down
4 changes: 2 additions & 2 deletions test/thermo/cubicSolver_Test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ class cubicSolver_Test : public testing::Test
TEST_F(cubicSolver_Test, solve_cubic)
{
/* This tests validates the cubic solver by considering CO2 as an example.
* Values of a_coeff, b_coeff and accentric factor are hard-coded.
* Values of a_coeff, b_coeff and acentric factor are hard-coded.
* The temperature dependent parameter in P-R EoS is calculated as
* \alpha = [1 + \kappa(1 - sqrt{T/T_crit}]^2
* kappa is a function calulated based on the accentric factor.
* kappa is a function calculated based on the acentric factor.
*
* Three different states are considered as follows:
* 1. T = 300 T, P = 1 bar => Vapor (1 real root of the cubic equation)
Expand Down

0 comments on commit 2d211db

Please sign in to comment.