diff --git a/SConstruct b/SConstruct index a5469eb41..dd81cbe4e 100644 --- a/SConstruct +++ b/SConstruct @@ -236,7 +236,7 @@ opts.AddVariables( Fortran 90/95) and only need Python to process .cti files, then you only need a 'minimal' subset of the package (actually, only one file). The default behavior is to build - the Python package if the required prerequsites (numpy) are + the Python package if the required prerequisites (numpy) are installed.""", 'default', ('full', 'minimal', 'none','default')), PathVariable( @@ -541,7 +541,7 @@ opts.AddVariables( BoolVariable( 'build_with_f2c', """For external procedures written in Fortran 77, both the - original F77 source code and C souce code generated by the + original F77 source code and C source code generated by the 'f2c' program are included. Set this to "n" if you want to build Cantera using the F77 sources in the ext directory.""", True), diff --git a/doc/doxygen/thermoprops.dox b/doc/doxygen/thermoprops.dox index 1d11b7ad1..e24f6e05d 100644 --- a/doc/doxygen/thermoprops.dox +++ b/doc/doxygen/thermoprops.dox @@ -44,7 +44,7 @@ * Categorizing the Different %ThermoPhase Objects * * - * ThermoPhase objects may be catelogged into four general bins. + * ThermoPhase objects may be cataloged into four general bins. * * The first type are those whose underlying species have a reference state associated * with them. The reference state describes the thermodynamic functions for a @@ -97,7 +97,7 @@ * SimpleThermo calculators to help in calculating the properties for all of the * species in a phase. However, there are some PDSS objects which do not employ * reference state calculations. An example of this is real equation of state for - * liquid water used within the calculation of brine thermodynamcis. + * liquid water used within the calculation of brine thermodynamics. * In general, the independent variables that completely describe the state of the * system for this class are temperature, the * phase pressure, and N - 1 species mole or mass fractions or molalities. @@ -252,7 +252,7 @@ * * \link State::setDensity() setDensity()\endlink * Set the total density of the phase. The temperature and - * mole fractions are assumed fixed. Note this implicity + * mole fractions are assumed fixed. Note this implicitly * sets the pressure of the phase. * * @@ -334,7 +334,7 @@ * This equation, when applied to the \f$ \zeta_k \f$ equation described * above, results in a zero net change in the effective Gibbs free * energy of the phase. However, specific charged species in the phase - * may increase or decrease their electochemical potentials, which will + * may increase or decrease their electrochemical potentials, which will * have an effect on interfacial reactions involving charged species, * when there is a potential drop between phases. This effect is used * within the Cantera::InterfaceKinetics and Cantera::EdgeKinetics kinetics @@ -422,7 +422,7 @@ * terms of concentrations, i.e., gmol cm-3. In solid phase studies, * however, kinetics is usually expressed in terms of unitless activities, * which most often equate to solid phase mole fractions. In order to - * accomodate variability here, %Cantera has come up with the idea + * accommodate variability here, %Cantera has come up with the idea * of activity concentrations, \f$ C^a_k \f$. Activity concentrations are the expressions * used directly in kinetics expressions. * These activity (or generalized) concentrations are used @@ -439,7 +439,7 @@ * \f] * * \f$ C^0_k \f$ are called standard concentrations. They serve as multiplicative factors - * bewteen the activities and the generalized concentrations. Standard concentrations + * between the activities and the generalized concentrations. Standard concentrations * may be different for each species. They may depend on both the temperature * and the pressure. However, they may not depend * on the composition of the phase. For example, for the IdealGasPhase object diff --git a/doc/sphinx/scons-options.txt b/doc/sphinx/scons-options.txt index 5b191772d..5709fed1d 100644 --- a/doc/sphinx/scons-options.txt +++ b/doc/sphinx/scons-options.txt @@ -54,7 +54,7 @@ of this file is: other language (e.g. MATLAB or Fortran 90/95) and only need Python to process .cti files, then you only need a 'minimal' subset of the package (actually, only one file). The default behavior is to build - the Python package if the required prerequsites (numpy) are + the Python package if the required prerequisites (numpy) are installed. - default: 'default' @@ -366,7 +366,7 @@ of this file is: * build_with_f2c: [ yes | no ] For external procedures written in Fortran 77, both the original F77 - source code and C souce code generated by the 'f2c' program are + source code and C source code generated by the 'f2c' program are included. Set this to "n" if you want to build Cantera using the F77 sources in the ext directory. - default: 'yes' diff --git a/ext/SConscript b/ext/SConscript index b5dab2ca8..22f84e1a0 100644 --- a/ext/SConscript +++ b/ext/SConscript @@ -70,7 +70,7 @@ if env['build_with_f2c']: '$SOURCE > $TARGET') headerenv = prep_f2c(env) - # Possibly system-depenent headers + # Possibly system-dependent headers headerenv.Command('#ext/f2c_libs/signal1.h', 'f2c_libs/signal1.h0', Copy('$TARGET', '$SOURCE')) @@ -99,7 +99,7 @@ for subdir, extensions, prepFunction in libs: objects = localenv.SharedObject(mglob(localenv, subdir, *extensions)) libraryTargets.extend(objects) -# Google Teset +# Google Test localenv = env.Clone() localenv.Append(CPPPATH=[Dir('#ext/gtest'), Dir('#ext/gtest/include')], diff --git a/include/cantera/base/config.h.in b/include/cantera/base/config.h.in index 2504c5499..1348f117d 100644 --- a/include/cantera/base/config.h.in +++ b/include/cantera/base/config.h.in @@ -6,7 +6,7 @@ //---------------------------- Version Flags ------------------// // Cantera version -> this will be a double-quoted string value -// refering to branch number within svn +// referring to branch number within svn %(CANTERA_VERSION)s //------------------------ Development flags ------------------// @@ -24,20 +24,20 @@ //------------------------ Fortran settings -------------------// -// define types doublereal, integer, and ftnlen to match the +// define types doublereal, integer, and ftnlen to match the // corresponding Fortran data types on your system. The defaults // are OK for most systems -typedef double doublereal; // Fortran double precision +typedef double doublereal; // Fortran double precision typedef int integer; // Fortran integer typedef int ftnlen; // Fortran hidden string length type // Fortran compilers pass character strings in argument lists by -// adding a hidden argement with the length of the string. Some +// adding a hidden argument with the length of the string. Some // compilers add the hidden length argument immediately after the // CHARACTER variable being passed, while others put all of the hidden -// length arguments at the end of the argument list. Define this if +// length arguments at the end of the argument list. Define this if // the lengths are at the end of the argument list. This is usually the // case for most unix Fortran compilers, but is (by default) false for // Visual Fortran under Windows. @@ -65,7 +65,7 @@ typedef int ftnlen; // Fortran hidden string length type //--------- operating system -------------------------------------- -// The configure script defines this if the operatiing system is Mac +// The configure script defines this if the operating system is Mac // OS X, This used to add some Mac-specific directories to the default // data file search path. %(DARWIN)s @@ -75,8 +75,8 @@ typedef int ftnlen; // Fortran hidden string length type // windows, with gcc being used as the compiler. %(CYGWIN)s -// Identify whether the operating system is solaris -// with a native compiler +// Identify whether the operating system is Solaris +// with a native compiler %(SOLARIS)s //--------- Fonts for reaction path diagrams ---------------------- @@ -86,7 +86,7 @@ typedef int ftnlen; // Fortran hidden string length type // This define is needed to account for the variability for how // static variables in templated classes are defined. Right now -// this is only turned on for the SunPro compiler on solaris. +// this is only turned on for the SunPro compiler on Solaris. // in that system , you need to declare the static storage variable. // with the following line in the include file // @@ -123,7 +123,7 @@ typedef int ftnlen; // Fortran hidden string length type // This define indicates the enabling of the inclusion of // accurate liquid/vapor equations // of state for several fluids, including water, nitrogen, hydrogen, -// oxygen, methane, andd HFC-134a. +// oxygen, methane, and HFC-134a. %(WITH_PURE_FLUIDS)s %(WITH_LATTICE_SOLID)s diff --git a/include/cantera/equil/vcs_defs.h b/include/cantera/equil/vcs_defs.h index 4322efc46..c83743fc8 100644 --- a/include/cantera/equil/vcs_defs.h +++ b/include/cantera/equil/vcs_defs.h @@ -318,7 +318,7 @@ namespace VCSnonideal */ #define VCS_ELEM_TYPE_CHARGENEUTRALITY 2 -//! Constraint associated with maintaing a fixed lattice stoichiometry int eh +//! Constraint associated with maintaining a fixed lattice stoichiometry in the //! solids /*! * The constraint may have positive or negative values. The lattice 0 species will diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 5f8c4172f..80ae935de 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -157,7 +157,7 @@ public: //! @deprecated use type() instead DEPRECATED(virtual int ID() const); - //! Retunr the type of the kinetics object + //! Return the type of the kinetics object virtual int type() const; //! Set the electric potential in the nth phase diff --git a/include/cantera/numerics/NonlinearSolver.h b/include/cantera/numerics/NonlinearSolver.h index f4215e98d..f3c770702 100644 --- a/include/cantera/numerics/NonlinearSolver.h +++ b/include/cantera/numerics/NonlinearSolver.h @@ -741,7 +741,7 @@ public: * * @param time_curr Current time * @param ydot0 INPUT Current value of the derivative of the solution vector - * @param ydot1 INPUT Time derivates of solution at the conditions which are evaluated for success + * @param ydot1 INPUT Time derivatives of solution at the conditions which are evaluated for success * @param numTrials OUTPUT Counter for the number of residual evaluations */ void descentComparison(doublereal time_curr ,doublereal* ydot0, doublereal* ydot1, int& numTrials); @@ -840,7 +840,7 @@ public: * @param ydot_n_curr INPUT Current value of the derivative of the solution vector * @param step_1 INPUT Trial step * @param y_n_1 OUTPUT Solution values at the conditions which are evaluated for success - * @param ydot_n_1 OUTPUT Time derivates of solution at the conditions which are evaluated for success + * @param ydot_n_1 OUTPUT Time derivatives of solution at the conditions which are evaluated for success * @param trustDeltaOld INPUT Value of the trust length at the old conditions * * diff --git a/include/cantera/numerics/ResidJacEval.h b/include/cantera/numerics/ResidJacEval.h index d48103cd3..7b7ebe0bc 100644 --- a/include/cantera/numerics/ResidJacEval.h +++ b/include/cantera/numerics/ResidJacEval.h @@ -207,7 +207,7 @@ public: //! Evaluate any stopping criteria other than a final time limit /*! * If we are to stop the time integration for any reason other than reaching a final time limit, tout, - * provide a test here. This call is made at the end of every succesful time step iteration + * provide a test here. This call is made at the end of every successful time step iteration * * @return If true, the the time stepping is stopped. If false, then time stepping is stopped if t >= tout * Defaults to false. diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index 3804fd0a2..553c66106 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -786,7 +786,7 @@ public: //! Set the internally stored density (gm/m^3) of the phase. /*! * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -813,7 +813,7 @@ public: //! Set the internally stored molar density (kmol/m^3) of the phase. /** * Overwritten setMolarDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition if the input * isn't exactly equal to the current molar density. @@ -1017,7 +1017,7 @@ public: /*! * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^{\triangle}_k(T,P) - R T^2 \frac{d \ln(\gamma_k^\triangle)}{dT} diff --git a/include/cantera/thermo/Elements.h b/include/cantera/thermo/Elements.h index 412b91cdd..1e38797f3 100644 --- a/include/cantera/thermo/Elements.h +++ b/include/cantera/thermo/Elements.h @@ -46,7 +46,7 @@ namespace Cantera */ #define CT_ELEM_TYPE_CHARGENEUTRALITY 2 -//! Constraint associated with maintaing a fixed lattice stoichiometry in a solid +//! Constraint associated with maintaining a fixed lattice stoichiometry in a solid /*! * The constraint may have positive or negative values. The lattice 0 species will * have negative values while higher lattices will have positive values diff --git a/include/cantera/thermo/FixedChemPotSSTP.h b/include/cantera/thermo/FixedChemPotSSTP.h index 127cb7727..b1166fd77 100644 --- a/include/cantera/thermo/FixedChemPotSSTP.h +++ b/include/cantera/thermo/FixedChemPotSSTP.h @@ -171,7 +171,7 @@ public: FixedChemPotSSTP(); //! Construct and initialize a FixedChemPotSSTP ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index 7caa4a494..3b2c73f4e 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -1251,7 +1251,7 @@ public: HMWSoln(); //! Construct and initialize an HMWSoln ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * Working constructors * @@ -1782,7 +1782,7 @@ public: /*! * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^{\triangle}_k(T,P) @@ -1813,7 +1813,7 @@ public: * For this phase, the partial molar entropies are equal to the * SS species entropies plus the ideal solution contribution * plus complicated functions of the - * temperature derivative of the activity coefficents. + * temperature derivative of the activity coefficients. * * \f[ * \bar s_k(T,P) = s^{\triangle}_k(T,P) @@ -3019,7 +3019,7 @@ private: /** * Various temporary arrays used in the calculation of - * the Pitzer activity coefficents. + * the Pitzer activity coefficients. * The subscript, L, denotes the same quantity's derivative * wrt temperature */ diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index 539f97805..cc10e1a19 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -305,7 +305,7 @@ protected: public: /** * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -325,7 +325,7 @@ public: /** * Overwritten setMolarDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition. * diff --git a/include/cantera/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h index 8ac644f04..fefefc85f 100644 --- a/include/cantera/thermo/IdealSolidSolnPhase.h +++ b/include/cantera/thermo/IdealSolidSolnPhase.h @@ -85,7 +85,7 @@ public: //! Construct and initialize an IdealSolidSolnPhase ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * * This constructor will also fully initialize the object. @@ -313,7 +313,7 @@ public: /** * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -452,11 +452,11 @@ public: * 2 X_k / V_N 1.0 / V_N * * - * HKM Note: We have absorbed the pressure dependence of the pures species + * HKM Note: We have absorbed the pressure dependence of the pure species * state into the thermodynamics functions. Therefore the * standard state on which the activities are based depend * on both temperature and pressure. If we hadn't, it would have - * appeared in this function in a very awkwards exp[] format. + * appeared in this function in a very awkward exp[] format. * * @param c Pointer to array of doubles of length m_kk, which on exit * will contain the generalized concentrations. @@ -525,7 +525,7 @@ public: * * For EOS types other than cIdealSolidSolnPhase0, the default * kmol/m3 holds for standard concentration units. For - * cIdealSolidSolnPhase0 type, the standard concentrtion is + * cIdealSolidSolnPhase0 type, the standard concentration is * unitless. */ virtual void getUnitsStandardConc(double* uA, int k = 0, diff --git a/include/cantera/thermo/IonsFromNeutralVPSSTP.h b/include/cantera/thermo/IonsFromNeutralVPSSTP.h index e39170874..78c107aa7 100644 --- a/include/cantera/thermo/IonsFromNeutralVPSSTP.h +++ b/include/cantera/thermo/IonsFromNeutralVPSSTP.h @@ -83,7 +83,7 @@ public: IonsFromNeutralVPSSTP(); //! Construct and initialize an IonsFromNeutralVPSSTP object - //! directly from an asci input file + //! directly from an ASCII input file /*! * Working constructors * @@ -293,7 +293,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -311,7 +311,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/include/cantera/thermo/LatticeSolidPhase.h b/include/cantera/thermo/LatticeSolidPhase.h index 7b752ade3..f130c291a 100644 --- a/include/cantera/thermo/LatticeSolidPhase.h +++ b/include/cantera/thermo/LatticeSolidPhase.h @@ -346,9 +346,9 @@ public: //! The mole fraction of species k. /*! - * If k is ouside the valid + * If k is outside the valid * range, an exception will be thrown. Note that it is - * somewhat more efficent to call getMoleFractions if the + * somewhat more efficient to call getMoleFractions if the * mole fractions of all species are desired. * @param k species index */ @@ -368,7 +368,7 @@ public: //! Mass fraction of species k. /*! * If k is outside the valid range, an exception will be thrown. Note that it is - * somewhat more efficent to call getMassFractions if the mass fractions of all species are desired. + * somewhat more efficient to call getMassFractions if the mass fractions of all species are desired. * * @param k species index */ diff --git a/include/cantera/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h index b6d139397..50d40f2c7 100644 --- a/include/cantera/thermo/MargulesVPSSTP.h +++ b/include/cantera/thermo/MargulesVPSSTP.h @@ -534,7 +534,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -552,7 +552,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -572,7 +572,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????????? diff --git a/include/cantera/thermo/MetalSHEelectrons.h b/include/cantera/thermo/MetalSHEelectrons.h index d0728f735..d1e68ff84 100644 --- a/include/cantera/thermo/MetalSHEelectrons.h +++ b/include/cantera/thermo/MetalSHEelectrons.h @@ -193,7 +193,7 @@ public: MetalSHEelectrons(); //! Construct and initialize a %MetalSHEelectrons %ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/include/cantera/thermo/MineralEQ3.h b/include/cantera/thermo/MineralEQ3.h index 85ba76d72..16f87bfd8 100644 --- a/include/cantera/thermo/MineralEQ3.h +++ b/include/cantera/thermo/MineralEQ3.h @@ -168,7 +168,7 @@ public: MineralEQ3(); //! Construct and initialize a StoichSubstanceSSTP ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/include/cantera/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h index 5b55b9467..3ff52cbe7 100644 --- a/include/cantera/thermo/MixedSolventElectrolyte.h +++ b/include/cantera/thermo/MixedSolventElectrolyte.h @@ -539,7 +539,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -557,7 +557,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -577,7 +577,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????????? diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index 299d4b7fa..fd80571dc 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -52,7 +52,7 @@ class PDSS; /** * @ingroup thermoprops * - * This is a filter class for ThermoPhase that implements some prepatory + * This is a filter class for ThermoPhase that implements some preparatory * steps for efficiently handling mixture of gases that whose standard states * are defined as ideal gases, but which describe also non-ideal solutions. * In addition a multicomponent liquid phase below the critical temperature of the @@ -74,7 +74,7 @@ class PDSS; * Typically, only one liquid phase is allowed to be formed within these classes. * Additionally, there is an inherent contradiction between three phase models and * the ThermoPhase class. The ThermoPhase class is really only meant to represent a - * single instanteation of a phase. The three phase models may be in equilibrium with + * single instantiation of a phase. The three phase models may be in equilibrium with * multiple phases of the fluid in equilibrium with each other. This has yet to be resolved. * * This class is usually used for non-ideal gases. @@ -450,7 +450,7 @@ public: /*! * 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. @@ -786,7 +786,7 @@ public: * * * @return We return the density of the fluid at the requested phase. If we have not found any - * acceptable density we return a -1. If we have found an accectable density at a + * acceptable density we return a -1. If we have found an acceptable density at a * different phase, we return a -2. */ virtual doublereal densityCalc(doublereal TKelvin, doublereal pressure, int phaseRequested, @@ -808,7 +808,7 @@ public: //! Returns the Phase State flag for the current state of the object /*! * @param checkState If true, this function does a complete check to see where - * in paramters space we are + * in parameters space we are * * There are three values: * WATER_GAS below the critical temperature but below the critical density @@ -894,7 +894,7 @@ protected: protected: - //! Current value of the pressurees + //! Current value of the pressures /*! * Because the pressure is now a calculation, we store the result of the calculation whenever * it is recalculated. diff --git a/include/cantera/thermo/MolarityIonicVPSSTP.h b/include/cantera/thermo/MolarityIonicVPSSTP.h index aac9f732d..8ef3127a6 100644 --- a/include/cantera/thermo/MolarityIonicVPSSTP.h +++ b/include/cantera/thermo/MolarityIonicVPSSTP.h @@ -272,7 +272,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -290,7 +290,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -310,7 +310,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????????? diff --git a/include/cantera/thermo/PhaseCombo_Interaction.h b/include/cantera/thermo/PhaseCombo_Interaction.h index 84042520a..7c72fd472 100644 --- a/include/cantera/thermo/PhaseCombo_Interaction.h +++ b/include/cantera/thermo/PhaseCombo_Interaction.h @@ -570,7 +570,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -588,7 +588,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -608,7 +608,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????????? diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h index 824432326..f70a68aa5 100644 --- a/include/cantera/thermo/RedlichKwongMFTP.h +++ b/include/cantera/thermo/RedlichKwongMFTP.h @@ -53,7 +53,7 @@ public: RedlichKwongMFTP(); //! Construct and initialize a RedlichKwongMFTP ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * Working constructors * @@ -801,21 +801,21 @@ protected: //! The derivative of the pressure wrt the volume /*! - * Calcualted at the current conditions + * Calculated at the current conditions * temperature and mole number kept constant */ mutable doublereal dpdV_; //! The derivative of the pressure wrt the temperature /*! - * Calcualted at the current conditions + * Calculated at the current conditions * Total volume and mole number kept constant */ mutable doublereal dpdT_; //! Vector of derivatives of pressure wrt mole number /*! - * Calcualted at the current conditions + * Calculated at the current conditions * Total volume, temperature and other mole number kept constant */ mutable vector_fp dpdni_; diff --git a/include/cantera/thermo/SpeciesThermo.h b/include/cantera/thermo/SpeciesThermo.h index c727b435f..42c8c27e8 100644 --- a/include/cantera/thermo/SpeciesThermo.h +++ b/include/cantera/thermo/SpeciesThermo.h @@ -46,7 +46,7 @@ class SpeciesThermoInterpType; * between a minimum temperature and a maximum temperature. The * reference state also specifies the molar volume of the species * as a function of temperature. The molar volume is a thermodynamic - * function. By constrast, a full standard state does the same thing + * function. By contrast, a full standard state does the same thing * as a reference state, but specifies the thermodynamics functions * at all pressures. * diff --git a/include/cantera/thermo/StoichSubstanceSSTP.h b/include/cantera/thermo/StoichSubstanceSSTP.h index 3fe56feff..f953de0f5 100644 --- a/include/cantera/thermo/StoichSubstanceSSTP.h +++ b/include/cantera/thermo/StoichSubstanceSSTP.h @@ -167,7 +167,7 @@ public: StoichSubstanceSSTP(); //! Construct and initialize a StoichSubstanceSSTP ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * @param infile name of the input file * @param id name of the phase id in the file. @@ -538,7 +538,7 @@ public: electrodeElectron(); //! Construct and initialize a electrodeElectron ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/include/cantera/thermo/SurfPhase.h b/include/cantera/thermo/SurfPhase.h index 6aca0f6ce..25a081d97 100644 --- a/include/cantera/thermo/SurfPhase.h +++ b/include/cantera/thermo/SurfPhase.h @@ -154,7 +154,7 @@ public: SurfPhase(doublereal n0 = 0.0); //! Construct and initialize a SurfPhase ThermoPhase object - //! directly from an asci input file + //! directly from an ASCII input file /*! * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h index 5005177fc..67ecffe6a 100644 --- a/include/cantera/thermo/ThermoPhase.h +++ b/include/cantera/thermo/ThermoPhase.h @@ -18,7 +18,7 @@ namespace Cantera { /*! - * @name CONSTANTS - Specification of the Molality conventention + * @name CONSTANTS - Specification of the Molality convention */ //@{ //! Standard state uses the molar convention @@ -28,7 +28,7 @@ const int cAC_CONVENTION_MOLALITY = 1; //@} /*! - * @name CONSTANTS - Specification of the SS conventention + * @name CONSTANTS - Specification of the SS convention */ //@{ //! Standard state uses the molar convention @@ -69,7 +69,7 @@ class XML_Node; * To implement a new equation of state, derive a class from * ThermoPhase and overload the virtual methods in * ThermoPhase. Methods that are not needed can be left - * unimplimented, which will cause an exception to be thrown if it + * unimplemented, which will cause an exception to be thrown if it * is called. * * Relationship with the kinetics operator: @@ -1215,7 +1215,7 @@ public: * dimensionless forms by multiplying by RT. * @param lambda Output vector containing the element potentials. * Length = nElements. Units are Joules/kmol. - * @return bool indicating whether thare are any valid stored element + * @return bool indicating whether there are any valid stored element * potentials. The calling routine should check this * bool. In the case that there aren't any, lambda is not * touched. diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h index e55188a89..a666ac8d6 100644 --- a/include/cantera/thermo/VPSSMgr.h +++ b/include/cantera/thermo/VPSSMgr.h @@ -80,7 +80,7 @@ class PDSS; * SimpleThermo calculators to help in calculating the properties for all of the * species in a phase. However, there are some PDSS objects which do not employ * reference state calculations. An example of this is a real equation of state for - * liquid water used within the calculation of brine thermodynamcis. + * liquid water used within the calculation of brine thermodynamics. * * Typically calls to calculate standard state thermo properties are virtual calls * at the ThermoPhase level. It is left to the child classes of ThermoPhase to diff --git a/include/cantera/thermo/WaterProps.h b/include/cantera/thermo/WaterProps.h index a292f158b..b51c2d019 100644 --- a/include/cantera/thermo/WaterProps.h +++ b/include/cantera/thermo/WaterProps.h @@ -67,7 +67,7 @@ class PDSS_Water; * This equation, when applied to the \f$ \zeta_k \f$ equation described * above, results in a zero net change in the effective Gibbs free * energy of the phase. However, specific charged species in the phase - * may increase or decrease their electochemical potentials, which will + * may increase or decrease their electrochemical potentials, which will * have an effect on interfacial reactions involving charged species, * when there is a potential drop between phases. This effect is used * within the Cantera::InterfaceKinetics and Cantera::EdgeKinetics kinetics diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index 644aa4f3f..864360d58 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -388,23 +388,20 @@ private: //! Polynomial coefficients of the viscosity /*! - * These express the temperature dependendence of the pures - * species viscosities. + * These express the temperature dependence of the pure species viscosities. */ std::vector m_visccoeffs; //! Polynomial coefficients of the conductivities /*! - * These express the temperature dependendence of the pures - * species conductivities + * These express the temperature dependence of the pure species conductivities */ std::vector m_condcoeffs; //! Polynomial coefficients of the binary diffusion coefficients /*! - * These express the temperature dependendence of the - * binary diffusivities. An overall pressure dependence is then - * added. + * These express the temperature dependence of the binary diffusivities. + * An overall pressure dependence is then added. */ std::vector m_diffcoeffs; diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index 151a2a593..1b83d7feb 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -305,13 +305,13 @@ public: } /** - * The ionic conducitivity in 1/ohm/m. + * The ionic conductivity in 1/ohm/m. */ virtual doublereal ionConductivity() { return err("ionConductivity"); } - //! Returns the pure species ionic conducitivity + //! Returns the pure species ionic conductivity /*! * The units are 1/ohm/m and the length is the number of species * @@ -852,7 +852,7 @@ protected: //! Number of species size_t m_nsp; - //! Number of dimensions used in flux expresions + //! Number of dimensions used in flux expressions size_t m_nDim; //! Velocity basis from which diffusion velocities are computed. diff --git a/interfaces/python/Cantera/Reactor.py b/interfaces/python/Cantera/Reactor.py index c2b29c090..733301abf 100644 --- a/interfaces/python/Cantera/Reactor.py +++ b/interfaces/python/Cantera/Reactor.py @@ -882,7 +882,7 @@ class Wall: Wall expansion rate parameter [m/s/Pa]. Defaults to 0.0. :param U: Overall heat transfer coefficient [W/m^2]. Defaults to 0.0 - (adiabbatic wall). + (adiabatic wall). :param Q: Heat flux function :math:`q_0(t)` [W/m^2]. Optional. Default: :math:`q_0(t) = 0.0`. diff --git a/samples/cxx/combustor/combustor.cpp b/samples/cxx/combustor/combustor.cpp index 596ac395e..fb783030c 100644 --- a/samples/cxx/combustor/combustor.cpp +++ b/samples/cxx/combustor/combustor.cpp @@ -77,7 +77,7 @@ void runexample() m2.setMassFlowRate(air_mdot); - // The igniter will use a Guassiam 'functor' object to specify the + // The igniter will use a Gaussian 'functor' object to specify the // time-dependent igniter mass flow rate. double A = 0.1; double FWHM = 0.2; diff --git a/samples/cxx/flamespeed/flamespeed.cpp b/samples/cxx/flamespeed/flamespeed.cpp index 4b2d16bcd..96b5b3c64 100644 --- a/samples/cxx/flamespeed/flamespeed.cpp +++ b/samples/cxx/flamespeed/flamespeed.cpp @@ -195,7 +195,7 @@ int flamespeed(int np, void* p) /* Solve freely propagating flame*/ - /* Linearally interpolate to find location where this + /* Linearly interpolate to find location where this temperature would exist. The temperature at this location will then be fixed for remainder of calculation.*/ diff --git a/samples/python/fuel_cells/sofc.cti b/samples/python/fuel_cells/sofc.cti index a17f4d6cc..b605815d7 100644 --- a/samples/python/fuel_cells/sofc.cti +++ b/samples/python/fuel_cells/sofc.cti @@ -103,7 +103,7 @@ metal(name = "metal", # the chemical potential of the electron is zero, and the # electrochemical potential is simply -F * phi, where phi is the # electric potential of the metal. Note that this simple model is -# adequate only because all we require is a reservior for electrons; +# adequate only because all we require is a reservoir for electrons; # if we wanted to do anything more complex, like carry out energy or # charge balances on the metal, then we would require a more complex # model. Note that there is no work function for this metal. @@ -216,7 +216,7 @@ species( name = "H2O(m)", atoms = "H:2, O:1", s0 = (123.0, 'J/mol/K'))) -# Surface reactions on the metal. We assume three dissociave +# Surface reactions on the metal. We assume three dissociative # adsorption reactions, and three reactions on the surface # among adsorbates. All reactions are treated as reversible. surface_reaction( "H2 + (m) + (m) <=> H(m) + H(m)", @@ -259,7 +259,7 @@ ideal_interface(name = "oxide_surface", initial_state = state( temperature = tt, coverages = "O''(ox):2.0, (ox):0.0") ) -# Note: hox, sox, hhydrox, andd shydrox are defined near the top of +# Note: hox, sox, hhydrox, and shydrox are defined near the top of # this file. # An oxygen ion at the surface, with charge = -2 @@ -282,7 +282,7 @@ species( name = "H2O(ox)", atoms = "H:2, O:1", s0 = (98.0,'J/mol/K'))) -# This reaction represents the exhange of a surface oxygen vacancy and +# This reaction represents the exchange of a surface oxygen vacancy and # a subsurface vacancy. The concentration of subsurface vacancies is # fixed by the doping level. If this reaction is given a large rate, # then the surface vacancies will stay in equilibrium with the bulk diff --git a/samples/python/reactors/combustor_sim/combustor.py b/samples/python/reactors/combustor_sim/combustor.py index 96415100c..59d2dcd9b 100644 --- a/samples/python/reactors/combustor_sim/combustor.py +++ b/samples/python/reactors/combustor_sim/combustor.py @@ -57,7 +57,7 @@ m1 = MassFlowController(upstream = fuel_in, m2 = MassFlowController(upstream = air_in, downstream = combustor, mdot = air_mdot) -# The igniter will use a Guassiam 'functor' object to specify the +# The igniter will use a Gaussian 'functor' object to specify the # time-dependent igniter mass flow rate. igniter_mdot = Gaussian(t0 = 1.0, FWHM = 0.2, A = 0.1) m3 = MassFlowController(upstream = igniter, diff --git a/site_scons/wxsgen.py b/site_scons/wxsgen.py index 6d3fb922f..c1332421b 100644 --- a/site_scons/wxsgen.py +++ b/site_scons/wxsgen.py @@ -84,7 +84,7 @@ class WxsGenerator(object): Compressed='yes', SummaryCodepage='1252', **fields)) - # Required boilerplate refering to nonexistent installation media + # Required boilerplate referring to nonexistent installation media media = et.SubElement(product, "Media", dict(Id='1', Cabinet='cantera.cab', diff --git a/src/apps/csvdiff.cpp b/src/apps/csvdiff.cpp index 8b2f408ad..b6b1b935b 100644 --- a/src/apps/csvdiff.cpp +++ b/src/apps/csvdiff.cpp @@ -1013,7 +1013,7 @@ int main(int argc, char* argv[]) if (ndiff > 0) { printf( - "Column variable %s failed comparison test for %d occurances\n", + "Column variable %s failed comparison test for %d occurrences\n", ColNames1[i1], ndiff); if (jmax >= 0) { printf(" Largest difference was at data row %d ", jmax + 1); diff --git a/src/base/application.cpp b/src/base/application.cpp index 7598359d6..c18ddd866 100644 --- a/src/base/application.cpp +++ b/src/base/application.cpp @@ -35,7 +35,7 @@ static boost::mutex dir_mutex; //! Mutex for access to string messages static boost::mutex msg_mutex; -//! Mutex for creating singeltons within the application object +//! Mutex for creating singletons within the application object static boost::mutex app_mutex; // Mutex for controlling access to the log file @@ -297,11 +297,11 @@ void Application::Messages::endLogGroup(std::string title) } AssertThrowMsg(current, "Application::Messages::endLogGroup", "Error while ending a LogGroup. This is probably due to an unmatched" - " beginnning and ending group"); + " beginning and ending group"); current = current->parent(); AssertThrowMsg(current, "Application::Messages::endLogGroup", "Error while ending a LogGroup. This is probably due to an unmatched" - " beginnning and ending group"); + " beginning and ending group"); current = current->parent(); // Get the loglevel of the previous level and get rid of // vector entry in loglevels. diff --git a/src/base/xml.cpp b/src/base/xml.cpp index 55d17eb11..d94c14c0b 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -1295,7 +1295,7 @@ void XML_Node::build(std::istream& f) // into the destination XML_Node tree, doing a union operation as // we go /* - * Note this is a const function becuase the current XML_Node and + * Note this is a const function because the current XML_Node and * its children isn't altered by this operation. * * @param node_dest This is the XML node to receive the information @@ -1359,7 +1359,7 @@ void XML_Node::copyUnion(XML_Node* const node_dest) const // into the destination XML_Node tree, doing a complete copy // as we go. /* - * Note this is a const function becuase the current XML_Node and + * Note this is a const function because the current XML_Node and * its children isn't altered by this operation. * * @param node_dest This is the XML node to receive the information diff --git a/src/clib/Cabinet.h b/src/clib/Cabinet.h index 9f02e920f..0ac6a8157 100644 --- a/src/clib/Cabinet.h +++ b/src/clib/Cabinet.h @@ -48,7 +48,7 @@ * again inadvertently nothing happens, and if an attempt is made to * reference the object by its index number, the base-class object * will be referenced instead, which will throw an exception. If - * instead the pointer were stored in the refering code, there would + * instead the pointer were stored in the referring code, there would * always be the chance that * * The Cabinet class is implemented as a singlet. The constructor diff --git a/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp index f94ab87e4..eeecb99bf 100644 --- a/src/equil/BasisOptimize.cpp +++ b/src/equil/BasisOptimize.cpp @@ -66,7 +66,7 @@ static size_t amax(double* x, size_t j, size_t n); * (each column is a new rhs) * * @return Retuns the value - * 1 : Matrix is singluar + * 1 : Matrix is singular * 0 : solution is OK * * The solution is returned in the matrix b. @@ -572,7 +572,7 @@ static size_t amax(double* x, size_t j, size_t n) * idem >= n must be true * * Return Value - * 1 : Matrix is singluar + * 1 : Matrix is singular * 0 : solution is OK * * The solution is returned in the matrix b. @@ -698,7 +698,7 @@ size_t Cantera::ElemRearrange(size_t nComponents, const vector_fp& elementAbunda } writelog("\n"); writelog(" --- Subroutine ElemRearrange() called to "); - writelog("check stoich. coefficent matrix\n"); + writelog("check stoich. coefficient matrix\n"); writelog(" --- and to rearrange the element ordering once\n"); } #endif diff --git a/src/equil/vcs_VolPhase.h b/src/equil/vcs_VolPhase.h index 85e7b7a0b..3013b3b1b 100644 --- a/src/equil/vcs_VolPhase.h +++ b/src/equil/vcs_VolPhase.h @@ -889,7 +889,7 @@ private: * The phase stability problem requires a global reaction number for each * species in the phase. Usually this is the krxn = kglob - M for species * in the phase that are not components. For component species, the - * choice of the reaction is one which maximimes the chance that the phase + * choice of the reaction is one which maximizes the chance that the phase * pops into (or remains in) existence. * The index here is the local phase species index. * the value of the variable is the global vcs reaction number. Note, @@ -972,11 +972,11 @@ private: //! Value of the potential for the phase (Volts) double m_phi; - //! Boolean indicating whether the object has an uptodate mole number vector + //! Boolean indicating whether the object has an up-to-date mole number vector //! and potential with respect to the current vcs state calc status bool m_UpToDate; - //! Boolean indicating whether activity coefficients are uptodate. + //! Boolean indicating whether activity coefficients are up to date. /*! * Activity coefficients and volume calculations are lagged. They are only * called when they are needed (and when the state has changed so that they @@ -984,7 +984,7 @@ private: */ mutable bool m_UpToDate_AC; - //! Boolean indicating whether Star volumes are uptodate. + //! Boolean indicating whether Star volumes are up to date. /*! * Activity coefficients and volume calculations are lagged. They are only * called when they are needed (and when the state has changed so that they @@ -993,7 +993,7 @@ private: */ mutable bool m_UpToDate_VolStar; - //! Boolean indicating whether partial molar volumes are uptodate. + //! Boolean indicating whether partial molar volumes are up to date. /*! * Activity coefficients and volume calculations are lagged. They are only * called when they are needed (and when the state has changed so that they @@ -1002,14 +1002,14 @@ private: */ mutable bool m_UpToDate_VolPM; - //! Boolean indicating whether GStar is uptodate. + //! Boolean indicating whether GStar is up to date. /*! * GStar is sensitive to the temperature and the pressure, only */ mutable bool m_UpToDate_GStar; - //! Boolean indicating whether G0 is uptodate. + //! Boolean indicating whether G0 is up to date. /*! * G0 is sensitive to the temperature and the pressure, only */ diff --git a/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp index a8db229c5..3be6c86f9 100644 --- a/src/equil/vcs_elem_rearrange.cpp +++ b/src/equil/vcs_elem_rearrange.cpp @@ -72,7 +72,7 @@ int VCS_SOLVE::vcs_elem_rearrange(double* const aw, double* const sa, } plogf("\n"); plogf(" --- Subroutine elem_rearrange() called to "); - plogf("check stoich. coefficent matrix\n"); + plogf("check stoich. coefficient matrix\n"); plogf(" --- and to rearrange the element ordering once"); plogendl(); } diff --git a/src/equil/vcs_internal.h b/src/equil/vcs_internal.h index e6d61eb9a..7d9da7f04 100644 --- a/src/equil/vcs_internal.h +++ b/src/equil/vcs_internal.h @@ -135,7 +135,7 @@ double vcsUtil_gasConstant(int mu_units); * * @return The solution x[] is returned in the matrix B. * Routine returns an integer representing success: - * - 1 : Matrix is singluar + * - 1 : Matrix is singular * - 0 : solution is OK * * @@ -172,7 +172,7 @@ int vcsUtil_mlequ(double* c, size_t idem, size_t n, double* b, size_t m); * * @return The solution x[] is returned in the matrix B. * Routine returns an integer representing success: - * - 1 : Matrix is singluar + * - 1 : Matrix is singular * - 0 : solution is OK * * @param c Matrix to be inverted. c is in fortran format, i.e., rows @@ -231,7 +231,7 @@ typedef double(*VCS_FUNC_PTR)(double xval, double Vtarget, * f(xval). * * @param xmin Minimum permissible value of the x variable - * @param xmax Maximum permissible value of the x paramerer + * @param xmax Maximum permissible value of the x parameter * @param itmax Maximum number of iterations * @param func function pointer, pointing to the function to be * minimized @@ -474,7 +474,7 @@ size_t vcs_optMax(const double* x, const double* xSize, size_t j, size_t n); */ int vcs_max_int(const int* vector, int length); -//! Prints a line consisting of mutliple occurances of the same string +//! Prints a line consisting of multiple occurrences of the same string /*! * This prints a string num times, and then terminate with a * end of line character diff --git a/src/equil/vcs_prob.h b/src/equil/vcs_prob.h index a8ef0325b..b2fe90fe7 100644 --- a/src/equil/vcs_prob.h +++ b/src/equil/vcs_prob.h @@ -157,7 +157,7 @@ public: //! and species amounts /*! * All internally stored quantities will have these units. Also, printed - * quantitities will display in these units. + * quantities will display in these units. * * Chem_Pot Pres vol moles * ---------------------------------------------------------------------- diff --git a/src/equil/vcs_solve.h b/src/equil/vcs_solve.h index d866fab2f..d5242fba1 100644 --- a/src/equil/vcs_solve.h +++ b/src/equil/vcs_solve.h @@ -1510,7 +1510,7 @@ public: * * m_stoichCoeffRxnMatrix[irxn][j] : * j refers to the component number, and irxn refers to the irxn_th non-component species. - * The stoichiometric coefficents multilpled by the Formula coefficients of the + * The stoichiometric coefficients multiplied by the Formula coefficients of the * component species add up to the negative value of the number of elements in * the species kspec. * @@ -1551,7 +1551,7 @@ public: std::vector m_feSpecies_old; //! 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 * NR entries are for the current non-component species in the mechanism. @@ -1584,7 +1584,7 @@ public: * unknown. The second is the an interfacial * voltage where w[k] refers to the interfacial * voltage in volts. - * These species types correspond to metalic + * These species types correspond to metallic * electrons corresponding to electrodes. * The voltage and other interfacial conditions * sets up an interfacial current, which is diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index 065bec288..6d0b3857a 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -2104,7 +2104,7 @@ double VCS_SOLVE::vcs_minor_alt_calc(size_t kspec, size_t irxn, bool* do_delete } /* - * get the diagonal of the activity coefficent jacobian + * get the diagonal of the activity coefficient jacobian */ s = m_dLnActCoeffdMolNum[kspec][kspec]; // s *= (m_tPhaseMoles_old[iph]); @@ -3901,7 +3901,7 @@ int VCS_SOLVE::vcs_species_type(const size_t kspec) const if (m_molNumSpecies_old[j] < 1.0E-60) { #ifdef DEBUG_MODE if (m_debug_print_lvl >= 2) { - plogf(" --- %s is prevented from popping into existance because" + plogf(" --- %s is prevented from popping into existence because" " a needed component to be consumed, %s, has a zero mole number\n", m_speciesName[kspec].c_str(), m_speciesName[j].c_str()); } @@ -4892,9 +4892,9 @@ bool VCS_SOLVE::vcs_evaluate_speciesType() m_numRxnMinorZeroed = 0; #ifdef DEBUG_MODE if (m_debug_print_lvl >= 2) { - plogf(" --- Species Status decision is reavaluated: All species are minor except for:\n"); + plogf(" --- Species Status decision is reevaluated: All species are minor except for:\n"); } else if (m_debug_print_lvl >= 5) { - plogf(" --- Species Status decision is reavaluated"); + plogf(" --- Species Status decision is reevaluated"); plogendl(); } #endif diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp index 3f0bb16ae..33528e756 100644 --- a/src/equil/vcs_util.cpp +++ b/src/equil/vcs_util.cpp @@ -407,7 +407,7 @@ static void vcsUtil_mlequ_preprocess(double* c, size_t idem, size_t n, double* b * The matrix C is destroyed. * * @return Routine returns an integer representing success: - * - 1 : Matrix is singluar + * - 1 : Matrix is singular * - 0 : solution is OK * The solution x[] is returned in the matrix b. * @@ -547,7 +547,7 @@ FOUND_PIVOT: * of lots of rhs's. * * @return Routine returns an integer representing success: - * - 1 : Matrix is singluar + * - 1 : Matrix is singular * - 0 : solution is OK * The solution x[] is returned in the matrix b. * diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 6598ae37b..29194cc04 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -255,7 +255,7 @@ doublereal ResidJacEval::filterSolnPrediction(doublereal t, doublereal* const y) // Evaluate any stopping criteria other than a final time limit /* * If we are to stop the time integration for any reason other than reaching a final time limit, tout, - * provide a test here. This call is made at the end of every succesful time step iteration + * provide a test here. This call is made at the end of every successful time step iteration * * @return If true, the the time stepping is stopped. If false, then time stepping is stopped if t >= tout * Defaults to false. diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index 894537f78..4d8dd7ed6 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -432,7 +432,7 @@ doublereal DebyeHuckel::thermalExpansionCoeff() const /* * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -457,7 +457,7 @@ void DebyeHuckel::setDensity(doublereal rho) /* * Overwritten setMolarDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition. * diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index 80d072029..6503989a4 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -12,10 +12,6 @@ * */ -/* - * $Id: FixedChemPotSSTP.cpp 255 2009-11-09 23:36:49Z hkmoffa $ - */ - #include "cantera/base/ct_defs.h" #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/FixedChemPotSSTP.h" @@ -42,7 +38,7 @@ FixedChemPotSSTP::FixedChemPotSSTP() : } //==================================================================================================================== // Create and initialize a FixedChemPotSSTP ThermoPhase object -// from an asci input file +// from an ASCII input file /* * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index f7b666ba1..6664e9125 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -835,7 +835,7 @@ double HMWSoln::density() const /* * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -865,7 +865,7 @@ void HMWSoln::setDensity(const doublereal rho) /* * Overwritten setMolarDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition. * @@ -1147,7 +1147,7 @@ void HMWSoln::getChemPotentials(doublereal* mu) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^{\triangle}_k(T,P) - R T^2 \frac{d \ln(\gamma_k^\triangle)}{dT} @@ -1854,7 +1854,7 @@ void HMWSoln::s_update_lnMolalityActCoeff() const calcMolalities(); /* * Calculate a cropped set of molalities that will be used - * in all activity coefficent calculations. + * in all activity coefficient calculations. */ calcMolalitiesCropped(); /* diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index 8d56617b9..f1627ed50 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -385,7 +385,7 @@ void IdealGasPhase::getStandardVolumes(doublereal* vol) const /* * Returns the vector of nondimensional * enthalpies of the reference state at the current temperature - * and reference presssure. + * and reference pressure. */ void IdealGasPhase::getEnthalpy_RT_ref(doublereal* hrt) const { @@ -489,7 +489,7 @@ void IdealGasPhase::initThermo() /* * Set mixture to an equilibrium state consistent with specified * chemical potentials and temperature. This method is needed by - * the ChemEquil equillibrium solver. + * the ChemEquil equilibrium solver. */ void IdealGasPhase::setToEquilState(const doublereal* mu_RT) { diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index 05a1cf51c..6cdde86a3 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -342,7 +342,7 @@ doublereal IdealMolalSoln::thermalExpansionCoeff() const /* * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -367,7 +367,7 @@ void IdealMolalSoln::setDensity(const doublereal rho) /* * Overwritten setMolarDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition. * diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index f5c6e3fdb..891a8723d 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -295,7 +295,7 @@ void IdealSolidSolnPhase::calcDensity() /** * Overwritten setDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition * @@ -347,7 +347,7 @@ void IdealSolidSolnPhase::setPressure(doublereal p) /* * setMolarDensity() (virtual from State) * Overwritten setMolarDensity() function is necessary because the - * density is not an indendent variable. + * density is not an independent variable. * * This function will now throw an error condition. * @@ -591,7 +591,7 @@ logStandardConc(size_t k) const * * For EOS types other than cIdealSolidSolnPhase1, the default * kmol/m3 holds for standard concentration units. For - * cIdealSolidSolnPhase0 type, the standard concentrtion is + * cIdealSolidSolnPhase0 type, the standard concentration is * unitless. */ void IdealSolidSolnPhase:: diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 7bb21f97a..1004e4213 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -295,7 +295,7 @@ doublereal IdealSolnGasVPSS::logStandardConc(size_t k) const * * For EOS types other than cIdealSolidSolnPhase1, the default * kmol/m3 holds for standard concentration units. For - * cIdealSolidSolnPhase0 type, the standard concentrtion is + * cIdealSolidSolnPhase0 type, the standard concentration is * unitless. */ void IdealSolnGasVPSS::getUnitsStandardConc(double* uA, int, int sizeUA) const diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index 1601e9c4c..39a9ce0ec 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -56,7 +56,7 @@ IonsFromNeutralVPSSTP::IonsFromNeutralVPSSTP() : //==================================================================================================================== // Construct and initialize an IonsFromNeutralVPSSTP object -// directly from an asci input file +// directly from an ASCII input file /* * Working constructors * @@ -451,7 +451,7 @@ IonsFromNeutralVPSSTP::getChemPotentials(doublereal* mu) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -491,7 +491,7 @@ void IonsFromNeutralVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 2613389d7..c6bd7c4a9 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -455,7 +455,7 @@ doublereal MargulesVPSSTP::cv_mole() const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -495,7 +495,7 @@ void MargulesVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????? \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -534,7 +534,7 @@ void MargulesVPSSTP::getPartialMolarCp(doublereal* cpbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index 457c02001..86a048198 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -39,7 +39,7 @@ MetalSHEelectrons::MetalSHEelectrons(): } //==================================================================================================================== // Create and initialize a MetalSHEelectrons ThermoPhase object -// from an asci input file +// from an ASCII input file /* * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index 5746d7e9f..f63ff3a0a 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -40,7 +40,7 @@ MineralEQ3::MineralEQ3(): } // Create and initialize a MineralEQ3 ThermoPhase object -// from an asci input file +// from an ASCII input file /* * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index be4607836..6fc969ccd 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -455,7 +455,7 @@ doublereal MixedSolventElectrolyte::cv_mole() const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -495,7 +495,7 @@ void MixedSolventElectrolyte::getPartialMolarEnthalpies(doublereal* hbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????? \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -534,7 +534,7 @@ void MixedSolventElectrolyte::getPartialMolarCp(doublereal* cpbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 3ec7f13bd..127afe684 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -94,13 +94,13 @@ MixtureFugacityTP::operator=(const MixtureFugacityTP& b) m_s0_R = b.m_s0_R; /* * The VPSSMgr object contains shallow pointers. Whenever you have shallow - * pointers, they have to be fixed up to point to the correct objects refering + * pointers, they have to be fixed up to point to the correct objects referring * back to this ThermoPhase's properties. */ //m_VPSS_ptr->initAllPtrs(this, m_spthermo); /* * The PDSS objects contains shallow pointers. Whenever you have shallow - * pointers, they have to be fixed up to point to the correct objects refering + * pointers, they have to be fixed up to point to the correct objects referring * back to this ThermoPhase's properties. This function also sets m_VPSS_ptr * so it occurs after m_VPSS_ptr is set. */ diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index 51335e326..5e023ef80 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -352,7 +352,7 @@ void MolarityIonicVPSSTP::getElectrochemPotentials(doublereal* mu) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -392,7 +392,7 @@ void MolarityIonicVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????? \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -431,7 +431,7 @@ void MolarityIonicVPSSTP::getPartialMolarCp(doublereal* cpbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h index 17afe0421..1704d8718 100644 --- a/src/thermo/NasaThermo.h +++ b/src/thermo/NasaThermo.h @@ -577,7 +577,7 @@ protected: /*! * This map takes as its index, the species index in the phase. * It returns the position index within the group, where the - * temperature polynomials for that species are storred. + * temperature polynomials for that species are stored. */ mutable std::map m_posInGroup_map; diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index d91cbcaca..9e37e6c2f 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -467,7 +467,7 @@ doublereal PhaseCombo_Interaction::cv_mole() const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -506,7 +506,7 @@ void PhaseCombo_Interaction::getPartialMolarEnthalpies(doublereal* hbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????? \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -545,7 +545,7 @@ void PhaseCombo_Interaction::getPartialMolarCp(doublereal* cpbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index 1f049fd86..d32c8e887 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -456,7 +456,7 @@ doublereal RedlichKisterVPSSTP::cv_mole() const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -496,7 +496,7 @@ void RedlichKisterVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????? \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -535,7 +535,7 @@ void RedlichKisterVPSSTP::getPartialMolarCp(doublereal* cpbar) const * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} diff --git a/src/thermo/RedlichKisterVPSSTP.h b/src/thermo/RedlichKisterVPSSTP.h index dee0e699e..7cc4029d9 100644 --- a/src/thermo/RedlichKisterVPSSTP.h +++ b/src/thermo/RedlichKisterVPSSTP.h @@ -533,7 +533,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * molality-based activity coefficent wrt temperature + * molality-based activity coefficient wrt temperature * * \f[ * \bar h_k(T,P) = h^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -551,7 +551,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * \bar s_k(T,P) = s^o_k(T,P) - R T^2 \frac{d \ln(\gamma_k)}{dT} @@ -571,7 +571,7 @@ public: * * For this phase, the partial molar enthalpies are equal to the * standard state enthalpies modified by the derivative of the - * activity coefficent wrt temperature + * activity coefficient wrt temperature * * \f[ * ??????????????? diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index ba18d046a..a383766ef 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -484,7 +484,7 @@ doublereal RedlichKwongMFTP::logStandardConc(size_t k) const * * For EOS types other than cIdealSolidSolnPhase1, the default * kmol/m3 holds for standard concentration units. For - * cIdealSolidSolnPhase0 type, the standard concentrtion is + * cIdealSolidSolnPhase0 type, the standard concentration is * unitless. */ void RedlichKwongMFTP::getUnitsStandardConc(double* uA, int, int sizeUA) const diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index ca5d4538c..ed7c7c765 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -577,7 +577,7 @@ protected: /*! * This map takes as its index, the species index in the phase. * It returns the position index within the group, where the - * temperature polynomials for that species are storred. + * temperature polynomials for that species are stored. */ mutable std::map m_posInGroup_map; }; diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index 5752a58f8..b98cc69ea 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -36,7 +36,7 @@ StoichSubstanceSSTP::StoichSubstanceSSTP(): } // Create and initialize a StoichSubstanceSSTP ThermoPhase object -// from an asci input file +// from an ASCII input file /* * @param infile name of the input file * @param id name of the phase id in the file. @@ -524,7 +524,7 @@ electrodeElectron::electrodeElectron(): } // Create and initialize a electrodeElectron ThermoPhase object -// from an asci input file +// from an ASCII input file /* * @param infile name of the input file * @param id name of the phase id in the file. diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index 1259dd99d..76b115f6b 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -102,13 +102,13 @@ VPStandardStateTP::operator=(const VPStandardStateTP& b) /* * The VPSSMgr object contains shallow pointers. Whenever you have shallow - * pointers, they have to be fixed up to point to the correct objects refering + * pointers, they have to be fixed up to point to the correct objects referring * back to this ThermoPhase's properties. */ m_VPSS_ptr->initAllPtrs(this, m_spthermo); /* * The PDSS objects contains shallow pointers. Whenever you have shallow - * pointers, they have to be fixed up to point to the correct objects refering + * pointers, they have to be fixed up to point to the correct objects referring * back to this ThermoPhase's properties. This function also sets m_VPSS_ptr * so it occurs after m_VPSS_ptr is set. */ diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp index 37b0de2b5..d224c7bb9 100644 --- a/src/transport/AqueousTransport.cpp +++ b/src/transport/AqueousTransport.cpp @@ -181,7 +181,7 @@ void AqueousTransport::getBinaryDiffCoeffs(const size_t ld, doublereal* const d) { update_T(); - // if necessary, evaluate the binary diffusion coefficents + // if necessary, evaluate the binary diffusion coefficients // from the polynomial fits if (!m_bindiff_ok) { updateDiff_T(); diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index 1ca2df89d..6d5b0f761 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -757,7 +757,7 @@ void LiquidTransport::getBinaryDiffCoeffs(size_t ld, doublereal* d) "First argument does not correspond to number of species in model.\nDiff Coeff matrix may be misdimensioned"); update_T(); - // if necessary, evaluate the binary diffusion coefficents + // if necessary, evaluate the binary diffusion coefficients // from the polynomial fits if (!m_diff_temp_ok) { updateDiff_T(); diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index d114b242b..516f97c0d 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -307,7 +307,7 @@ doublereal MixTransport::viscosity() void MixTransport::getBinaryDiffCoeffs(const size_t ld, doublereal* const d) { update_T(); - // if necessary, evaluate the binary diffusion coefficents from the polynomial fits + // if necessary, evaluate the binary diffusion coefficients from the polynomial fits if (!m_bindiff_ok) { updateDiff_T(); } diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index 8babd691a..1064fb23c 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -269,7 +269,7 @@ doublereal MultiTransport::viscosity() void MultiTransport::getBinaryDiffCoeffs(size_t ld, doublereal* d) { - // if necessary, evaluate the binary diffusion coefficents + // if necessary, evaluate the binary diffusion coefficients // from the polynomial fits updateDiff_T(); @@ -1038,7 +1038,7 @@ void MultiTransport::_update_thermal_T() * HKM Exploratory comment: * The translational component is 1.5 * The rotational component is 1.0 for a linear molecule and 1.5 for a nonlinear molecule - * and zero for a monotomic. + * and zero for a monatomic. * Chemkin has traditionally subtracted 1.5 here (SAND86-8246). * The original Dixon-Lewis paper subtracted 1.5 here. */ diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index ddfc4cade..76de7055f 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -463,7 +463,7 @@ void SimpleTransport::getBinaryDiffCoeffs(size_t ld, doublereal* d) double bdiff; update_T(); - // if necessary, evaluate the species diffusion coefficents + // if necessary, evaluate the species diffusion coefficients // from the polynomial fits if (!m_diff_temp_ok) { updateDiff_T(); diff --git a/test_problems/NASA9poly_test/NASA9poly_test.cpp b/test_problems/NASA9poly_test/NASA9poly_test.cpp index ea4ce9e50..373880dc9 100644 --- a/test_problems/NASA9poly_test/NASA9poly_test.cpp +++ b/test_problems/NASA9poly_test/NASA9poly_test.cpp @@ -45,7 +45,7 @@ int main(int argc, char** argv) std::auto_ptr tran(newTransportMgr("Mix", &g)); vector_fp Gvalues(nsp, 0.0); - printf("Viscoscity and thermal Cond vs. T\n"); + printf("Viscosity and thermal Cond vs. T\n"); for (int k = 0; k < 40; k++) { double T1 = 400. + 200. * k; g.setState_TPX(T1, pres, &Xset[0]); diff --git a/test_problems/NASA9poly_test/output_blessed.txt b/test_problems/NASA9poly_test/output_blessed.txt index 8c8408071..4296b6a92 100644 --- a/test_problems/NASA9poly_test/output_blessed.txt +++ b/test_problems/NASA9poly_test/output_blessed.txt @@ -4,7 +4,7 @@ Comparisons of H2 calculated via several equivalent classes: cp/R: 3.8823 3.8823 3.8823 H/RT: 2.91015 2.91015 2.91015 S/R: 21.5255 21.5255 21.5255 -Viscoscity and thermal Cond vs. T +Viscosity and thermal Cond vs. T 400 1.0869e-05 0.2291 600 1.4145e-05 0.29844 800 1.7036e-05 0.36333 diff --git a/test_problems/VCSnonideal/NaCl_equil/good_dout.txt b/test_problems/VCSnonideal/NaCl_equil/good_dout.txt index cd46016da..a42ce9058 100644 --- a/test_problems/VCSnonideal/NaCl_equil/good_dout.txt +++ b/test_problems/VCSnonideal/NaCl_equil/good_dout.txt @@ -169,7 +169,7 @@ Chemical Potentials: (J/kmol) --- CO2 ( 0) replaces H2 ( 0) as component 6 --- Total number of components found = 7 (ne = 11) ----------------------------------------------------------------------------- - --- Subroutine elem_rearrange() called to check stoich. coefficent matrix + --- Subroutine elem_rearrange() called to check stoich. coefficient matrix --- and to rearrange the element ordering once --- N ( 8) replaces Fe( 0) as element 3 --- Na( 5) replaces Si( 0) as element 4 @@ -262,7 +262,7 @@ VCS CALCULATION METHOD --- 12 OH- | 0| -0.00 -0.00 -1.00 0.00 1.00 0.00 0.00 ----------------------------------------------------------------------------- --- Subroutine vcs_deltag called for all noncomponents - --- Species Status decision is reavaluated: All species are minor except for: + --- Species Status decision is reevaluated: All species are minor except for: --- Major Species : NaCl(S) --- Major Species : N2 --- Major Species : H2O(L) @@ -275,7 +275,7 @@ VCS CALCULATION METHOD --- Zeroed Species in an active MS phase (tmp): H2O --- Zeroed Species in an active MS phase (tmp): NaCl --- Zeroed Species in an active MS phase (tmp): Cl- - --- OH is prevented from popping into existance because a needed component to be consumed, O2, has a zero mole number + --- OH is prevented from popping into existence because a needed component to be consumed, O2, has a zero mole number --- Zeroed Species in an active MS phase (Stoich Constraint): OH --- Zeroed Species in an active MS phase (tmp): OH- --- @@ -397,7 +397,7 @@ VCS CALCULATION METHOD --- 12 O2 | 5.5e-27| -0.00 -0.00 -2.00 0.00 0.00 2.00 -0.00 ----------------------------------------------------------------------------- --- Subroutine vcs_deltag called for all noncomponents - --- Species Status decision is reavaluated: All species are minor except for: + --- Species Status decision is reevaluated: All species are minor except for: --- Major Species : NaCl(S) --- Major Species : N2 --- Major Species : H2O(L) @@ -525,7 +525,7 @@ VCS CALCULATION METHOD --- 12 O2 | 5.5e-28| -0.00 -0.00 2.00 0.00 0.00 -4.00 0.00 ----------------------------------------------------------------------------- --- Subroutine vcs_deltag called for all noncomponents - --- Species Status decision is reavaluated: All species are minor except for: + --- Species Status decision is reevaluated: All species are minor except for: --- Major Species : NaCl(S) --- Major Species : N2 --- Major Species : H2O(L) diff --git a/test_problems/VCSnonideal/NaCl_equil/good_dout_dm.txt b/test_problems/VCSnonideal/NaCl_equil/good_dout_dm.txt index 9f1553c30..d64e8dfd4 100644 --- a/test_problems/VCSnonideal/NaCl_equil/good_dout_dm.txt +++ b/test_problems/VCSnonideal/NaCl_equil/good_dout_dm.txt @@ -162,7 +162,7 @@ Chemical Potentials: (J/kmol) --- CO2 ( 0) replaces H2 ( 0) as component 6 --- Total number of components found = 7 (ne = 11) ----------------------------------------------------------------------------- - --- Subroutine elem_rearrange() called to check stoich. coefficent matrix + --- Subroutine elem_rearrange() called to check stoich. coefficient matrix --- and to rearrange the element ordering once --- N ( 8) replaces Fe( 0) as element 3 --- Na( 5) replaces Si( 0) as element 4 diff --git a/test_problems/mixGasTransport/mixGasTransport.cpp b/test_problems/mixGasTransport/mixGasTransport.cpp index 62521cc7b..04a29b3ba 100644 --- a/test_problems/mixGasTransport/mixGasTransport.cpp +++ b/test_problems/mixGasTransport/mixGasTransport.cpp @@ -175,7 +175,7 @@ int main(int argc, char** argv) printf(" %15s %13.5g\n", sss.c_str(), thermDiff[k]); } - printf("Viscoscity and thermal Cond vs. T\n"); + printf("Viscosity and thermal Cond vs. T\n"); for (k = 0; k < 10; k++) { T1 = 400. + 100. * k; g.setState_TPX(T1, pres, DATA_PTR(Xset)); diff --git a/test_problems/mixGasTransport/output_blessed.txt b/test_problems/mixGasTransport/output_blessed.txt index 3b3084806..253a2c3fa 100644 --- a/test_problems/mixGasTransport/output_blessed.txt +++ b/test_problems/mixGasTransport/output_blessed.txt @@ -160,7 +160,7 @@ C3H8 0 CH2CHO 0 CH3CHO 0 -Viscoscity and thermal Cond vs. T +Viscosity and thermal Cond vs. T 400 1.9759e-05 0.064074 500 2.3573e-05 0.076325 600 2.7136e-05 0.088306 diff --git a/test_problems/multiGasTransport/multiGasTransport.cpp b/test_problems/multiGasTransport/multiGasTransport.cpp index c8c93f85f..b8388c935 100644 --- a/test_problems/multiGasTransport/multiGasTransport.cpp +++ b/test_problems/multiGasTransport/multiGasTransport.cpp @@ -184,7 +184,7 @@ int main(int argc, char** argv) printf(" %15s %13.5g\n", sss.c_str(), ddd); } - printf("Viscoscity and thermal Cond vs. T\n"); + printf("Viscosity and thermal Cond vs. T\n"); for (k = 0; k < 10; k++) { T1 = 400. + 100. * k; g.setState_TPX(T1, pres, DATA_PTR(Xset)); diff --git a/test_problems/multiGasTransport/output_blessed.txt b/test_problems/multiGasTransport/output_blessed.txt index 65f0b2be7..ac681e999 100644 --- a/test_problems/multiGasTransport/output_blessed.txt +++ b/test_problems/multiGasTransport/output_blessed.txt @@ -160,7 +160,7 @@ C3H8 0 CH2CHO 0 CH3CHO 0 -Viscoscity and thermal Cond vs. T +Viscosity and thermal Cond vs. T 400 1.9759e-05 0.063366 500 2.3573e-05 0.075886 600 2.7136e-05 0.087831