diff --git a/include/cantera/Interface.h b/include/cantera/Interface.h index 00c40a42b..14ad07408 100644 --- a/include/cantera/Interface.h +++ b/include/cantera/Interface.h @@ -14,7 +14,7 @@ namespace Cantera //! An interface between multiple bulk phases. /*! - * This class isdefined mostly for convenience. It inherits both from + * This class is defined mostly for convenience. It inherits both from * Cantera::SurfPhase and Cantera::InterfaceKinetics. It therefore * represents a surface phase, and also acts as the kinetics * manager to manage reactions occurring on the surface, possibly diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h index 7a51aa0e2..35496e858 100644 --- a/include/cantera/base/Array.h +++ b/include/cantera/base/Array.h @@ -361,7 +361,7 @@ public: protected: - //! Data storred in a single array + //! Data stored in a single array vector_fp m_data; //! Number of rows diff --git a/include/cantera/base/PrintCtrl.h b/include/cantera/base/PrintCtrl.h index 3c104db87..6d7fb083d 100644 --- a/include/cantera/base/PrintCtrl.h +++ b/include/cantera/base/PrintCtrl.h @@ -4,7 +4,7 @@ * (see \ref Cantera::PrintCtrl). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -24,7 +24,7 @@ namespace Cantera * printing out real numbers to files and to standard output. * Specifically, it can make sure that a max and min field * width is honored when conducting IO of numbers and strings. - * Basically, its the spot to house all wrappers around + * Basically, it's the spot to house all wrappers around * commonly used printing facilities. * * It can also handle cropping of numbers below a certain @@ -36,11 +36,11 @@ namespace Cantera * * 1.12345E-19 * - * whould be cropped to the value + * would be cropped to the value * * 1.1000E-19 * - * The class wraps aroud a single std::ostream class. It's + * The class wraps around a single std::ostream class. Its * cropping functions are also available as a "double" * conversion utility. * diff --git a/include/cantera/base/clockWC.h b/include/cantera/base/clockWC.h index 84c24debc..a26c1f2f2 100644 --- a/include/cantera/base/clockWC.h +++ b/include/cantera/base/clockWC.h @@ -4,7 +4,7 @@ * (see \ref Cantera::clockWC). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -32,7 +32,7 @@ namespace Cantera * at regular intervals for the seconds timer to be accurate. * * An example of how to use the timer is given below. timeToDoCalcs - * countains the wall clock time calculated for the operation. + * contains the wall clock time calculated for the operation. * * * @code @@ -76,7 +76,7 @@ private: */ unsigned int clock_rollovers; - //! Counter countaining the value of the number of ticks from + //! Counter containing the value of the number of ticks from //! the first call (or the reset call). clock_t start_ticks; diff --git a/include/cantera/base/ctexceptions.h b/include/cantera/base/ctexceptions.h index 87ad4266e..0b0b5f5c0 100644 --- a/include/cantera/base/ctexceptions.h +++ b/include/cantera/base/ctexceptions.h @@ -54,7 +54,7 @@ namespace Cantera * * Their first argument is a boolean. If the boolean is not true, a * CanteraError is thrown, with descriptive information indicating - * where the error occured. These functions may be eliminated from + * where the error occurred. These functions may be eliminated from * the source code, if the -DNDEBUG option is specified to the * compiler. * @@ -193,7 +193,7 @@ void removeAtVersion(std::string func, std::string version); /*! * Assertion must be true or else a CanteraError is thrown. A diagnostic string containing the * file and line number, indicating where the error - * occured is added to the thrown object. + * occurred is added to the thrown object. * * @param expr Boolean expression that must be true * @@ -206,7 +206,7 @@ void removeAtVersion(std::string func, std::string version); //! Assertion must be true or an error is thrown /*! * Assertion must be true or else a CanteraError is thrown. A diagnostic string indicating where the error - * occured is added to the thrown object. + * occurred is added to the thrown object. * * @param expr Boolean expression that must be true * @param procedure Character string or std:string expression indicating the procedure where the assertion failed @@ -219,13 +219,13 @@ void removeAtVersion(std::string func, std::string version); //! Assertion must be true or an error is thrown /*! * Assertion must be true or else a CanteraError is thrown. A - * diagnostic string indicating where the error occured is added + * diagnostic string indicating where the error occurred is added * to the thrown object. * * @param expr Boolean expression that must be true * @param procedure Character string or std:string expression indicating * the procedure where the assertion failed - * @param message Character string or std:string expression contaiing + * @param message Character string or std:string expression containing * a descriptive message is added to the thrown error condition. * * @ingroup errorhandling diff --git a/include/cantera/base/ctml.h b/include/cantera/base/ctml.h index a565fd662..1280dfc02 100644 --- a/include/cantera/base/ctml.h +++ b/include/cantera/base/ctml.h @@ -41,7 +41,7 @@ extern std::string INT_Format; * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; std::string titleString = "doSpecialOp"; @@ -77,7 +77,7 @@ void addBool(Cantera::XML_Node& node, const std::string& titleString, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; std::string titleString = "maxIterations"; @@ -121,7 +121,7 @@ void addInteger(Cantera::XML_Node& node, const std::string& titleString, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; std::string titleString = "activationEnergy"; @@ -175,7 +175,7 @@ void addFloat(Cantera::XML_Node& node, const std::string& titleString, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; std::string titleString = "additionalCases"; @@ -233,7 +233,7 @@ void addIntegerArray(Cantera::XML_Node& node, const std::string& titleString, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; std::string titleString = "additionalTemperatures"; @@ -299,7 +299,7 @@ void addNamedFloatArray(Cantera::XML_Node& parentNode, const std::string& name, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; addString(XML_Node& node, std::string titleString, std::string valueString, @@ -340,7 +340,7 @@ void addString(Cantera::XML_Node& node, const std::string& titleString, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; vector_fp v; @@ -511,7 +511,7 @@ void getMatrixValues(const Cantera::XML_Node& node, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; std::map v; @@ -552,7 +552,7 @@ void getIntegers(const Cantera::XML_Node& node, std::map& v); * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; @@ -587,7 +587,7 @@ doublereal getFloat(const Cantera::XML_Node& parent, const std::string& name, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; @@ -622,7 +622,7 @@ doublereal getFloatCurrent(const Cantera::XML_Node& currXML, const std::string t * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; @@ -663,7 +663,7 @@ bool getOptionalFloat(const Cantera::XML_Node& parent, const std::string& name, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; std::map v; @@ -703,7 +703,7 @@ void getFloats(const Cantera::XML_Node& node, std::map& v, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; int number = 1; @@ -733,7 +733,7 @@ int getInteger(const Cantera::XML_Node& parent, std::string name); * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; @@ -768,11 +768,11 @@ doublereal getFloatDefaultUnits(const Cantera::XML_Node& parent, std::string nam * * Example: * - * Code snipet: + * Code snippet: * @verbatim std::string modelName = ""; bool exists = getOptionalModel(transportNode, "compositionDependence", - modelName); + modelName); @endverbatim * * reads the corresponding XML file: @@ -810,7 +810,7 @@ bool getOptionalModel(const Cantera::XML_Node& parent, const std::string nodeNam * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; vector_fp v; @@ -868,7 +868,7 @@ Cantera::XML_Node* getByTitle(const Cantera::XML_Node& node, const std::string& * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &node; getString(XML_Node& node, std::string titleString, std::string valueString, @@ -902,30 +902,30 @@ void getString(const Cantera::XML_Node& node, const std::string& titleString, * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string valueString; std::string typeString; std::string nameString = "timeIncrement"; getString(XML_Node& node, nameString, valueString, valueString, typeString); - @endverbatum + @endverbatim * * Reads the following the snippet in the XML file: * - * * @verbatum + * * @verbatim valueString <\nameString> - @endverbatum + @endverbatim * * or alternatively as a retrofit and special case, it also reads the following case * - * @verbatum + * @verbatim valueString <\string> - @endverbatum + @endverbatim * * @param node Reference to the XML_Node object of the parent XML element * @param nameString Name of the XML Node input variable @@ -942,7 +942,7 @@ void getNamedStringValue(const Cantera::XML_Node& node, const std::string& nameS /*! * If the child XML_node named "name" doesn't exist, the empty string is returned. * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &parent; string nameString = "vacency_species"; @@ -961,7 +961,7 @@ void getNamedStringValue(const Cantera::XML_Node& node, const std::string& nameS @endverbatim * * @param parent parent reference to the XML_Node object of the parent XML element - * @param nameString Name of the childe XML_Node to read the value from. + * @param nameString Name of the child XML_Node to read the value from. * * @return String value of the child XML_Node */ diff --git a/include/cantera/base/global.h b/include/cantera/base/global.h index 182d1224f..4a91690c4 100644 --- a/include/cantera/base/global.h +++ b/include/cantera/base/global.h @@ -125,7 +125,7 @@ void popError(); * Additional directories may be added by calling function addDirectory. * * There are two different types of input files within %Cantera: - * ctml: This is an xml file layed out in such a way that %Cantera can + * ctml: This is an xml file laid out in such a way that %Cantera can * interpret the contents. * cti: A human-readable ascii format for information that %Cantera * will read. @@ -133,7 +133,7 @@ void popError(); * %Cantera can take its input from both types of files. However, given * a file in cti format, the initial operation that %Cantera will perform * is to translate the cti file into a ctml file. - * The translation is carried out via a system call to a python interpretor + * The translation is carried out via a system call to a python interpreter * program that actually carries out the translation. In general, a new * ctml file is created by the translation that is written to the current * local directory. @@ -213,7 +213,7 @@ std::string canteraRoot(); //! Sets the temporary file directory. /*! * The default is to use the - * directory specified by enviroment variable TMP or TEMP. If neither + * directory specified by environment variable TMP or TEMP. If neither * of these are defined, then the current working directory will be * used for temporary files. Call this function to specify some other * place to put temporary files. @@ -516,7 +516,7 @@ inline void write_logfile(std::string file = "log.html") {} * Searches are based on the * ID attribute of the XML element only. * - * @param file_ID This is a concatenation of two strings seperated + * @param file_ID This is a concatenation of two strings separated * by the "#" character. The string before the * pound character is the file name of an xml * file to carry out the search. The string after @@ -547,7 +547,7 @@ XML_Node* get_XML_Node(const std::string& file_ID, XML_Node* root); * * @param nameTarget This is the XML element name to look for. * - * @param file_ID This is a concatenation of two strings seperated + * @param file_ID This is a concatenation of two strings separated * by the "#" character. The string before the * pound character is the file name of an xml * file to carry out the search. The string after diff --git a/include/cantera/base/logger.h b/include/cantera/base/logger.h index a938839e1..0a132b734 100644 --- a/include/cantera/base/logger.h +++ b/include/cantera/base/logger.h @@ -71,7 +71,7 @@ public: //! Write an error message and quit. /*! * The default behavior is - * to write to the standard eror stream, and then call + * to write to the standard error stream, and then call * exit(). Note that no end-of-line character is appended to * the message, and so if one is desired it must be included * in the string. Note that this default behavior will diff --git a/include/cantera/base/mdp_allo.h b/include/cantera/base/mdp_allo.h index 458062578..fdffe1a76 100644 --- a/include/cantera/base/mdp_allo.h +++ b/include/cantera/base/mdp_allo.h @@ -9,7 +9,7 @@ * $Date$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -273,18 +273,18 @@ extern int** mdp_alloc_int_2(int len1, int len2, * less than one, it is set to one. Therefore, * This routine always initializes at least * one double. - * @param val intialization value. Set it to the + * @param val initialization value. Set it to the * constant MDP_DBL_NOINIT if you don't * want any initialization. memset() is * used for zero initialization for fast * execution speed. * - * @return Pointer to the intialized array of doubles + * @return Pointer to the initialized array of doubles * Failures are indicated by returning the NULL pointer. */ extern double* mdp_alloc_dbl_1(int nvalues, const double val=MDP_DBL_NOINIT); -//! Allocates and/or initialises a one dimensional array of doubles. +//! Allocates and/or initializes a one dimensional array of doubles. /*! * This routine will free any old memory that was located at that * position, before it will allocate a new vector. @@ -334,7 +334,7 @@ extern void mdp_realloc_dbl_1(double** hndVec, int newLen, int oldLen, * ------- * @param ndim1 Length of the first dimension of the array * @param ndim2 Length of the second dimension of the array - * @param val Intialization value + * @param val Initialization value * * * @return Pointer to the initialized array of doubles. @@ -356,7 +356,7 @@ extern double** mdp_alloc_dbl_2(int ndim1, int ndim2, const double val); * ------- * @param ndim1 Length of the first dimension of the array * @param ndim2 Length of the second dimension of the array - * @param val Intialization value + * @param val Initialization value * @param arrayHndl Handle to the array. If nonnull, the array * is first freed. Failures are indicated * by returning the NULL pointer. @@ -406,9 +406,9 @@ extern void mdp_realloc_dbl_2(double** * hndArray, int ndim1, int ndim2, * Input * ------- * @param nvalues Length of the array - * @param val intialization value. defaults to the NULL char + * @param val initialization value. defaults to the NULL char * - * @return Pointer to the intialized character array + * @return Pointer to the initialized character array * Failures are indicated by returning the NULL pointer. */ extern char* mdp_alloc_char_1(int nvalues, const char val = '\0'); @@ -425,9 +425,9 @@ extern char* mdp_alloc_char_1(int nvalues, const char val = '\0'); * holds the old and (eventually new) * address of the array of char to be reallocated * @param nvalues Length of the array - * @param val intialization value. defaults to the NULL char + * @param val initialization value. defaults to the NULL char * - * @return Pointer to the intialized character array + * @return Pointer to the initialized character array * Failures are indicated by returning the NULL pointer. */ extern void mdp_safe_alloc_char_1(char** arrayHnd, int nvalues, @@ -612,7 +612,7 @@ extern void mdp_copy_dbl_1(double* const copyTo, /*! * This routine carries out a straight copy on the effective 1D description * of each of the arrays. It copies - * the first len1*len2 doubless storred within copyFrom into the + * the first len1*len2 doubless stored within copyFrom into the * the first len1*len2 double slots in copyTo. It does not account * for the actual dimensions of the two arrays. * @@ -646,7 +646,7 @@ extern void mdp_copy_int_1(int* const copyTo, const int* const copyFrom, //! Copies one 2D int array into another 2D int array /*! * This routine carries out a straight copy. Actually it copies - * the first len1*len2 ints storred within copyFrom into the + * the first len1*len2 ints stored within copyFrom into the * the first len1*len2 int slots in copyTo. It does not account * for the actual dimensions of the two arrays. * diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h index b60c9eebe..20374f6d5 100644 --- a/include/cantera/base/utilities.h +++ b/include/cantera/base/utilities.h @@ -10,7 +10,7 @@ * * These are templates to perform various simple operations on arrays. * Note that the compiler will inline these, so using them carries no - * performnce penalty. + * performance penalty. */ #ifndef CT_UTILITIES_H @@ -27,7 +27,7 @@ template struct timesConstant : public std::unary_function { //! Constructor /*! * @param c Constant of templated type T - * that will be storred internally within the object + * that will be stored internally within the object * and used in the multiplication operation */ timesConstant(T c) : m_c(c) {} @@ -35,7 +35,7 @@ template struct timesConstant : public std::unary_function { //! Parenthesis operator returning a double /*! * @param x Variable of templated type T that will be - * used in the mulitplication operator + * used in the multiplication operator * * @return Returns a value of type double from the internal * multiplication @@ -44,7 +44,7 @@ template struct timesConstant : public std::unary_function { return m_c * x; } - //! Storred constant value of time T + //! Stored constant value of time T T m_c; }; @@ -69,7 +69,7 @@ inline doublereal dot4(const V& x, const V& y) } -//! Tempalted Inner product of two vectors of length 5 +//! Templated Inner product of two vectors of length 5 /*! * If either \a x * or \a y has length greater than 4, only the first 4 elements @@ -87,7 +87,7 @@ inline doublereal dot5(const V& x, const V& y) x[4]*y[4]; } -//! Tempalted Inner product of two vectors of length 6 +//! Templated Inner product of two vectors of length 6 /*! * If either \a x * or \a y has length greater than 4, only the first 4 elements @@ -457,7 +457,7 @@ inline void scatter_copy(InputIter begin, InputIter end, * iterator class InputIter. The difference between end and begin * determines the number of inner iterations. * @param data Iterator pointing to the beginning of the output vector, belonging to the - * iterator class RandAccessIter, that will be selectively multipied. + * iterator class RandAccessIter, that will be selectively multiplied. * @param index Iterator pointing to the beginning of the index vector, belonging to the * iterator class IndexIter. */ diff --git a/include/cantera/base/xml.h b/include/cantera/base/xml.h index 202404935..55fa13f9f 100644 --- a/include/cantera/base/xml.h +++ b/include/cantera/base/xml.h @@ -93,7 +93,7 @@ public: int findQuotedString(const std::string& aline, std::string& rstring) const; //! parseTag parses XML tags, i.e., the XML elements that are - //! inbetween angle brackets. + //! in between angle brackets. /*! * @param tag Tag to be parsed - input * @@ -215,7 +215,7 @@ public: */ XML_Node& mergeAsChild(XML_Node& node); - // Add a child node to the current node by makeing a copy of an existing node tree + // Add a child node to the current node by making a copy of an existing node tree /* * This will add an XML_Node as a child to the current node. * Note, this actually adds the node. Therefore, node is changed. @@ -391,7 +391,7 @@ public: //! Function returns the value of an attribute /*! - * This function searches the attibutes vector for the parameter + * This function searches the attributes vector for the parameter * std::string attribute. If a match is found, the attribute value * is returned as a string. If no match is found, the empty string * is returned. @@ -422,7 +422,7 @@ private: public: - //! Returns an unchangeable value of the attributs map for the current node + //! Returns an unchangeable value of the attributes map for the current node /*! * * @return Returns an unchangeable reference to the attributes map @@ -715,7 +715,7 @@ public: //! 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. * copyUnion() doesn't duplicate existing entries in the * destination XML_Node tree. diff --git a/include/cantera/equil/ChemEquil.h b/include/cantera/equil/ChemEquil.h index 54d3f8395..559fdb9f8 100644 --- a/include/cantera/equil/ChemEquil.h +++ b/include/cantera/equil/ChemEquil.h @@ -85,7 +85,7 @@ class PropertyCalculator; * condensed phases. As expected, the ChemEquil solver is faster * than MultiPhaseEquil for many single-phase equilibrium * problems (particularly if there are only a few elements but - * vvery many species), but can be less stable. Problem + * very many species), but can be less stable. Problem * situations include low temperatures where only a few species * have non-zero mole fractions, precisely stoichiometric * compositions (e.g. 2 H2 + O2). In general, if speed is diff --git a/include/cantera/equil/MultiPhase.h b/include/cantera/equil/MultiPhase.h index c50b80786..f0a41266f 100644 --- a/include/cantera/equil/MultiPhase.h +++ b/include/cantera/equil/MultiPhase.h @@ -556,7 +556,7 @@ public: //! Update the locally-stored composition within this object //! to match the current compositions of the phase objects. /*! - * Query the underlying ThermoPhase objects for their moel + * Query the underlying ThermoPhase objects for their mole * fractions and fill in the mole fraction vector of this * current object. Adjust element compositions within this * object to match. @@ -576,7 +576,7 @@ public: * * This is an download operation in the sense that we are taking * upstream object information (MultiPhase object) and - * applying it to downstrean objects (ThermoPhase object information) + * applying it to downstream objects (ThermoPhase object information) * * Therefore, the term, "update", is appropriate for a downstream * operation. @@ -609,7 +609,7 @@ private: array_t m_atoms; /** - * Locally storred vector of mole fractions of all species + * Locally stored vector of mole fractions of all species * comprising the MultiPhase object. */ vector_fp m_moleFractions; @@ -816,7 +816,7 @@ size_t BasisOptimize(int* usedZeroedSpecies, bool doFormRxn, * This routine borrows heavily from BasisOptimize algorithm. It * finds nc constraints which span the range space of the Component * Formula matrix, and assigns them as the first nc components in the - * formular matrix. This guarrantees that BasisOptimize has a + * formula matrix. This guarantees that BasisOptimize has a * nonsingular matrix to invert. * input * @param nComponents Number of components calculated previously. @@ -830,7 +830,7 @@ size_t BasisOptimize(int* usedZeroedSpecies, bool doFormRxn, * to extract the component basis of the mphase object. * * output - * @param orderVectorElements Ouput vector containing the order + * @param orderVectorElements Output vector containing the order * of the elements that is necessary for * calculation of the formula matrix. * diff --git a/include/cantera/equil/equil.h b/include/cantera/equil/equil.h index a88adb656..42bb93191 100644 --- a/include/cantera/equil/equil.h +++ b/include/cantera/equil/equil.h @@ -42,7 +42,7 @@ namespace Cantera * @param s ThermoPhase object that will be equilibrated. * @param XY String representation of what two properties * are being held constant - * @param solver ID of the solver to be used to equlibrate the phase. + * @param solver ID of the solver to be used to equilibrate the phase. * If solver = 0, the ChemEquil solver will be used, * and if solver = 1, the * MultiPhaseEquil solver will be used (slower than ChemEquil, diff --git a/include/cantera/equil/vcs_MultiPhaseEquil.h b/include/cantera/equil/vcs_MultiPhaseEquil.h index 2d7cc2e0b..d0ea7dcf7 100644 --- a/include/cantera/equil/vcs_MultiPhaseEquil.h +++ b/include/cantera/equil/vcs_MultiPhaseEquil.h @@ -346,7 +346,7 @@ public: } //! Equilibrate the solution using the current element abundances - //! storred in the MultiPhase object + //! stored in the MultiPhase object /*! * Use the vcs algorithm to equilibrate the current multiphase * mixture. @@ -379,7 +379,7 @@ public: int maxsteps = VCS_MAXSTEPS, int loglevel=-99); //! Equilibrate the solution using the current element abundances - //! storred in the MultiPhase object using constant T and P + //! stored in the MultiPhase object using constant T and P /*! * Use the vcs algorithm to equilibrate the current multiphase * mixture. @@ -409,12 +409,12 @@ public: int maxsteps = VCS_MAXSTEPS, int loglevel=-99); //! Equilibrate the solution using the current element abundances - //! storred in the MultiPhase object using either constant H and P + //! stored in the MultiPhase object using either constant H and P //! or constant U and P. /*! * Use the vcs algorithm to equilibrate the current multiphase * mixture. The pressure of the calculation is taken from - * the current pressure storred with the MultiPhase object. + * the current pressure stored with the MultiPhase object. * * @param Htarget Value of the total mixture enthalpy or total * internal energy that will be @@ -463,11 +463,11 @@ public: int maxsteps = VCS_MAXSTEPS, int loglevel=-99); //! Equilibrate the solution using the current element abundances - //! storred in the MultiPhase object using constant S and P. + //! stored in the MultiPhase object using constant S and P. /*! * Use the vcs algorithm to equilibrate the current multiphase * mixture. The pressure of the calculation is taken from - * the current pressure storred with the MultiPhase object. + * the current pressure stored with the MultiPhase object. * * @param Starget Value of the total mixture entropy * that will be @@ -515,12 +515,12 @@ public: //! Equilibrate the solution using the current element abundances - //! storred in the MultiPhase object using constant V and constant + //! stored in the MultiPhase object using constant V and constant //! T, H, U, or S. /*! * Use the vcs algorithm to equilibrate the current multiphase * mixture. The pressure of the calculation is taken from - * the current pressure storred with the MultiPhase object. + * the current pressure stored with the MultiPhase object. * * * @param XY Integer flag indicating what is held constant. @@ -592,7 +592,7 @@ public: */ size_t numComponents() const; - //! Reports the number of element contraints in the equilibration problem + //! Reports the number of element constraints in the equilibration problem /*! * @return returns the number of element constraints. If an equilibrium * problem hasn't been solved yet, it returns -1. diff --git a/include/cantera/equil/vcs_defs.h b/include/cantera/equil/vcs_defs.h index 21be5d59b..12a2b4473 100644 --- a/include/cantera/equil/vcs_defs.h +++ b/include/cantera/equil/vcs_defs.h @@ -3,7 +3,7 @@ * Defines and definitions within the vcs package */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -143,14 +143,14 @@ namespace VCSnonideal //! Species is a major species /*! * A major species is either a species in a multicomponent phase with - * significant concentration or its a Stoich Phase + * significant concentration or it's a Stoich Phase */ #define VCS_SPECIES_MAJOR 1 //! Species is a major species /*! * A major species is either a species in a multicomponent phase with - * significant concentration or its a Stoich Phase + * significant concentration or it's a Stoich Phase */ #define VCS_SPECIES_MINOR 0 @@ -215,7 +215,7 @@ namespace VCSnonideal //! but species concentration is zero due to stoich constraint /*! * The species lies in a multicomponent phase which currently does exist. Its concentration is currently - * identically zero, though the phase exists. This is a permament condition due to stoich constraints. + * identically zero, though the phase exists. This is a permanent condition due to stoich constraints. * * An example of this would be a species that contains Ni. But, * the amount of Ni elements in the current problem statement is exactly zero. @@ -336,7 +336,7 @@ namespace VCSnonideal * We seek here to say that some functional groups or ionic states should be * treated as if they are separate elements given the time scale of the problem. * This will be abs positive constraint. We have not implemented any examples yet. - * A requirement will be that we must be able to add and subtract these contraints. + * A requirement will be that we must be able to add and subtract these constraints. */ #define VCS_ELEM_TYPE_KINETICFROZEN 4 @@ -375,7 +375,7 @@ namespace VCSnonideal /*! * @name Types of State Calculations within VCS * These values determine where the - * results are storred within the VCS_SOLVE + * results are stored within the VCS_SOLVE * object. * @{ */ diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 5c437c8bb..32ae188d7 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -534,7 +534,7 @@ public: * 4 SFLUX_TRANSIENT * The default is -1, which means that the program * will decide. - * @param timeScaleOverride When a psuedo transient is + * @param timeScaleOverride When a pseudo transient is * selected this value can be used to override * the default time scale for integration which * is one. @@ -611,7 +611,7 @@ public: * * While conceptually not needed since kinetics is consistent with thermo when taken as a whole, * in practice it has found to be very useful to turn off the creation of phases which shouldn't - * be forming. Typically thais can reduce the oscillations in phase formation and destruction + * be forming. Typically this can reduce the oscillations in phase formation and destruction * which are observed. * * @param iphase Index of the phase. This is the order within the internal thermo vector object @@ -693,7 +693,7 @@ protected: //! m_rrxn is a vector of maps, containing the reactant - //! stochiometric coefficient information + //! stoichiometric coefficient information /*! * m_rrxn has a length * equal to the total number of species in the kinetics @@ -706,7 +706,7 @@ protected: mutable std::vector > m_rrxn; //! m_prxn is a vector of maps, containing the reactant - //! stochiometric coefficient information + //! stoichiometric coefficient information /** * m_prxn is a vector of maps. m_prxn has a length * equal to the total number of species in the kinetics @@ -777,7 +777,7 @@ protected: //! Vector temporary /*! - * Length is number of reactions. it's used to store the + * Length is number of reactions. It's used to store the * voltage contribution to the activation energy. */ vector_fp m_rwork; @@ -806,7 +806,7 @@ protected: //! Vector of reaction indexes specifying the id of the current transfer reactions //! in the mechanism /*! - * Vector of reaction indecices which involve current transfers. This provides + * Vector of reaction indices which involve current transfers. This provides * an index into the m_beta array. * * irxn = m_ctrxn[i] diff --git a/include/cantera/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h index 3f86f31fc..5297e80ac 100644 --- a/include/cantera/kinetics/Kinetics.h +++ b/include/cantera/kinetics/Kinetics.h @@ -29,7 +29,7 @@ class ReactionData; /// /// A kinetics manager is a C++ class that implements a kinetics /// model; a kinetics model is a set of mathematical equation -/// describing how various kinetic quanities are to be computed -- +/// describing how various kinetic quantities are to be computed -- /// reaction rates, species production rates, etc. Many different /// kinetics models might be defined to handle different types of /// kinetic processes. For example, one kinetics model might use @@ -187,7 +187,7 @@ public: * own the ThermoPhase objects. After a duplication, we need to point to different * ThermoPhase objects. * - * We check that the ThermoPhase objects are alligned in the same order and have + * We check that the ThermoPhase objects are aligned in the same order and have * the following identical properties to the ones that they are replacing. * id() * eosType() @@ -256,7 +256,7 @@ public: * This returns the integer index of the phase which has * ThermoPhase type cSurf. For heterogeneous mechanisms, this * identifies the one surface phase. For homogeneous - * mechanisms, this reurns -1. + * mechanisms, this returns -1. */ size_t surfacePhaseIndex() { return m_surfphase; @@ -353,7 +353,7 @@ public: * flat arrays, with the species of each phases following one * another, in the order the phases were added. This method * is useful to find the value for a particular species of a - * particular phase in arrrays returned from methods like + * particular phase in arrays returned from methods like * getCreationRates that return an array of species-specific * quantities. * @@ -794,7 +794,7 @@ public: * on many issues. @todo DGG: recommend changing name to * getFwdRateCoefficients. * - * @param kfwd Output vector containing the foward reaction rate constants. + * @param kfwd Output vector containing the forward reaction rate constants. * Length: m_ii. */ virtual void getFwdRateConstants(doublereal* kfwd) { @@ -1010,7 +1010,7 @@ protected: * This is a vector of vectors containing the products for * each reaction. The outer vector is over the number of * reactions, m_ii. The inner vector is a list of species - * indeces. If the stoichiometric coefficient for a product is + * indices. If the stoichiometric coefficient for a product is * greater than one, then the reactant is listed contiguously * in the vector a number of times equal to its stoichiometric * coefficient. diff --git a/include/cantera/kinetics/ReactionStoichMgr.h b/include/cantera/kinetics/ReactionStoichMgr.h index 450645ac7..a2aeab9a7 100644 --- a/include/cantera/kinetics/ReactionStoichMgr.h +++ b/include/cantera/kinetics/ReactionStoichMgr.h @@ -90,7 +90,7 @@ public: * - products: (1) * * @param rxn Reaction number. This number will be used as the index - * into the rate of progess vector in the methods below. + * into the rate of progress vector in the methods below. * @param reactants vector of integer reactant indices * @param products vector of integer product indices * @param reversible true if the reaction is reversible, false otherwise diff --git a/include/cantera/kinetics/importKinetics.h b/include/cantera/kinetics/importKinetics.h index 702c4b322..623c65d45 100644 --- a/include/cantera/kinetics/importKinetics.h +++ b/include/cantera/kinetics/importKinetics.h @@ -6,7 +6,7 @@ * This file contains routines which are global routines, i.e., * not part of any object. These routine take as input, ctml * pointers to data, and pointers to %Cantera objects. The purpose - * of these routines is to intialize the %Cantera objects with data + * of these routines is to initialize the %Cantera objects with data * from the ctml tree structures. */ // Copyright 2002 California Institute of Technology @@ -106,10 +106,10 @@ bool getReagents(const XML_Node& rxn, kinetics_t& kin, int rp, * * @param kf XML_Node containing information about the rate coefficients. * @param kin kinetics manager - * @param rdata ReactionData referece + * @param rdata ReactionData reference * @param negA Boolean indicating whether negative A's are ok. * - * Trigger anexception for negative A unless specifically authorized. + * Trigger an exception for negative A unless specifically authorized. * * @ingroup kineticsmgr */ @@ -193,7 +193,7 @@ bool importKinetics(const XML_Node& phase, std::vector th, //!Build a single-phase ThermoPhase object with associated kinetics mechanism. /*! * In a single call, this routine initializes a ThermoPhase object and a - * homogenous kinetics object for a phase. + * homogeneous kinetics object for a phase. * * @param root pointer to the XML tree which will be searched to find the * XML phase element. @@ -201,7 +201,7 @@ bool importKinetics(const XML_Node& phase, std::vector th, * @param id Name of the phase to be searched for. * @param nm Name of the XML element. Should be "phase" * @param th Pointer to a bare ThermoPhase object, which will be initialized - * by this operaton. + * by this operation. * @param k Pointer to a bare Kinetics object, which will be initialized * by this operation to a homogeneous kinetics manager * @@ -236,7 +236,7 @@ bool buildSolutionFromXML(XML_Node& root, std::string id, std::string nm, * species database for the phase to be found * * @return - * Returns a pointer to teh XML node containing the species data. + * Returns a pointer to the XML node containing the species data. * * @ingroup inputfiles */ diff --git a/include/cantera/numerics/BandMatrix.h b/include/cantera/numerics/BandMatrix.h index 2b63c4c5f..c737562e7 100644 --- a/include/cantera/numerics/BandMatrix.h +++ b/include/cantera/numerics/BandMatrix.h @@ -31,7 +31,7 @@ namespace Cantera * Add-ons are available. However, they are not included here. Instead we just use the * stock LU decompositions. * - * This class is a derived class of the base class GeneralMatrix. However, withinin + * This class is a derived class of the base class GeneralMatrix. However, within * the oneD directory, the class is used as is, without reference to the GeneralMatrix * base type. */ @@ -53,7 +53,7 @@ public: * @param n size of the square matrix * @param kl band size on the lower portion of the matrix * @param ku band size on the upper portion of the matrix - * @param v intial value of all matrix components. + * @param v initial value of all matrix components. */ BandMatrix(size_t n, size_t kl, size_t ku, doublereal v = 0.0); @@ -79,7 +79,7 @@ public: * @param n size of the square matrix * @param kl band size on the lower portion of the matrix * @param ku band size on the upper portion of the matrix - * @param v intial value of all matrix components. + * @param v initial value of all matrix components. */ void resize(size_t n, size_t kl, size_t ku, doublereal v = 0.0); diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h index afc90031c..50e229d2e 100644 --- a/include/cantera/numerics/Func1.h +++ b/include/cantera/numerics/Func1.h @@ -81,8 +81,8 @@ public: //! Routine to determine if two functions are the same. /*! - * Two functions are the same if they are teh same function. - * This means that the ID and storred constant is the same. + * Two functions are the same if they are the same function. + * This means that the ID and stored constant is the same. * This means that the m_f1 and m_f2 are identical if they * are non-null. */ @@ -94,10 +94,10 @@ public: virtual std::string write(std::string arg) const; - //! accessor function for the storred constant + //! accessor function for the stored constant doublereal c() const; - //! Function to set the storred constant + //! Function to set the stored constant void setC(doublereal c); //! accessor function for m_f1 diff --git a/include/cantera/numerics/GeneralMatrix.h b/include/cantera/numerics/GeneralMatrix.h index 1be0f1b67..f5c12ebeb 100644 --- a/include/cantera/numerics/GeneralMatrix.h +++ b/include/cantera/numerics/GeneralMatrix.h @@ -9,7 +9,7 @@ * $Revision: 776 $ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/include/cantera/numerics/NonlinearSolver.h b/include/cantera/numerics/NonlinearSolver.h index 15c33a8b8..907e3877c 100644 --- a/include/cantera/numerics/NonlinearSolver.h +++ b/include/cantera/numerics/NonlinearSolver.h @@ -10,7 +10,7 @@ * $Revision$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -218,7 +218,7 @@ public: //! Compute the current residual /*! - * The current value of the residual is storred in the internal work array m_resid, which is defined + * The current value of the residual is stored in the internal work array m_resid, which is defined * as mutable * * @param time_curr Value of the time @@ -288,7 +288,7 @@ public: * * Internal input * --------------- - * internal m_resid Storred residual is used as input + * internal m_resid Stored residual is used as input * * * @return Returns the result code from lapack. A zero means success. Anything @@ -496,7 +496,7 @@ public: * @param time_curr Current physical time * @param y_n_curr Base value of the solution before any steps * are taken - * @param ydot_n_curr Base value of the time derivative of teh + * @param ydot_n_curr Base value of the time derivative of the * solution * @param step_1 Initial step suggested. * @param y_n_1 Value of y1, the suggested solution after damping @@ -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 evalulated for success + * @param ydot1 INPUT Time derivates 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); @@ -839,8 +839,8 @@ public: * @param y_n_curr INPUT Current value of the solution vector * @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 evalulated for success - * @param ydot_n_1 OUTPUT Time derivates of solution at the conditions which are evalulated for success + * @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 trustDeltaOld INPUT Value of the trust length at the old conditions * * @@ -1148,7 +1148,7 @@ private: //! Copy of the jacobian that doesn't get overwritten when the inverse is determined /*! - * The jacobian storred here is the raw matrix, before any row or column scaling is carried out + * The jacobian stored here is the raw matrix, before any row or column scaling is carried out */ Cantera::GeneralMatrix* jacCopyPtr_; @@ -1257,7 +1257,7 @@ private: //! Factor indicating how much trust region has been changed next iteration - output variable doublereal NextTrustFactor_; - //! Boolean indicating that the residual weights have been reevalulated this iteration - output variable + //! Boolean indicating that the residual weights have been reevaluated this iteration - output variable bool ResidWtsReevaluated_; //! Expected DResid_dS for the steepest descent path - output variable diff --git a/include/cantera/numerics/ResidJacEval.h b/include/cantera/numerics/ResidJacEval.h index a4ec2b497..d48103cd3 100644 --- a/include/cantera/numerics/ResidJacEval.h +++ b/include/cantera/numerics/ResidJacEval.h @@ -10,7 +10,7 @@ * */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -204,7 +204,7 @@ public: virtual int evalTimeTrackingEqns(const doublereal t, const doublereal delta_t, const doublereal* const y, const doublereal* const ydot); - //! Evalulate any stopping criteria other than a final time limit + //! 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 diff --git a/include/cantera/numerics/RootFind.h b/include/cantera/numerics/RootFind.h index f53157c15..c38534a77 100644 --- a/include/cantera/numerics/RootFind.h +++ b/include/cantera/numerics/RootFind.h @@ -7,7 +7,7 @@ * $Id$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/include/cantera/numerics/SquareMatrix.h b/include/cantera/numerics/SquareMatrix.h index 92798e71c..5eeeb6059 100644 --- a/include/cantera/numerics/SquareMatrix.h +++ b/include/cantera/numerics/SquareMatrix.h @@ -8,7 +8,7 @@ * $Revision$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -44,7 +44,7 @@ public: * Create an \c n by \c n matrix, and initialize all elements to \c v. * * @param n size of the square matrix - * @param v intial value of all matrix components. + * @param v initial value of all matrix components. */ SquareMatrix(size_t n, doublereal v = 0.0); diff --git a/include/cantera/numerics/solveProb.h b/include/cantera/numerics/solveProb.h index fba10476f..19135f21b 100644 --- a/include/cantera/numerics/solveProb.h +++ b/include/cantera/numerics/solveProb.h @@ -7,7 +7,7 @@ * $Id$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -331,7 +331,7 @@ private: //! Main routine that calculates the current residual and Jacobian /*! * @param JacCol Vector of pointers to the tops of columns of the - * Jacobian to be evalulated. + * Jacobian to be evaluated. * @param resid output Vector of residuals, length = m_neq * @param CSolnSP Vector of species concentrations, unknowns in the * problem, length = m_neq. These are tweaked in order @@ -405,7 +405,7 @@ private: */ vector_fp m_CSolnSP; - //! Saved inital solution vector + //! Saved initial solution vector /*! * length MAX(1, m_neq) */ diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index 30b937c8d..fde05d205 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -109,7 +109,7 @@ public: } /** - * Set the Jacobian bandwith for this domain. When class + * Set the Jacobian bandwidth for this domain. When class * OneDim computes the bandwidth of the overall multi-domain * problem (in OneDim::resize()), it calls this method for the * bandwidth of each domain. If setBandwidth has not been diff --git a/include/cantera/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h index b22e0828b..6cd38c290 100644 --- a/include/cantera/thermo/ConstDensityThermo.h +++ b/include/cantera/thermo/ConstDensityThermo.h @@ -117,7 +117,7 @@ public: */ virtual doublereal pressure() const; - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method must be reimplemented in derived classes, where it @@ -395,7 +395,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * @param eosdata An XML_Node object corresponding to * the "thermo" entry for this phase in the input file. diff --git a/include/cantera/thermo/Constituents.h b/include/cantera/thermo/Constituents.h index 95170a8f4..208e69acf 100644 --- a/include/cantera/thermo/Constituents.h +++ b/include/cantera/thermo/Constituents.h @@ -195,7 +195,7 @@ public: int atomicNumber = 0, doublereal entropy298 = ENTROPY298_UNKNOWN, int elem_type = CT_ELEM_TYPE_ABSPOS); - //! Adde an element, checking for uniqueness + //! Add an element, checking for uniqueness /*! * The uniqueness is checked by comparing the string symbol. If * not unique, nothing is done. @@ -318,7 +318,7 @@ public: */ std::string speciesName(size_t k) const; - /// Return a const referernce to the vector of species names + /// Return a const reference to the vector of species names const std::vector& speciesNames() const; //! This routine returns the size of species k diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index 58f64a7bb..e67d8a882 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -9,7 +9,7 @@ */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -406,7 +406,7 @@ class PDSS_Water; * In the equations above, the formulas for \f$ A_{Debye} \f$ and \f$ B_{Debye} \f$ * are needed. The %DebyeHuckel object uses two methods for specifying these quantities. * The default method is to assume that \f$ A_{Debye} \f$ is a constant, given - * in the initialization process, and storred in the + * in the initialization process, and stored in the * member double, m_A_Debye. Optionally, a full water treatment may be employed that makes * \f$ A_{Debye} \f$ a full function of T and P. * @@ -742,12 +742,12 @@ public: //! Return the thermodynamic pressure (Pa). /*! - * For this incompressible system, we return the internally storred + * For this incompressible system, we return the internally stored * independent value of the pressure. */ virtual doublereal pressure() const; - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method sets the pressure within the object. @@ -783,7 +783,7 @@ protected: virtual void calcDensity(); public: - //! Set the internally storred density (gm/m^3) of the phase. + //! Set the internally stored density (gm/m^3) of the phase. /*! * Overwritten setDensity() function is necessary because the * density is not an indendent variable. @@ -810,7 +810,7 @@ public: */ void setDensity(const doublereal rho); - //! Set the internally storred molar density (kmol/m^3) of the phase. + //! 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. @@ -1080,7 +1080,7 @@ public: * For this solution, the partial molar volumes are equal to the * constant species molar volumes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -1186,7 +1186,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * @param eosdata An XML_Node object corresponding to * the "thermo" entry for this phase in the input file. @@ -1338,7 +1338,7 @@ public: //! and pressure (Units = sqrt(kg/gmol)) /*! * The default is to assume that it is constant, given - * in the initialization process, and storred in the + * in the initialization process, and stored in the * member double, m_A_Debye. Optionally, a full water treatment may be employed that makes * \f$ A_{Debye} \f$ a full function of T and P. * @@ -1723,7 +1723,7 @@ protected: * NaCl -> m_speciesCharge_Stoich = -1; * HSO4- -> H+ + SO42- = -2 * -> The other charge is calculated. - * For species that aren't ion pairs, its equal to the + * For species that aren't ion pairs, it's equal to the * m_speciesCharge[] value. */ vector_fp m_speciesCharge_Stoich; @@ -1765,12 +1765,12 @@ private: private: //! Calculate the log activity coefficients /*! - * This function updates the internally storred + * This function updates the internally stored * natural logarithm of the molality activity coefficients */ void s_update_lnMolalityActCoeff() const; - //! Calculation of temperatue derivative of activity coefficient + //! Calculation of temperature derivative of activity coefficient /*! * Using internally stored values, this function calculates * the temperature derivative of the logarithm of the @@ -1780,7 +1780,7 @@ private: * * * - * The solvent activity coefficient is on the molality scale. It's derivative is too. + * The solvent activity coefficient is on the molality scale. Its derivative is too. */ void s_update_dlnMolalityActCoeff_dT() const; @@ -1793,7 +1793,7 @@ private: * We assume that the activity coefficients are current in this routine * * solvent activity coefficient is on the molality - * scale. It's derivatives are too. + * scale. Its derivatives are too. * * note: private routine */ @@ -1809,7 +1809,7 @@ private: * and A_Debye are current. * * solvent activity coefficient is on the molality - * scale. It's derivatives are too. + * scale. Its derivatives are too. */ void s_update_dlnMolalityActCoeff_dP() const; }; diff --git a/include/cantera/thermo/Elements.h b/include/cantera/thermo/Elements.h index 780627739..1bdb7c989 100644 --- a/include/cantera/thermo/Elements.h +++ b/include/cantera/thermo/Elements.h @@ -67,7 +67,7 @@ class ElementRangeError; * We seek here to say that some functional groups or ionic states should be * treated as if they are separate elements given the time scale of the problem. * This will be abs positive constraint. We have not implemented any examples yet. - * A requirement will be that we must be able to add and subtract these contraints. + * A requirement will be that we must be able to add and subtract these constraints. */ #define CT_ELEM_TYPE_KINETICFROZEN 4 @@ -296,7 +296,7 @@ public: * @param entropy298 Value of the entropy at 298 and 1 bar of the * element in its most stable form. * The default is to specify an ENTROPY298_UNKNOWN value, - * which will cause a throw error if its ever + * which will cause a throw error if it's ever * needed. * @param elem_type New elem type to be assigned. * The default is a regular element, CT_ELEM_TYPE_ABSPOS diff --git a/include/cantera/thermo/FixedChemPotSSTP.h b/include/cantera/thermo/FixedChemPotSSTP.h index 8adff33e7..c4109ad32 100644 --- a/include/cantera/thermo/FixedChemPotSSTP.h +++ b/include/cantera/thermo/FixedChemPotSSTP.h @@ -6,7 +6,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -253,7 +253,7 @@ public: //! Report the Pressure. Units: Pa. /*! * For an incompressible substance, the density is independent - * of pressure. This method simply returns the storred + * of pressure. This method simply returns the stored * pressure value. */ virtual doublereal pressure() const; @@ -613,7 +613,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * For this phase, the chemical potential is set * diff --git a/include/cantera/thermo/GeneralSpeciesThermo.h b/include/cantera/thermo/GeneralSpeciesThermo.h index 1295bee1d..568bb8d57 100644 --- a/include/cantera/thermo/GeneralSpeciesThermo.h +++ b/include/cantera/thermo/GeneralSpeciesThermo.h @@ -71,7 +71,7 @@ public: * installed. * @param c vector of coefficients for the parameterization. * This vector is simply passed through to the - * parameterization constructor. It's length depends upon + * parameterization constructor. Its length depends upon * the parameterization. * @param minTemp minimum temperature for which this parameterization * is valid. diff --git a/include/cantera/thermo/GibbsExcessVPSSTP.h b/include/cantera/thermo/GibbsExcessVPSSTP.h index 3d34ce5de..dfcc83236 100644 --- a/include/cantera/thermo/GibbsExcessVPSSTP.h +++ b/include/cantera/thermo/GibbsExcessVPSSTP.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -177,7 +177,7 @@ public: * @{ */ - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method sets the pressure within the object. @@ -418,9 +418,9 @@ public: /*! * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index 5dd438491..44c6d3b08 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -9,7 +9,7 @@ * standard states. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -340,8 +340,8 @@ class PDSS_Water; * \end{array} * \f] * - * a is a subscribt over all anions, c is a subscript extending over all - * cations, and i is a subscrit that extends over all anions and cations. + * a is a subscript over all anions, c is a subscript extending over all + * cations, and i is a subscript that extends over all anions and cations. * n is a subscript that extends only over neutral solute molecules. * The second line contains cross terms where cations affect * cations and/or cation/anion pairs, @@ -356,7 +356,7 @@ class PDSS_Water; * molalities or ionic strengths. However, all coefficients are potentially functions * of the temperature and pressure of the solution. * - * A is the Debye-Huckel constant. It's specification is described in its own + * A is the Debye-Huckel constant. Its specification is described in its own * section below. * * \f$ I\f$ is the ionic strength of the solution, and is given by: @@ -367,7 +367,7 @@ class PDSS_Water; * * In contrast to several other Debye-Huckel implementations (see \ref DebyeHuckel), the * parameter \f$ b\f$ in the above equation is a constant that - * doesn not vary with respect to ion idenity. This is an important simplification + * does not vary with respect to ion identity. This is an important simplification * as it avoids troubles with satisfaction of the Gibbs-Duhem analysis. * * The function \f$ Z \f$ is given by @@ -392,12 +392,12 @@ class PDSS_Water; * The formulation for \f$ B_{ca}\f$ combined with the formulation of the * Debye-Huckel term in the eqn. for the excess Gibbs free energy stems * essentially from an empirical fit to the ionic strength dependent data - * based over a wide sampling of binary electroyte systems. \f$ C_{ca} \f$, + * based over a wide sampling of binary electrolyte systems. \f$ C_{ca} \f$, * \f$ \lambda_{nc} \f$, \f$ \lambda_{na} \f$, \f$ \lambda_{nn} \f$, * \f$ \Psi_{c{c'}a} \f$, \f$ \Psi_{a{a'}c} \f$ are experimentally derived * coefficients that may have pressure and/or temperature dependencies. * The \f$ \Phi_{c{c'}} \f$ and \f$ \Phi_{a{a'}} \f$ formulations are - * slightly more complicated. \f$ b \f$ is a univeral + * slightly more complicated. \f$ b \f$ is a universal * constant defined to be equal to \f$ 1.2\ kg^{1/2}\ gmol^{-1/2} \f$. The exponential * coefficient \f$ \alpha^{(1)}_{ca} \f$ is usually * fixed at \f$ \alpha^{(1)}_{ca} = 2.0\ kg^{1/2} gmol^{-1/2}\f$ @@ -712,7 +712,7 @@ class PDSS_Water; * * * \f$ \Theta_{ij} \f$ is the small virial coefficient expansion term. - * Dependent in general on temperature and pressure, it's ionic + * Dependent in general on temperature and pressure, its ionic * strength dependence is ignored in Pitzer's approach. * \f$ \,^E\Theta_{ij}(I) \f$ accounts for the electrostatic * unsymmetrical mixing effects and is dependent only on the @@ -884,7 +884,7 @@ class PDSS_Water; * In the equations above, the formula for \f$ A_{Debye} \f$ * is needed. The %HMWSoln object uses two methods for specifying these quantities. * The default method is to assume that \f$ A_{Debye} \f$ is a constant, given - * in the initialization process, and storred in the + * in the initialization process, and stored in the * member double, m_A_Debye. Optionally, a full water treatment may be employed that makes * \f$ A_{Debye} \f$ a full function of T and P and creates nontrivial entries for * the excess heat capacity, enthalpy, and excess volumes of solution. @@ -1073,7 +1073,7 @@ class PDSS_Water; * C_j^a = C^o_o \frac{\gamma_j^\triangle n_j}{n_o} * \f] * - * The generalized activity concentration of the solvent has the same units, but its a simpler form + * The generalized activity concentration of the solvent has the same units, but it's a simpler form * * \f[ * C_o^a = C^o_o a_o @@ -1107,7 +1107,7 @@ class PDSS_Water; *
* * The constructor for this phase is now located in the default ThermoFactory - * for %Cantera. The following code snipet may be used to initialize the phase + * for %Cantera. The following code snippet may be used to initialize the phase * using the default construction technique within %Cantera. * * @code @@ -1288,7 +1288,7 @@ public: */ HMWSoln(const HMWSoln& right); - //! Asignment operator + //! Assignment operator /*! * Assignment operator for the object. Constructed * object will be a clone of this object, but will @@ -1444,12 +1444,12 @@ public: /** * Pressure. Units: Pa. - * For this incompressible system, we return the internally storred + * For this incompressible system, we return the internally stored * independent value of the pressure. */ virtual doublereal pressure() const; - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method sets the pressure within the object. @@ -1495,7 +1495,7 @@ public: */ virtual doublereal density() const; - //! Set the internally storred density (kg/m^3) of the phase. + //! Set the internally stored density (kg/m^3) of the phase. /*! * Overwritten setDensity() function is necessary because of * the underlying water model. @@ -1511,7 +1511,7 @@ public: */ void setDensity(const doublereal rho); - //! Set the internally storred molar density (kmol/m^3) for the phase. + //! Set the internally stored molar density (kmol/m^3) for the phase. /** * Overwritten setMolarDensity() function is necessary because of the * underlying water model. @@ -1610,7 +1610,7 @@ public: * C_j^a = C^o_o \frac{\gamma_j^\triangle n_j}{n_o} * \f] * - * The generalized activity concentration of the solvent has the same units, but its a simpler form + * The generalized activity concentration of the solvent has the same units, but it's a simpler form * * \f[ * C_o^a = C^o_o a_o @@ -1688,7 +1688,7 @@ public: * C_j^a = C^o_o \frac{\gamma_j^\triangle n_j}{n_o} * \f] * - * The generalized activity concentration of the solvent has the same units, but its a simpler form + * The generalized activity concentration of the solvent has the same units, but it's a simpler form * * \f[ * C_o^a = C^o_o a_o @@ -1845,7 +1845,7 @@ public: * + R T \frac{d \ln(a_o)}{dP} * \f] * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -3349,7 +3349,7 @@ private: private: /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the molality activity coefficients */ void s_update_lnMolalityActCoeff() const; @@ -3374,7 +3374,7 @@ private: */ void s_update_dlnMolalityActCoeff_dP() const; - //! This function will be called to update the internally storred + //! This function will be called to update the internally stored //! natural logarithm of the molality activity coefficients /* * Normally they are all one. However, sometimes they are not, diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index d9e1c3244..af85ef3b0 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -55,8 +55,8 @@ namespace Cantera * state thermo functions by calling the SpeciesThermo object. * * Functions for the calculation of standard state properties for species - * at arbitray pressure are provided in %IdealGasPhase. However, they - * are all derived from their reference state conterparts. + * at arbitrary pressure are provided in %IdealGasPhase. However, they + * are all derived from their reference state counterparts. * * The standard state enthalpy is independent of pressure: * @@ -325,7 +325,7 @@ public: IdealGasPhase(const IdealGasPhase& right); - //! Asignment operator + //! Assignment operator /*! * Assignment operator for the object. Constructed * object will be a clone of this object, but will @@ -516,7 +516,7 @@ public: * \f] * The generalized concentrations are used in the kinetics classes * to describe the rates of progress of reactions involving the - * species. Their formulation depends upons the specification + * species. Their formulation depends upon the specification * of the rate constants for reaction, especially the units used * in specifying the rate constants. The bridge between the * thermodynamic equilibrium expressions that use a_k and the @@ -603,7 +603,7 @@ public: //! Get the species partial molar enthalpies. Units: J/kmol. /*! - * @param ubar Output vector of speciar partial molar internal energies. + * @param ubar Output vector of species partial molar internal energies. * Length = m_kk. units are J/kmol. */ virtual void getPartialMolarIntEnergies(doublereal* ubar) const; @@ -617,7 +617,7 @@ public: //! Get the species partial molar volumes. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -943,7 +943,7 @@ private: //! Update the species reference state thermodynamic functions /*! * The polynomials for the standard state functions are only - * reevalulated if the temperature has changed. + * reevaluated if the temperature has changed. * */ void _updateThermo() const; diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index fb02a5d8d..cc4a9d439 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -14,7 +14,7 @@ * to zero. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -998,7 +998,7 @@ private: */ doublereal err(std::string msg) const; - //! This function will be called to update the internally storred + //! This function will be called to update the internally stored //! natural logarithm of the molality activity coefficients /*! * Normally the solutes are all zero. However, sometimes they are not, diff --git a/include/cantera/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h index 3abdc3045..cfbd6c120 100644 --- a/include/cantera/thermo/IdealSolidSolnPhase.h +++ b/include/cantera/thermo/IdealSolidSolnPhase.h @@ -9,7 +9,7 @@ * thermodynamics. */ /* - * Copywrite 2006 Sandia Corporation. Under the terms of Contract + * Copyright 2006 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000, with Sandia Corporation, the U.S. Government * retains certain rights in this software. */ @@ -270,7 +270,7 @@ public: /** * Pressure. Units: Pa. - * For this incompressible system, we return the internally storred + * For this incompressible system, we return the internally stored * independent value of the pressure. */ virtual doublereal pressure() const { @@ -406,7 +406,7 @@ public: * \f] * The generalized concentrations are used in the kinetics classes * to describe the rates of progress of reactions involving the - * species. Their formulation depends upons the specification + * species. Their formulation depends upon the specification * of the rate constants for reaction, especially the units used * in specifying the rate constants. The bridge between the * thermodynamic equilibrium expressions that use a_k and the diff --git a/include/cantera/thermo/IdealSolnGasVPSS.h b/include/cantera/thermo/IdealSolnGasVPSS.h index 624f06e82..62b57c631 100644 --- a/include/cantera/thermo/IdealSolnGasVPSS.h +++ b/include/cantera/thermo/IdealSolnGasVPSS.h @@ -7,7 +7,7 @@ * class \link Cantera::IdealSolnGasVPSS IdealSolnGasVPSS\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -281,7 +281,7 @@ public: //! Get the species partial molar enthalpies. Units: J/kmol. /*! - * @param ubar Output vector of speciar partial molar internal energies. + * @param ubar Output vector of species partial molar internal energies. * Length = m_kk. units are J/kmol. */ virtual void getPartialMolarIntEnergies(doublereal* ubar) const; @@ -296,7 +296,7 @@ public: //! Get the species partial molar volumes. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; diff --git a/include/cantera/thermo/IonsFromNeutralVPSSTP.h b/include/cantera/thermo/IonsFromNeutralVPSSTP.h index 66da5fd31..e39170874 100644 --- a/include/cantera/thermo/IonsFromNeutralVPSSTP.h +++ b/include/cantera/thermo/IonsFromNeutralVPSSTP.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -684,21 +684,21 @@ private: //! Update the activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients */ void s_update_lnActCoeff() const; //! Update the temperature derivative of the ln activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * temperature derivative of the natural logarithm of the activity coefficients */ void s_update_dlnActCoeffdT() const; //! Update the change in the ln activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * change of the natural logarithm of the activity coefficients * w.r.t a change in state (temp, mole fraction, etc) */ @@ -707,7 +707,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(mole fraction) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole fractions. */ @@ -716,7 +716,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(number of moles) - diagonal components /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the number of moles of given species. */ @@ -725,7 +725,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(number of moles) - diagonal components /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the number of moles of given species. */ diff --git a/include/cantera/thermo/LatticePhase.h b/include/cantera/thermo/LatticePhase.h index df6a95227..4f80f180a 100644 --- a/include/cantera/thermo/LatticePhase.h +++ b/include/cantera/thermo/LatticePhase.h @@ -445,14 +445,14 @@ public: //! Pressure. Units: Pa. /*! - * For this incompressible system, we return the internally storred + * For this incompressible system, we return the internally stored * independent value of the pressure. */ virtual doublereal pressure() const { return m_Pcurrent; } - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method sets the pressure within the object. @@ -662,7 +662,7 @@ public: //! Return an array of partial molar volumes for the //! species in the mixture. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -927,7 +927,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * For this phase, the molar density of the phase is specified in this block, * and is a required parameter. @@ -1027,7 +1027,7 @@ private: //! Update the species reference state thermodynamic functions /*! * The polynomials for the standard state functions are only - * reevalulated if the temperature has changed. + * reevaluated if the temperature has changed. */ void _updateThermo() const; }; diff --git a/include/cantera/thermo/LatticeSolidPhase.h b/include/cantera/thermo/LatticeSolidPhase.h index baf3c19c5..7b752ade3 100644 --- a/include/cantera/thermo/LatticeSolidPhase.h +++ b/include/cantera/thermo/LatticeSolidPhase.h @@ -293,7 +293,7 @@ public: //! Report the Pressure. Units: Pa. /*! - * This method simply returns the storred pressure value. + * This method simply returns the stored pressure value. */ virtual doublereal pressure() const { return m_press; @@ -324,7 +324,7 @@ public: //! normalize them so that they sum to 1.0 for each of the subphases /*! * On input, the mole fraction vector is assumed to sum to one for each of the sublattices. The sublattices - * are updated with this mole fraction vector. The mole fractions are also storred within this object, after + * are updated with this mole fraction vector. The mole fractions are also stored within this object, after * they are normalized to one by dividing by the number of sublattices. * * @param x Input vector of mole fractions. There is no restriction @@ -385,7 +385,7 @@ public: * Input vector of mass fractions. There is no restriction * on the sum of the mass fraction vector. Internally, * the State object will normalize this vector before - * storring its contents. + * storing its contents. * Length is m_kk. */ virtual void setMassFractions(const doublereal* const y) { @@ -632,7 +632,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * @param eosdata An XML_Node object corresponding to * the "thermo" entry for this phase in the input file. diff --git a/include/cantera/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h index c4b430999..b6d139397 100644 --- a/include/cantera/thermo/MargulesVPSSTP.h +++ b/include/cantera/thermo/MargulesVPSSTP.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -593,9 +593,9 @@ public: /*! * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -833,14 +833,14 @@ private: //! Update the activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients */ void s_update_lnActCoeff() const; //! Update the derivative of the log of the activity coefficients wrt T /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt temperature. */ @@ -849,7 +849,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(mole fraction) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole fractions. */ @@ -858,7 +858,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(moles) - diagonal only /*! - * This function will be called to update the internally storred diagonal entries for the + * This function will be called to update the internally stored diagonal entries for the * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the moles. */ @@ -866,7 +866,7 @@ private: //! Update the derivative of the log of the activity coefficients wrt log(moles_m) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole number of species */ diff --git a/include/cantera/thermo/MetalSHEelectrons.h b/include/cantera/thermo/MetalSHEelectrons.h index af26506bf..d0728f735 100644 --- a/include/cantera/thermo/MetalSHEelectrons.h +++ b/include/cantera/thermo/MetalSHEelectrons.h @@ -7,7 +7,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -263,7 +263,7 @@ public: //! Report the Pressure. Units: Pa. /*! * For an incompressible substance, the density is independent - * of pressure. This method simply returns the storred + * of pressure. This method simply returns the stored * pressure value. */ virtual doublereal pressure() const; @@ -532,7 +532,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * For this phase, the density of the phase is specified in this block. * diff --git a/include/cantera/thermo/MineralEQ3.h b/include/cantera/thermo/MineralEQ3.h index 22c722656..85ba76d72 100644 --- a/include/cantera/thermo/MineralEQ3.h +++ b/include/cantera/thermo/MineralEQ3.h @@ -6,7 +6,7 @@ */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. * @@ -238,7 +238,7 @@ public: //! Report the Pressure. Units: Pa. /*! * For an incompressible substance, the density is independent - * of pressure. This method simply returns the storred + * of pressure. This method simply returns the stored * pressure value. */ virtual doublereal pressure() const; @@ -561,7 +561,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * For this phase, the density of the phase is specified in this block. * diff --git a/include/cantera/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h index fae09593e..5b55b9467 100644 --- a/include/cantera/thermo/MixedSolventElectrolyte.h +++ b/include/cantera/thermo/MixedSolventElectrolyte.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -598,9 +598,9 @@ public: /*! * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -838,14 +838,14 @@ private: //! Update the activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients */ void s_update_lnActCoeff() const; //! Update the derivative of the log of the activity coefficients wrt T /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt temperature. */ @@ -854,7 +854,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(mole fraction) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole fractions. */ @@ -863,7 +863,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(moles) - diagonal only /*! - * This function will be called to update the internally storred diagonal entries for the + * This function will be called to update the internally stored diagonal entries for the * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the moles. */ @@ -871,7 +871,7 @@ private: //! Update the derivative of the log of the activity coefficients wrt log(moles_m) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole number of species */ diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index af0d0684d..2a8aa36d1 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -6,7 +6,7 @@ * */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -354,7 +354,7 @@ public: virtual void setTemperature(const doublereal temp); - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * Currently this passes down to setState_TP(). It does not @@ -404,7 +404,7 @@ public: */ virtual void setState_TP(doublereal T, doublereal pres); - //! Set the internally storred temperature (K) and density (kg/m^3) + //! Set the internally stored temperature (K) and density (kg/m^3) /*! * @param t Temperature in kelvin * @param rho Density (kg/m^3) @@ -487,7 +487,7 @@ public: //! Returns the current pressure of the phase /*! * The pressure is an independent variable in this phase. Its current value - * is storred in the object MixtureFugacityTP. + * is stored in the object MixtureFugacityTP. * * @return return the pressure in pascals. */ diff --git a/include/cantera/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h index a89ead41d..276f65843 100644 --- a/include/cantera/thermo/MolalityVPSSTP.h +++ b/include/cantera/thermo/MolalityVPSSTP.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -142,7 +142,7 @@ namespace Cantera * In order to prevent a singularity, this class includes the concept of a minimum * value for the solvent mole fraction. All calculations involving the formulation * of activity coefficients and other non-ideal solution behavior adhere to - * this concept of a minimul value for the solvent mole fraction. This makes sense + * this concept of a minimal value for the solvent mole fraction. This makes sense * because these solution behavior were all designed and measured far away from * the zero solvent singularity condition and are not applicable in that limit. * @@ -253,7 +253,7 @@ public: //! coefficients. /*! * Single ion activity coefficients are not unique in terms of the - * representing actual measureable quantities. + * representing actual measurable quantities. * * @param pHscaleType Integer representing the pHscale */ @@ -263,7 +263,7 @@ public: //! coefficients. /*! * Single ion activity coefficients are not unique in terms of the - * representing actual measureable quantities. + * representing actual measurable quantities. * * @return Return the pHscale type */ @@ -441,7 +441,7 @@ public: * cAC_CONVENTION_MOLAR 0 * - default * - * Molality based acvtivities + * Molality based activities * (unit activity of solutes at a hypothetical 1 molal * solution referenced to infinite dilution at all * pressures and temperatures). @@ -857,8 +857,8 @@ protected: private: //! Returns the index of the Cl- species. /*! - * The Cl- species is special in the sense that it's single ion - * molalality-based activity coefficient is used in the specification + * The Cl- species is special in the sense that its single ion + * molality-based activity coefficient is used in the specification * of the pH scale for single ions. Therefore, we need to know * what species index is Cl-. If the species isn't in the species * list then this routine returns -1, and we can't use the NBS @@ -886,7 +886,7 @@ protected: //! coefficients. /*! * Index of the species to be used in the single-ion scaling - * law. This is the indentity of the Cl- species for the PHSCALE_NBS + * law. This is the identity of the Cl- species for the PHSCALE_NBS * scaling. * Either PHSCALE_PITZER or PHSCALE_NBS */ @@ -895,7 +895,7 @@ protected: //! Index of the phScale species /*! * Index of the species to be used in the single-ion scaling - * law. This is the indentity of the Cl- species for the PHSCALE_NBS + * law. This is the identity of the Cl- species for the PHSCALE_NBS * scaling */ size_t m_indexCLM; @@ -916,7 +916,7 @@ protected: //! This is the multiplication factor that goes inside //! log expressions involving the molalities of species. /*! - * Its equal to Wt_0 / 1000, + * It's equal to Wt_0 / 1000, * where Wt_0 = weight of solvent (kg/kmol) */ doublereal m_Mnaught; @@ -983,7 +983,7 @@ const int PHSCALE_PITZER = 0; * \f] * * This is the NBS pH scale, which is used in all conventional pH - * measurements. and is based on the Bates-Guggenheim quations. + * measurements. and is based on the Bates-Guggenheim equations. * */ const int PHSCALE_NBS = 1; diff --git a/include/cantera/thermo/MolarityIonicVPSSTP.h b/include/cantera/thermo/MolarityIonicVPSSTP.h index dfd57e273..aac9f732d 100644 --- a/include/cantera/thermo/MolarityIonicVPSSTP.h +++ b/include/cantera/thermo/MolarityIonicVPSSTP.h @@ -12,7 +12,7 @@ * ions, but they are treated on the molarity scale. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -330,9 +330,9 @@ public: /*! * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -461,14 +461,14 @@ private: //! Update the activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients */ void s_update_lnActCoeff() const; //! Update the derivative of the log of the activity coefficients wrt T /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt temperature. */ @@ -514,7 +514,7 @@ protected: mutable std::vector PBMoleFractions_; - //! Vector of cation indecises in the mixture + //! Vector of cation indices in the mixture std::vector cationList_; //! Number of cations in the mixture diff --git a/include/cantera/thermo/Nasa9Poly1.h b/include/cantera/thermo/Nasa9Poly1.h index dcb8604f6..502ca4f29 100644 --- a/include/cantera/thermo/Nasa9Poly1.h +++ b/include/cantera/thermo/Nasa9Poly1.h @@ -10,7 +10,7 @@ * This parameterization has one NASA temperature region. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/PDSS.h b/include/cantera/thermo/PDSS.h index b91a6269f..379424070 100644 --- a/include/cantera/thermo/PDSS.h +++ b/include/cantera/thermo/PDSS.h @@ -5,7 +5,7 @@ * (see \ref pdssthermo and class \link Cantera::PDSS PDSS\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -525,7 +525,7 @@ public: */ virtual void setTemperature(doublereal temp); - //! Return the current storred temperature + //! Return the current stored temperature doublereal temperature() const; //! Set the internal temperature and pressure diff --git a/include/cantera/thermo/PDSS_ConstVol.h b/include/cantera/thermo/PDSS_ConstVol.h index 062022b71..a5a889ee8 100644 --- a/include/cantera/thermo/PDSS_ConstVol.h +++ b/include/cantera/thermo/PDSS_ConstVol.h @@ -5,7 +5,7 @@ * (see class \ref pdssthermo and \link Cantera::PDSS_ConstVol PDSS_ConstVol\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/PDSS_HKFT.h b/include/cantera/thermo/PDSS_HKFT.h index 04a02a07b..6d295d2d7 100644 --- a/include/cantera/thermo/PDSS_HKFT.h +++ b/include/cantera/thermo/PDSS_HKFT.h @@ -6,7 +6,7 @@ * (see \ref pdssthermo and class \link Cantera::PDSS_HKFT PDSS_HKFT\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -316,7 +316,7 @@ public: */ virtual void setTemperature(doublereal temp); - //! Return the current storred temperature + //! Return the current stored temperature doublereal temperature() const; //! Set the internal temperature and pressure @@ -596,7 +596,7 @@ private: /*! * Internally, this function is used to translate the input value, * m_deltaG_formation_tr_pr, - * to the internally storred value, m_Mu0_tr_pr. + * to the internally stored value, m_Mu0_tr_pr. */ void convertDGFormation(); diff --git a/include/cantera/thermo/PDSS_IdealGas.h b/include/cantera/thermo/PDSS_IdealGas.h index 17a6848e6..0472491b3 100644 --- a/include/cantera/thermo/PDSS_IdealGas.h +++ b/include/cantera/thermo/PDSS_IdealGas.h @@ -5,7 +5,7 @@ * (see \ref pdssthermo and class \link Cantera::PDSS_IdealGas PDSS_IdealGas\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -300,7 +300,7 @@ public: */ virtual void setTemperature(doublereal temp); - //! Return the current storred temperature + //! Return the current stored temperature doublereal temperature() const; //! Set the internal temperature and pressure diff --git a/include/cantera/thermo/PDSS_IonsFromNeutral.h b/include/cantera/thermo/PDSS_IonsFromNeutral.h index 30231eda1..09a076e1f 100644 --- a/include/cantera/thermo/PDSS_IonsFromNeutral.h +++ b/include/cantera/thermo/PDSS_IonsFromNeutral.h @@ -6,7 +6,7 @@ * (see \ref pdssthermo and class \link Cantera::PDSS_IonsFromNeutral PDSS_IonsFromNeutral\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -329,7 +329,7 @@ public: */ virtual void setTemperature(doublereal temp); - //! Return the current storred temperature + //! Return the current stored temperature doublereal temperature() const; //! Set the internal temperature and pressure @@ -475,7 +475,7 @@ public: //! this species, in terms of calculating thermodynamic functions size_t numMult_; - //! Vector of species indecises in the neutral molecule ThermoPhase + //! Vector of species indices in the neutral molecule ThermoPhase std::vector idNeutralMoleculeVec; //! Stoichiometric coefficient for this species using the Neutral Molecule Species diff --git a/include/cantera/thermo/PDSS_SSVol.h b/include/cantera/thermo/PDSS_SSVol.h index 9fd5fabd1..6610f678b 100644 --- a/include/cantera/thermo/PDSS_SSVol.h +++ b/include/cantera/thermo/PDSS_SSVol.h @@ -6,7 +6,7 @@ * (see class \ref pdssthermo and \link Cantera::PDSS_SSVol PDSS_SSVol\endlink). */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/PDSS_Water.h b/include/cantera/thermo/PDSS_Water.h index bc4393806..b949dda5c 100644 --- a/include/cantera/thermo/PDSS_Water.h +++ b/include/cantera/thermo/PDSS_Water.h @@ -5,7 +5,7 @@ * (see \ref pdssthermo and class \link Cantera::PDSS_Water PDSS_Water\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h index 315720db4..914b15aa0 100644 --- a/include/cantera/thermo/Phase.h +++ b/include/cantera/thermo/Phase.h @@ -89,7 +89,7 @@ namespace Cantera * (or phases which utilize standard states based on a T and * P) this change in independent variables may be * advantageous as well, and these functions in %State need to - * overload as well so that the storred density within State + * overload as well so that the stored density within State * doesn't become out of date. * * Class Phase derives from both clases @@ -110,14 +110,14 @@ namespace Cantera */ -//! Base class for phases of mater +//! Base class for phases of matter /*! * Base class for phases of matter. Class Phase derives from both * Constituents and State. In addition to the methods of those two * classes, it implements methods that allow referencing a species * by name. * - * Class Phase derives from both clases + * Class Phase derives from both classes * Constituents and State. In addition to the methods of those two * classes, it implements methods that allow referencing a species * by name. And, it contains a lot of utility functions that will @@ -141,7 +141,7 @@ namespace Cantera * * However, the name field may be changed to another value during the course of a calculation. * For example, if a phase is located in two places, but has the same - * constituitive input, the id's of the two phases will be the same, + * constitutive input, the id's of the two phases will be the same, * but the names of the two phases may be different. * * The name of a phase can be the same as the id of that same phase. @@ -196,7 +196,7 @@ public: */ Phase& operator=(const Phase& right); - //! Returns a reference to the XML_Node storred for the phase + //! Returns a reference to the XML_Node stored for the phase /*! * The XML_Node for the phase contains all of the input data used * to set up the model for the phase, during its initialization. @@ -358,7 +358,7 @@ public: */ void setMassFractionsByName(const std::string& x); - //! Set the internally storred temperature (K), density, and mole fractions. + //! Set the internally stored temperature (K), density, and mole fractions. /*! * Note, the mole fractions are always set first, before the density * @@ -370,7 +370,7 @@ public: void setState_TRX(doublereal t, doublereal dens, const doublereal* x); - //! Set the internally storred temperature (K), density, and mole fractions. + //! Set the internally stored temperature (K), density, and mole fractions. /*! * Note, the mole fractions are always set first, before the density * @@ -382,7 +382,7 @@ public: */ void setState_TRX(doublereal t, doublereal dens, compositionMap& x); - //! Set the internally storred temperature (K), density, and mass fractions. + //! Set the internally stored temperature (K), density, and mass fractions. /*! * Note, the mass fractions are always set first, before the density * @@ -393,7 +393,7 @@ public: */ void setState_TRY(doublereal t, doublereal dens, const doublereal* y); - //! Set the internally storred temperature (K), density, and mass fractions. + //! Set the internally stored temperature (K), density, and mass fractions. /*! * Note, the mass fractions are always set first, before the density * @@ -405,7 +405,7 @@ public: */ void setState_TRY(doublereal t, doublereal dens, compositionMap& y); - //! Set the internally storred temperature (K), molar density (kmol/m^3), and mole fractions. + //! Set the internally stored temperature (K), molar density (kmol/m^3), and mole fractions. /*! * Note, the mole fractions are always set first, before the molar density * @@ -416,14 +416,14 @@ public: */ void setState_TNX(doublereal t, doublereal n, const doublereal* x); - //! Set the internally storred temperature (K) and density (kg/m^3) + //! Set the internally stored temperature (K) and density (kg/m^3) /*! * @param t Temperature in kelvin * @param rho Density (kg/m^3) */ void setState_TR(doublereal t, doublereal rho); - //! Set the internally storred temperature (K) and mole fractions. + //! Set the internally stored temperature (K) and mole fractions. /*! * @param t Temperature in kelvin * @param x vector of species mole fractions. @@ -431,7 +431,7 @@ public: */ void setState_TX(doublereal t, doublereal* x); - //! Set the internally storred temperature (K) and mass fractions. + //! Set the internally stored temperature (K) and mass fractions. /*! * @param t Temperature in kelvin * @param y vector of species mass fractions. diff --git a/include/cantera/thermo/PhaseCombo_Interaction.h b/include/cantera/thermo/PhaseCombo_Interaction.h index 37137d649..84042520a 100644 --- a/include/cantera/thermo/PhaseCombo_Interaction.h +++ b/include/cantera/thermo/PhaseCombo_Interaction.h @@ -6,7 +6,7 @@ * and class \link Cantera::PhaseCombo_Interaction PhaseCombo_Interaction\endlink). */ /* - * Copywrite (2011) Sandia Corporation. Under the terms of + * Copyright (2011) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -629,9 +629,9 @@ public: /*! * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -834,14 +834,14 @@ private: //! Update the activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients */ void s_update_lnActCoeff() const; //! Update the derivative of the log of the activity coefficients wrt T /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt temperature. */ @@ -850,7 +850,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(mole fraction) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole fractions. */ @@ -859,7 +859,7 @@ private: //! Update the derivative of the log of the activity coefficients //! wrt log(moles) - diagonal only /*! - * This function will be called to update the internally storred diagonal entries for the + * This function will be called to update the internally stored diagonal entries for the * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the moles. */ @@ -867,7 +867,7 @@ private: //! Update the derivative of the log of the activity coefficients wrt log(moles_m) /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the mole number of species */ diff --git a/include/cantera/thermo/PseudoBinaryVPSSTP.h b/include/cantera/thermo/PseudoBinaryVPSSTP.h index 9e3ff0b98..2e583b056 100644 --- a/include/cantera/thermo/PseudoBinaryVPSSTP.h +++ b/include/cantera/thermo/PseudoBinaryVPSSTP.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/PureFluidPhase.h b/include/cantera/thermo/PureFluidPhase.h index 9b992da79..eb42783f8 100644 --- a/include/cantera/thermo/PureFluidPhase.h +++ b/include/cantera/thermo/PureFluidPhase.h @@ -40,7 +40,7 @@ namespace Cantera //! gas, a liquid, a mixed gas-liquid fluid, or a fluid beyond its //! critical point /*! - * The object inherits from ThermoPhase. However, its build on top + * The object inherits from ThermoPhase. However, it's built on top * of the tpx package. * * @@ -187,7 +187,7 @@ public: //! Return an array of partial molar internal energies for the //! species in the mixture. Units: J/kmol. /*! - * @param ubar Output vector of speciar partial molar internal energies. + * @param ubar Output vector of species partial molar internal energies. * Length = m_kk. units are J/kmol. */ virtual void getPartialMolarIntEnergies(doublereal* ubar) const; @@ -204,7 +204,7 @@ public: //! Return an array of partial molar volumes for the //! species in the mixture. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -403,7 +403,7 @@ public: * @{ */ - //! Set the internally storred specific enthalpy (J/kg) and pressure (Pa) of the phase. + //! Set the internally stored specific enthalpy (J/kg) and pressure (Pa) of the phase. /*! * @param h Specific enthalpy (J/kg) * @param p Pressure (Pa) @@ -537,7 +537,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * @param eosdata An XML_Node object corresponding to * the "thermo" entry for this phase in the input file. diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h index 670a8c747..e16504c22 100644 --- a/include/cantera/thermo/RedlichKwongMFTP.h +++ b/include/cantera/thermo/RedlichKwongMFTP.h @@ -7,7 +7,7 @@ * class \link Cantera::RedlichKwongMFTP RedlichKwongMFTP\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -102,7 +102,7 @@ public: */ RedlichKwongMFTP(const RedlichKwongMFTP& right); - //! Asignment operator + //! Assignment operator /*! * Assignment operator for the object. Constructed object will be a clone of this object, but will * also own all of its data. @@ -408,7 +408,7 @@ public: //! Get the species partial molar enthalpies. Units: J/kmol. /*! - * @param ubar Output vector of speciar partial molar internal energies. + * @param ubar Output vector of species partial molar internal energies. * Length = m_kk. units are J/kmol. */ virtual void getPartialMolarIntEnergies(doublereal* ubar) const; @@ -423,7 +423,7 @@ public: //! Get the species partial molar volumes. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -700,7 +700,7 @@ public: //! Calculate dpdV and dpdT at the current conditions /*! - * These are storred internally. + * These are stored internally. */ void pressureDerivatives() const; @@ -720,7 +720,7 @@ public: /*! * * This function doesn't change the internal state of the object, so it is a const - * function. It does use the storred mole fractions in the object. + * function. It does use the stored mole fractions in the object. * * @param temp Temperature (TKelvin) * diff --git a/include/cantera/thermo/SingleSpeciesTP.h b/include/cantera/thermo/SingleSpeciesTP.h index 8d604a897..3762a80e5 100644 --- a/include/cantera/thermo/SingleSpeciesTP.h +++ b/include/cantera/thermo/SingleSpeciesTP.h @@ -6,7 +6,7 @@ * */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -60,7 +60,7 @@ namespace Cantera * point where the phase itself ceases to be a stable phase. * * This class doesn't do much at the initialization level. - * It's SingleSpeciesTP::initThermo() + * Its SingleSpeciesTP::initThermo() * member does check that one and only one species has been defined * to occupy the phase. * @@ -521,7 +521,7 @@ public: */ void setState_TPX(doublereal t, doublereal p, const std::string& x); - //! Set the internally storred temperature (K), pressure (Pa), and mass fractions of the phase. + //! Set the internally stored temperature (K), pressure (Pa), and mass fractions of the phase. /*! * Note, the mass fractions are set to Y[0] = 1.0. * Setting the pressure may involve the solution of a nonlinear equation. @@ -533,7 +533,7 @@ public: */ void setState_TPY(doublereal t, doublereal p, const doublereal* y); - //! Set the internally storred temperature (K), pressure (Pa), and mass fractions of the phase + //! Set the internally stored temperature (K), pressure (Pa), and mass fractions of the phase /*! * Note, the mass fractions are set to Y[0] = 1.0. * Setting the pressure may involve the solution of a nonlinear equation. @@ -545,7 +545,7 @@ public: */ void setState_TPY(doublereal t, doublereal p, compositionMap& y); - //! Set the internally storred temperature (K), pressure (Pa), and mass fractions of the phase + //! Set the internally stored temperature (K), pressure (Pa), and mass fractions of the phase /*! * Note, the mass fractions are set to Y[0] = 1.0. * Setting the pressure may involve the solution of a nonlinear equation. @@ -569,7 +569,7 @@ public: */ void setState_PX(doublereal p, doublereal* x); - //! Set the internally storred pressure (Pa) and mass fractions. + //! Set the internally stored pressure (Pa) and mass fractions. /*! * Note, the mass fractions are set to Y[0] = 1.0. * Note, the temperature is held constant during this operation. @@ -581,7 +581,7 @@ public: */ void setState_PY(doublereal p, doublereal* y); - //! Set the internally storred specific enthalpy (J/kg) and pressure (Pa) of the phase. + //! Set the internally stored specific enthalpy (J/kg) and pressure (Pa) of the phase. /*! * @param h Specific enthalpy (J/kg) * @param p Pressure (Pa) diff --git a/include/cantera/thermo/SpeciesThermoFactory.h b/include/cantera/thermo/SpeciesThermoFactory.h index 68b85349b..bff9eeea6 100644 --- a/include/cantera/thermo/SpeciesThermoFactory.h +++ b/include/cantera/thermo/SpeciesThermoFactory.h @@ -241,7 +241,7 @@ private: * * @param type Species thermo type. * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. + * Defaults to NULL. */ SpeciesThermo* newSpeciesThermoMgr(int type, SpeciesThermoFactory* f=0); @@ -249,7 +249,7 @@ SpeciesThermo* newSpeciesThermoMgr(int type, SpeciesThermoFactory* f=0); //!the type and (optionally) a pointer to the factory to use to create it. /*! * This utility program is a basic factory operation for spawning a - * new species reference-state thermo mananger + * new species reference-state thermo manager * * These functions allows for using a different factory class that * derives from SpeciesThermoFactory. However, no applications of this @@ -257,7 +257,7 @@ SpeciesThermo* newSpeciesThermoMgr(int type, SpeciesThermoFactory* f=0); * * @param stype String specifying the species thermo type * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. + * Defaults to NULL. */ SpeciesThermo* newSpeciesThermoMgr(std::string& stype, SpeciesThermoFactory* f=0); @@ -275,7 +275,7 @@ SpeciesThermo* newSpeciesThermoMgr(std::string& stype, * of species XML nodes that will be in the phase * * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. + * Defaults to NULL. * @param opt Boolean defaults to false. */ SpeciesThermo* newSpeciesThermoMgr(std::vector spDataNodeList, diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h index 2734d1536..632e0f1dd 100644 --- a/include/cantera/thermo/SpeciesThermoMgr.h +++ b/include/cantera/thermo/SpeciesThermoMgr.h @@ -381,7 +381,7 @@ public: */ SpeciesThermo1(const SpeciesThermo1& right); - //! Asignment Operator + //! Assignment Operator /*! * @param right Object to be copied */ diff --git a/include/cantera/thermo/State.h b/include/cantera/thermo/State.h index 449fe925d..062c23a8b 100644 --- a/include/cantera/thermo/State.h +++ b/include/cantera/thermo/State.h @@ -126,7 +126,7 @@ public: * species, m_kk. There is no restriction * on the sum of the mole fraction vector. Internally, * the State object will normalize this vector before - * storring its contents. + * storing its contents. */ virtual void setMoleFractions(const doublereal* const x); @@ -166,7 +166,7 @@ public: * Input vector of mass fractions. There is no restriction * on the sum of the mass fraction vector. Internally, * the State object will normalize this vector before - * storring its contents. + * storing its contents. * Length is m_kk. */ virtual void setMassFractions(const doublereal* const y); @@ -315,7 +315,7 @@ public: */ doublereal molarVolume() const; - //! Set the internally storred density (kg/m^3) of the phase + //! Set the internally stored density (kg/m^3) of the phase /*! * Note the density of a phase is an indepedent variable. * @@ -325,7 +325,7 @@ public: m_dens = density; } - //! Set the internally storred molar density (kmol/m^3) of the phase. + //! Set the internally stored molar density (kmol/m^3) of the phase. /*! * @param molarDensity Input molar density (kmol/m^3). */ @@ -333,7 +333,7 @@ public: //! Set the temperature (K). /*! - * This function sets the internally storred temperature of the phase. + * This function sets the internally stored temperature of the phase. * * @param temp Temperature in kelvin */ diff --git a/include/cantera/thermo/StoichSubstance.h b/include/cantera/thermo/StoichSubstance.h index 07dae01cc..99e1eafa2 100644 --- a/include/cantera/thermo/StoichSubstance.h +++ b/include/cantera/thermo/StoichSubstance.h @@ -43,7 +43,7 @@ public: */ StoichSubstance(const StoichSubstance& right); - //! Asignment operator + //! Assignment operator /*! * Assignment operator for the object. Constructed * object will be a clone of this object, but will @@ -144,7 +144,7 @@ public: //! Report the Pressure. Units: Pa. /*! * For an incompressible substance, the density is independent - * of pressure. This method simply returns the storred + * of pressure. This method simply returns the stored * pressure value. */ virtual doublereal pressure() const; diff --git a/include/cantera/thermo/StoichSubstanceSSTP.h b/include/cantera/thermo/StoichSubstanceSSTP.h index 5ea3d0ef6..3fe56feff 100644 --- a/include/cantera/thermo/StoichSubstanceSSTP.h +++ b/include/cantera/thermo/StoichSubstanceSSTP.h @@ -6,7 +6,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -237,7 +237,7 @@ public: //! Report the Pressure. Units: Pa. /*! * For an incompressible substance, the density is independent - * of pressure. This method simply returns the storred + * of pressure. This method simply returns the stored * pressure value. */ virtual doublereal pressure() const; @@ -499,7 +499,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * For this phase, the density of the phase is specified in this block. * diff --git a/include/cantera/thermo/SurfPhase.h b/include/cantera/thermo/SurfPhase.h index 1215e522d..c90d543c7 100644 --- a/include/cantera/thermo/SurfPhase.h +++ b/include/cantera/thermo/SurfPhase.h @@ -180,7 +180,7 @@ public: */ SurfPhase(const SurfPhase& right); - //! Asignment operator + //! Assignment operator /*! * Assignment operator for the object. Constructed * object will be a clone of this object, but will @@ -203,7 +203,7 @@ public: */ ThermoPhase* duplMyselfAsThermoPhase() const; - //----- reimplimented methods of class ThermoPhase ------ + //----- reimplemented methods of class ThermoPhase ------ //! Equation of state type flag. /*! @@ -277,7 +277,7 @@ public: //! Return an array of partial molar volumes for the //! species in the mixture. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -510,7 +510,7 @@ public: return m_press; } - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method must be reimplemented in derived classes, where it @@ -686,7 +686,7 @@ protected: */ mutable array_fp m_pe; - //! vector storring the log of the size of each species. + //! vector storing the log of the size of each species. /*! * The size of each species is defined as the number of surface * sites each species occupies. @@ -698,9 +698,9 @@ private: //! Update the species reference state thermodynamic functions /*! * The polynomials for the standard state functions are only - * reevalulated if the temperature has changed. + * reevaluated if the temperature has changed. * - * @param force Boolean, which if true, forces a reevalulation + * @param force Boolean, which if true, forces a reevaluation * of the thermo polynomials. * default = false. */ diff --git a/include/cantera/thermo/ThermoFactory.h b/include/cantera/thermo/ThermoFactory.h index 72e0a9eb7..10e9728e8 100644 --- a/include/cantera/thermo/ThermoFactory.h +++ b/include/cantera/thermo/ThermoFactory.h @@ -33,10 +33,10 @@ class VPSSMgr; */ //@{ -//! Specific error to be thrown if the type of Thermo mananger is unrecognized. +//! Specific error to be thrown if the type of Thermo manager is unrecognized. /*! * This particular error class may be caught, if the application may have other - * models that the main Cantera appliation doesn't know about. + * models that the main Cantera application doesn't know about. */ class UnknownThermoPhaseModel : public CanteraError { diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h index 8eff52ed9..40b76f52a 100644 --- a/include/cantera/thermo/ThermoPhase.h +++ b/include/cantera/thermo/ThermoPhase.h @@ -198,7 +198,7 @@ class XML_Node; * Typically, the way the ThermoPhase object works is that there are a set * of functions that set the state of the phase via setting the internal * independent variables. Then, there are another set of functions that - * query the thermodynamic functions evalulated at the current %State of the + * query the thermodynamic functions evaluated at the current %State of the * phase. Internally, most of the intermediate work generally occurs at the * point where the internal state of the system is set and not at the time * when individual thermodynamic functions are queried (though the actual @@ -350,7 +350,7 @@ class XML_Node; * where \f$ \nu_k \f$ is the charge of species k, and \f$ \phi_p \f$ is * the electric potential of phase p. * - * The potential \f$ \phi_p \f$ is tracked and internally storred within + * The potential \f$ \phi_p \f$ is tracked and internally stored within * the base %ThermoPhase object. It constitutes a specification of the * internal state of the phase; it's the third state variable, the first * two being temperature and density (or, pressure, for incompressible @@ -405,7 +405,7 @@ class XML_Node; * the standard chemical potential at unit activity, * which depends on the temperature and pressure, * but not on the composition. The - * activity is dimensionless. Within liquid electrolytes its common to use a + * activity is dimensionless. Within liquid electrolytes it's common to use a * molality convention, where solute species employ the molality-based * activity coefficients: * @@ -912,7 +912,7 @@ public: return err("pressure"); } - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * This method must be reimplemented in derived classes, where it @@ -1021,7 +1021,7 @@ public: * cAC_CONVENTION_MOLAR 0 * - default * - * - Molality-based acvtivities + * - Molality-based activities * (unit activity of solutes at a hypothetical 1 molal * solution referenced to infinite dilution at all * pressures and temperatures). @@ -1239,7 +1239,7 @@ public: //! Return an array of partial molar internal energies for the //! species in the mixture. Units: J/kmol. /*! - * @param ubar Output vector of speciar partial molar internal energies. + * @param ubar Output vector of species partial molar internal energies. * Length = m_kk. units are J/kmol. */ virtual void getPartialMolarIntEnergies(doublereal* ubar) const { @@ -1260,7 +1260,7 @@ public: //! Return an array of partial molar volumes for the //! species in the mixture. Units: m^3/kmol. /*! - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const { @@ -1621,7 +1621,7 @@ public: */ void setState_TPX(doublereal t, doublereal p, const std::string& x); - //! Set the internally storred temperature (K), pressure (Pa), and mass fractions of the phase. + //! Set the internally stored temperature (K), pressure (Pa), and mass fractions of the phase. /*! * Note, the mass fractions are set first before the pressure is set. * Setting the pressure may involve the solution of a nonlinear equation. @@ -1633,7 +1633,7 @@ public: */ void setState_TPY(doublereal t, doublereal p, const doublereal* y); - //! Set the internally storred temperature (K), pressure (Pa), and mass fractions of the phase + //! Set the internally stored temperature (K), pressure (Pa), and mass fractions of the phase /*! * Note, the mass fractions are set first before the pressure is set. * Setting the pressure may involve the solution of a nonlinear equation. @@ -1645,7 +1645,7 @@ public: */ void setState_TPY(doublereal t, doublereal p, compositionMap& y); - //! Set the internally storred temperature (K), pressure (Pa), and mass fractions of the phase + //! Set the internally stored temperature (K), pressure (Pa), and mass fractions of the phase /*! * Note, the mass fractions are set first before the pressure is set. * Setting the pressure may involve the solution of a nonlinear equation. @@ -1677,7 +1677,7 @@ public: */ void setState_PX(doublereal p, doublereal* x); - //! Set the internally storred pressure (Pa) and mass fractions. + //! Set the internally stored pressure (Pa) and mass fractions. /*! * Note, the temperature is held constant during this operation. * Note, the mass fractions are set first before the pressure is set. @@ -1689,7 +1689,7 @@ public: */ void setState_PY(doublereal p, doublereal* y); - //! Set the internally storred specific enthalpy (J/kg) and pressure (Pa) of the phase. + //! Set the internally stored specific enthalpy (J/kg) and pressure (Pa) of the phase. /*! * @param h Specific enthalpy (J/kg) * @param p Pressure (Pa) @@ -1794,7 +1794,7 @@ public: * Called by function 'equilibrate' in ChemEquil.h to transfer * the element potentials to this object after every successful * equilibration routine. - * The element potentials are storred in their dimensionless + * The element potentials are stored in their dimensionless * forms, calculated by dividing by RT. * * @param lambda Input vector containing the element potentials. @@ -1803,14 +1803,14 @@ public: void setElementPotentials(const vector_fp& lambda); - //! Returns the element potentials storred in the ThermoPhase object + //! Returns the element potentials stored in the ThermoPhase object /*! - * Returns the storred element potentials. - * The element potentials are retrieved from their storred + * Returns the stored element potentials. + * The element potentials are retrieved from their stored * 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 storred element + * @return bool indicating whether thare 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. @@ -2094,7 +2094,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * @param eosdata An XML_Node object corresponding to * the "thermo" entry for this phase in the input file. @@ -2254,7 +2254,7 @@ protected: */ size_t m_index; - //! Storred value of the electric potential for this phase + //! Stored value of the electric potential for this phase /*! * Units are Volts */ diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h index 52f2d958f..d42a0ece4 100644 --- a/include/cantera/thermo/VPSSMgr.h +++ b/include/cantera/thermo/VPSSMgr.h @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr VPSSMgr\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -549,12 +549,12 @@ public: */ virtual void setState_P(doublereal P); - //! Return the temperatue storred in the object + //! Return the temperatue stored in the object doublereal temperature() const { return m_tlast; } - //! Return the pressure storred in the object + //! Return the pressure stored in the object doublereal pressure() const { return m_plast; } diff --git a/include/cantera/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h index 7c07705be..6f4669f04 100644 --- a/include/cantera/thermo/VPSSMgr_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_ConstVol.h @@ -6,7 +6,7 @@ * \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol \endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/VPSSMgr_General.h b/include/cantera/thermo/VPSSMgr_General.h index 9bfd43e48..0760a32e3 100644 --- a/include/cantera/thermo/VPSSMgr_General.h +++ b/include/cantera/thermo/VPSSMgr_General.h @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr_General VPSSMgr_General\endlink). */ /* - * Copywrite (2007) Sandia Corporation. Under the terms of + * Copyright (2007) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/VPSSMgr_IdealGas.h b/include/cantera/thermo/VPSSMgr_IdealGas.h index 24b054fcf..b45e82998 100644 --- a/include/cantera/thermo/VPSSMgr_IdealGas.h +++ b/include/cantera/thermo/VPSSMgr_IdealGas.h @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr_IdealGas VPSSMgr_IdealGas\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h index d5a3c19c3..7473a74f6 100644 --- a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h @@ -8,7 +8,7 @@ * class \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/VPSSMgr_Water_HKFT.h b/include/cantera/thermo/VPSSMgr_Water_HKFT.h index d2f6fcbf7..def6c7354 100644 --- a/include/cantera/thermo/VPSSMgr_Water_HKFT.h +++ b/include/cantera/thermo/VPSSMgr_Water_HKFT.h @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr_Water_HKFT VPSSMgr_Water_HKFT\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/VPSSMgr_types.h b/include/cantera/thermo/VPSSMgr_types.h index 11a75324c..4c48a048f 100644 --- a/include/cantera/thermo/VPSSMgr_types.h +++ b/include/cantera/thermo/VPSSMgr_types.h @@ -8,7 +8,7 @@ * class \link Cantera::VPSSMgr VPSSMgr\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/VPStandardStateTP.h b/include/cantera/thermo/VPStandardStateTP.h index ab492dbca..bb6789651 100644 --- a/include/cantera/thermo/VPStandardStateTP.h +++ b/include/cantera/thermo/VPStandardStateTP.h @@ -9,7 +9,7 @@ * methods for calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -286,7 +286,7 @@ public: virtual void setTemperature(const doublereal temp); - //! Set the internally storred pressure (Pa) at constant + //! Set the internally stored pressure (Pa) at constant //! temperature and composition /*! * Currently this passes down to setState_TP(). It does not @@ -337,7 +337,7 @@ public: //! Returns the current pressure of the phase /*! * The pressure is an independent variable in this phase. Its current value - * is storred in the object VPStandardStateTP. + * is stored in the object VPStandardStateTP. * * @return return the pressure in pascals. */ diff --git a/include/cantera/thermo/WaterProps.h b/include/cantera/thermo/WaterProps.h index c15ccbca7..a292f158b 100644 --- a/include/cantera/thermo/WaterProps.h +++ b/include/cantera/thermo/WaterProps.h @@ -6,7 +6,7 @@ * and class \link Cantera::WaterProps WaterProps\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -40,7 +40,7 @@ class PDSS_Water; * where \f$ \nu_k \f$ is the charge of species k, and \f$ \phi_p \f$ is * the electric potential of phase p. * - * The potential \f$ \phi_p \f$ is tracked and internally storred within + * The potential \f$ \phi_p \f$ is tracked and internally stored within * the base %ThermoPhase object. It constitutes a specification of the * internal state of the phase; it's the third state variable, the first * two being temperature and density (or, pressure, for incompressible diff --git a/include/cantera/thermo/WaterPropsIAPWS.h b/include/cantera/thermo/WaterPropsIAPWS.h index e4aea56af..cfca2056f 100644 --- a/include/cantera/thermo/WaterPropsIAPWS.h +++ b/include/cantera/thermo/WaterPropsIAPWS.h @@ -5,7 +5,7 @@ * basis (See class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -109,7 +109,7 @@ namespace Cantera * * This class is not a %ThermoPhase. However, it does maintain an internal state of * the object that is dependent on temperature and density. The internal state - * is characterized by an internally storred \f$ \tau\f$ and a \f$ \delta \f$ value, + * is characterized by an internally stored \f$ \tau\f$ and a \f$ \delta \f$ value, * and an iState value, which indicates whether the point is a liquid, a gas, * or a supercritical fluid. * Along with that the \f$ \tau\f$ and a \f$ \delta \f$ values are polynomials of @@ -117,13 +117,13 @@ namespace Cantera * Therefore, whenever \f$ \tau\f$ or \f$ \delta \f$ is changed, the function setState() * must be called in order for the internal state to be kept up to date. * - * The class is pretty straightfoward. However, one function deserves mention. + * The class is pretty straightforward. However, one function deserves mention. * the #density() function calculates the density that is consistent with * a particular value of the temperature and pressure. It may therefore be * multivalued or potentially there may be no answer from this function. It therefore * takes a phase guess and a density guess as optional parameters. If no guesses are * supplied to density(), a gas phase guess is assumed. This may or may not be what - * is wanted. Therefore, density() should usually at leat be supplied with a phase + * is wanted. Therefore, density() should usually at least be supplied with a phase * guess so that it may manufacture an appropriate density guess. * #density() manufactures the initial density guess, nondimensionalizes everything, * and then calls #WaterPropsIAPWSphi::dfind(), which does the iterative calculation @@ -148,7 +148,7 @@ namespace Cantera * multivalued. Therefore, we need to supply in addition a phase guess and a rho guess * to the input temperature and pressure. * The psat() function sets the internal state to the saturated liquid or saturated gas - * state, dependeing on the waterState parameter. + * state, depending on the waterState parameter. * * Because the underlying object WaterPropsIAPWSphi is privately held, you can be * sure that the underlying state of this object doesn't change except due to the @@ -236,7 +236,7 @@ public: * multivalued or potentially there may be no answer from this function. It therefore * takes a phase guess and a density guess as optional parameters. If no guesses are * supplied to density(), a gas phase guess is assumed. This may or may not be what - * is wanted. Therefore, density() should usually at leat be supplied with a phase + * is wanted. Therefore, density() should usually at least be supplied with a phase * guess so that it may manufacture an appropriate density guess. * #density() manufactures the initial density guess, nondimensionalizes everything, * and then calls #WaterPropsIAPWSphi::dfind(), which does the iterative calculation @@ -266,7 +266,7 @@ public: * takes a phase guess and a density guess as optional parameters. If no guesses are * supplied to density(), a gas phase guess is assumed. This may or may not be what - * is wanted. Therefore, density() should usually at leat be supplied with a phase + * is wanted. Therefore, density() should usually at least be supplied with a phase * guess so that it may manufacture an appropriate density guess. * #density() manufactures the initial density guess, nondimensionalizes everything, * and then calls #WaterPropsIAPWSphi::dfind(), which does the iterative calculation @@ -293,7 +293,7 @@ public: //! Returns the temperature (Kelvin) /*! - * @return Returns the internally storred temperature + * @return Returns the internally stored temperature */ doublereal temperature() const; diff --git a/include/cantera/thermo/WaterPropsIAPWSphi.h b/include/cantera/thermo/WaterPropsIAPWSphi.h index a0dd9feeb..782b57465 100644 --- a/include/cantera/thermo/WaterPropsIAPWSphi.h +++ b/include/cantera/thermo/WaterPropsIAPWSphi.h @@ -6,7 +6,7 @@ * This class calculates dimensionless quantitites. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/thermo/WaterSSTP.h b/include/cantera/thermo/WaterSSTP.h index a42265420..e603f3c89 100644 --- a/include/cantera/thermo/WaterSSTP.h +++ b/include/cantera/thermo/WaterSSTP.h @@ -4,7 +4,7 @@ * and class \link Cantera::WaterSSTP WaterSSTP\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -506,7 +506,7 @@ public: * an input file. It should be overloaded in subclasses to set * any parameters that are specific to that particular phase * model. Note, this method is called before the phase is - * initialzed with elements and/or species. + * initialized with elements and/or species. * * @param eosdata An XML_Node object corresponding to * the "thermo" entry for this phase in the input file. diff --git a/include/cantera/thermo/electrolytes.h b/include/cantera/thermo/electrolytes.h index 44b10343e..ffaf7ad6c 100644 --- a/include/cantera/thermo/electrolytes.h +++ b/include/cantera/thermo/electrolytes.h @@ -5,7 +5,7 @@ * thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h index c4c950165..18d1f8aa1 100644 --- a/include/cantera/transport/AqueousTransport.h +++ b/include/cantera/transport/AqueousTransport.h @@ -569,7 +569,7 @@ private: //! Internal storage for species polarizability vector_fp m_alpha; - //! Current Temperature -> locally storred + //! Current Temperature -> locally stored /*! * This is used to test whether new temperature computations * should be performed. @@ -666,7 +666,7 @@ private: //! Mode for fitting the species viscosities /*! - * Either its CK_Mode or its cantera mode + * Either it's CK_Mode or it's cantera mode * in CK_Mode visc is fitted to a polynomial * in Cantera mode sqrt(visc) is fitted. */ diff --git a/include/cantera/transport/LTPspecies.h b/include/cantera/transport/LTPspecies.h index 6099abff3..981cdfe58 100644 --- a/include/cantera/transport/LTPspecies.h +++ b/include/cantera/transport/LTPspecies.h @@ -32,7 +32,7 @@ namespace Cantera * Not all of these are handled by each class and each class * should handle exceptions where the transport property is not handled. * - * Tranport properties currently on the list + * Transport properties currently on the list * * 0 - viscosity * 1 - Ionic conductivity @@ -89,7 +89,7 @@ class LTPspecies public: - //! Construct an LTPspecies object for a liquid tranport property. + //! Construct an LTPspecies object for a liquid transport property. /*! * The species transport property is constructed from the XML node, * \verbatim , \endverbatim that is a child of the @@ -128,7 +128,7 @@ public: */ virtual LTPspecies* duplMyselfAsLTPspecies() const; - //! Returns the vector of pure species tranport property + //! Returns the vector of pure species transport property /*! * The pure species transport property (i.e. pure species viscosity) * is returned. Any temperature and composition dependence will be @@ -185,8 +185,8 @@ protected: * For example, to have Li+ and Ca+ represent the mixing * transport properties of LiCl and CaCl2, the weightings for * Li+ would be 2.0, for K+ would be 3.0 and for Cl- would be 0.0. - * The tranport properties for Li+ would be those for LiCl and - * the tranport properties for Ca+ would be those for CaCl2. + * The transport properties for Li+ would be those for LiCl and + * the transport properties for Ca+ would be those for CaCl2. * The transport properties for Cl- should be something innoccuous like * 1.0--note that 0.0 is not innocuous if there are logarithms involved. */ @@ -208,7 +208,7 @@ protected: * * 1.000 * - * + * * * * \endverbatim @@ -218,7 +218,7 @@ class LTPspecies_Const : public LTPspecies public: - //! Construct an LTPspecies object for a liquid tranport property + //! Construct an LTPspecies object for a liquid transport property //! expressed as a constant value. /** The transport property is constructed from the XML node, * \verbatim , \endverbatim that is a child of the @@ -256,7 +256,7 @@ public: */ virtual LTPspecies* duplMyselfAsLTPspecies() const; - //! Returns the pure species tranport property + //! Returns the pure species transport property /*! * The pure species transport property (i.e. pure species viscosity) * is returned. Any temperature and composition dependence will be @@ -290,7 +290,7 @@ public: * 0.0 * 23788.e3 * - * + * * * * \endverbatim @@ -300,7 +300,7 @@ class LTPspecies_Arrhenius : public LTPspecies public: - //! Construct an LTPspecies object for a liquid tranport property + //! Construct an LTPspecies object for a liquid transport property //! expressed in extended Arrhenius form. /*! * The transport property is constructed from the XML node, @@ -399,7 +399,7 @@ protected: * * 0.6, -15.0e-5 * - * + * * * * \endverbatim @@ -409,7 +409,7 @@ class LTPspecies_Poly : public LTPspecies public: - //! Construct an LTPspecies object for a liquid tranport property expressed as a polynomial in temperature. + //! Construct an LTPspecies object for a liquid transport property expressed as a polynomial in temperature. /*! * The transport property is constructed from the XML node, \verbatim , \endverbatim that is a child of the * \verbatim \endverbatim node and specifies a type of transport property (like viscosity). @@ -446,7 +446,7 @@ public: */ virtual LTPspecies* duplMyselfAsLTPspecies() const; - //! Returns the pure species tranport property + //! Returns the pure species transport property /*! * The pure species transport property (i.e. pure species viscosity) * is returned. Any temperature and composition dependence will be @@ -486,7 +486,7 @@ protected: * * 0.6, -15.0e-5 * - * + * * * * \endverbatim @@ -496,7 +496,7 @@ class LTPspecies_ExpT : public LTPspecies public: - //! Construct an LTPspecies object for a liquid tranport property + //! Construct an LTPspecies object for a liquid transport property //! expressed as an exponential in temperature. /*! * The transport property is constructed from the XML node, \verbatim , \endverbatim that is a child of the @@ -535,7 +535,7 @@ public: */ virtual LTPspecies* duplMyselfAsLTPspecies() const; - //! Returns the pure species tranport property + //! Returns the pure species transport property /*! * The pure species transport property (i.e. pure species viscosity) * is returned. Any temperature and composition dependence will be diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h index a05e5a4d0..5fa251ae7 100644 --- a/include/cantera/transport/LiquidTransport.h +++ b/include/cantera/transport/LiquidTransport.h @@ -1291,7 +1291,7 @@ private: //! Matrix for the stefan maxwell equation. DenseMatrix m_A; - //! Current Temperature -> locally storred + //! Current Temperature -> locally stored /*! * This is used to test whether new temperature computations * should be performed. diff --git a/include/cantera/transport/LiquidTransportData.h b/include/cantera/transport/LiquidTransportData.h index c70bca420..9a312fc94 100644 --- a/include/cantera/transport/LiquidTransportData.h +++ b/include/cantera/transport/LiquidTransportData.h @@ -25,7 +25,7 @@ namespace Cantera * A LiquidTransportData object is created for each species. * * This class is mainly used to collect transport properties - * from the parse phase in the TranportFactory and transfer + * from the parse phase in the TransportFactory and transfer * them to the Transport class. Transport properties are * expressed by subclasses of LTPspecies. * One may need to be careful about deleting pointers to LTPspecies diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index 890a1e96c..61d09dfa2 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -196,12 +196,12 @@ public: //! Returns the Mixture-averaged diffusion coefficients [m^2/s]. /*! * Returns the mixture averaged diffusion coefficients for a gas, appropriate for calculating the - * mass averged diffusive flux with respect to the mass averaged velocity using gradients of the + * mass averaged diffusive flux with respect to the mass averaged velocity using gradients of the * mole fraction. * Note, for the single species case or the pure fluid case the routine returns the self-diffusion coefficient. * This is need to avoid a Nan result in the formula below. * - * This is Eqn. 12.180 from "Chemicaly Reacting Flow" + * This is Eqn. 12.180 from "Chemically Reacting Flow" * * \f[ * D_{km}' = \frac{\left( \bar{M} - X_k M_k \right)}{ \bar{\qquad M \qquad } } {\left( \sum_{j \ne k} \frac{X_j}{D_{kj}} \right) }^{-1} @@ -559,7 +559,7 @@ private: * Not used in this routine -> just a passthrough * * These values are 0, 1 and 1.5 for single-molecule, linear, and nonlinear species respectively - * length is the number of species in the pahse + * length is the number of species in the phase * units are dimensionless (Cr / R) */ vector_fp m_crot; diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index add591c26..d7bf625d1 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -344,20 +344,20 @@ private: bool m_lmatrix_soln_ok; int m_mode; - //! Evalulate the L0000 matrices + //! Evaluate the L0000 matrices /*! * Evaluate the upper-left block of the L matrix. * @param x vector of species mole fractions */ void eval_L0000(const doublereal* const x); - //! Evalulate the L0010 matrices + //! Evaluate the L0010 matrices /*! * @param x vector of species mole fractions */ void eval_L0010(const doublereal* const x); - //! Evalulate the L1000 matrices + //! Evaluate the L1000 matrices /*! * */ diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index aa6ce9d24..881dafe55 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -806,7 +806,7 @@ private: */ vector_fp m_chargeSpecies; - //! Current Temperature -> locally storred + //! Current Temperature -> locally stored /*! * This is used to test whether new temperature computations * should be performed. diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index 176038757..6b5970542 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -121,12 +121,12 @@ const VelocityBasis VB_SPECIES_3 = 3; * the %Transport class necessarily use the %ThermoPhase class to obtain * the list of species and the thermodynamic state of the phase. * - * No state information is storred within %Transport classes. + * No state information is stored within %Transport classes. * Queries to the underlying ThermoPhase object must be made to obtain * the state of the system. * * An exception to this however is the state information concerning the - * the gradients of variables. This information is not storred within + * the gradients of variables. This information is not stored within * the ThermoPhase objects. It may be collected within the Transport objects. * In fact, the meaning of const operations within the Transport class * refers to calculations which do not change the state of the diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h index c0c16c1a7..b0c711b14 100644 --- a/include/cantera/transport/TransportFactory.h +++ b/include/cantera/transport/TransportFactory.h @@ -362,7 +362,7 @@ private: //! Prepare to build a new transport manager for liquids assuming that - //! viscosity transport data is provided in Arhennius form. + //! viscosity transport data is provided in Arrhenius form. /*! * @param flog Reference to the ostream for writing log info * @param thermo Pointer to the %ThermoPhase object diff --git a/include/cantera/transport/TransportParams.h b/include/cantera/transport/TransportParams.h index 3f2d7f172..e026148a6 100644 --- a/include/cantera/transport/TransportParams.h +++ b/include/cantera/transport/TransportParams.h @@ -127,7 +127,7 @@ public: //! This is vector of vectors containing the integer lookup value for the (i,j) interaction /*! * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. - * Unique values of delta get their own spot in the array. The values of delta are storred in + * Unique values of delta get their own spot in the array. The values of delta are stored in * the fitlist vector. * * The inner loop is over degree + 1, which is the polynomial order of the collision integral fit. @@ -137,7 +137,7 @@ public: //! This is vector of vectors containing the astar fit. /*! * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. - * Unique values of delta get their own spot in the array. The values of delta are storred in + * Unique values of delta get their own spot in the array. The values of delta are stored in * the fitlist vector. * * The inner loop is over degree + 1, which is the polynomial order of the collision integral fit. @@ -147,7 +147,7 @@ public: //! This is vector of vectors containing the astar fit. /*! * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. - * Unique values of delta get their own spot in the array. The values of delta are storred in + * Unique values of delta get their own spot in the array. The values of delta are stored in * the fitlist vector. * * The inner loop is over degree + 1, which is the polynomial order of the collision integral fit. @@ -157,7 +157,7 @@ public: //! This is vector of vectors containing the astar fit. /*! * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. - * Unique values of delta get their own spot in the array. The values of delta are storred in + * Unique values of delta get their own spot in the array. The values of delta are stored in * the fitlist vector. * * The inner loop is over degree + 1, which is the polynomial order of the collision integral fit. @@ -167,7 +167,7 @@ public: //! This is vector of vectors containing the astar fit. /*! * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. - * Unique values of delta get their own spot in the array. The values of delta are storred in + * Unique values of delta get their own spot in the array. The values of delta are stored in * the fitlist vector. * * The inner loop is over degree + 1, which is the polynomial order of the collision integral fit. @@ -184,7 +184,7 @@ public: //! Dimensionless rotational heat capacity of the species in the current phase /*! * These values are 0, 1 and 1.5 for single-molecule, linear, and nonlinear species respectively - * length is the number of species in the pahse + * length is the number of species in the phase * units are dimensionless (Cr / R) */ vector_fp crot; @@ -206,7 +206,7 @@ public: /*! * This is used in astar_poly, bstar_poly, cstar_poly, and omega22_poly. * The outer loop is over a flat (i,j) index that is parameterized on the tr.delta(i,j) value. - * Unique values of delta get their own spot in the array. The values of delta are storred in + * Unique values of delta get their own spot in the array. The values of delta are stored in * the fitlist vector. * */ diff --git a/include/cantera/zeroD/Reactor.h b/include/cantera/zeroD/Reactor.h index f3e18b570..f7e9c4793 100644 --- a/include/cantera/zeroD/Reactor.h +++ b/include/cantera/zeroD/Reactor.h @@ -23,7 +23,7 @@ namespace Cantera * networks. * * The reactor class integrates the same governing equations no - * mattter what type of reactor is simulated. The differences + * matter what type of reactor is simulated. The differences * among reactor types are completely specified by the attached * flow devices and the time-dependent user-specified boundary * conditions. diff --git a/samples/f77/demo_ftnlib.cpp b/samples/f77/demo_ftnlib.cpp index 5e261566a..9f7916b27 100644 --- a/samples/f77/demo_ftnlib.cpp +++ b/samples/f77/demo_ftnlib.cpp @@ -20,7 +20,7 @@ (surface chemistry, etc.) could be written in the same way. This library is designed for Fortran compilers that expect external - procedure na,es to be lowercase with a trailing underscore. If this + procedure names to be lowercase with a trailing underscore. If this is not the case, the procedure names must be edited before use. */ diff --git a/site_scons/buildutils.py b/site_scons/buildutils.py index 8c8f5e4d0..cd6b0d685 100644 --- a/site_scons/buildutils.py +++ b/site_scons/buildutils.py @@ -390,7 +390,7 @@ optionWrapper = textwrap.TextWrapper(initial_indent=' ', def formatOption(env, opt): """ Print a nicely formatted description of a SCons configuration - option, it's permitted values, default value, and current value + option, its permitted values, default value, and current value if different from the default. """ # Extract the help description from the permitted values. Original format diff --git a/src/apps/mdp_allo.cpp b/src/apps/mdp_allo.cpp index d4a863303..f5bcdfc2d 100644 --- a/src/apps/mdp_allo.cpp +++ b/src/apps/mdp_allo.cpp @@ -420,10 +420,10 @@ int* mdp_alloc_int_1(int nvalues, const int val) * Input * ------- * nvalues = Length of the array -* val = intialization value +* val = initialization value * Return * ------ -* Pointer to the intialized integer array +* Pointer to the initialized integer array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -457,14 +457,14 @@ void mdp_safe_alloc_int_1(int** array_hdl, int nvalues, const int val) * * mdp_safe_alloc_int_1: * -* Allocates and/or initializse a one dimensional array of integers. +* Allocates and/or initialize a one dimensional array of integers. * * Input * ------- * *array_hdl = Previous value of pointer. If non-NULL will try * to free the memory at this address. * nvalues = Length of the array -* val = intialization value +* val = initialization value * Output * ------ * *array_hdl = This value is initialized to the correct address @@ -582,10 +582,10 @@ int** mdp_alloc_int_2(int ndim1, int ndim2, const int val) * ------- * ndim1 = Length of the first dimension of the array * ndim2 = Length of the second dimension of the array -* val = intialization value +* val = initialization value * Return * ------ -* Pointer to the intialized integer array +* Pointer to the initialized integer array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -631,10 +631,10 @@ double* mdp_alloc_dbl_1(int nvalues, const double val) * Input * ------- * nvalues = Length of the array -* val = intialization value +* val = initialization value * Return * ------ -* Pointer to the intialized integer array +* Pointer to the initialized integer array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -790,10 +790,10 @@ char* mdp_alloc_char_1(int nvalues, const char val) * Input * ------- * nvalues = Length of the array -* val = intialization value +* val = initialization value * Return * ------ -* Pointer to the intialized character array +* Pointer to the initialized character array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -866,10 +866,10 @@ double** mdp_alloc_dbl_2(int ndim1, int ndim2, const double val) * ------- * ndim1 = Length of the first dimension of the array * ndim2 = Length of the second dimension of the array -* val = intialization value +* val = initialization value * Return * ------ -* Pointer to the intialized double array +* Pointer to the initialized double array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { diff --git a/src/apps/tok_input_util.cpp b/src/apps/tok_input_util.cpp index aa06e9152..fc926dbda 100644 --- a/src/apps/tok_input_util.cpp +++ b/src/apps/tok_input_util.cpp @@ -1498,7 +1498,7 @@ bool toktokmatch(const TOKEN* keyptr1, const TOKEN* keyptr2) * fillTokStruct() * * Fill in a keyLineStruct with a string. Use the defn of white space - * at the start of the file to tokenize the string, storring it in the + * at the start of the file to tokenize the string, storing it in the * TOKEN structure. */ void fillTokStruct(TOKEN* keyptr1, const char* s2) diff --git a/src/apps/tok_input_util.h b/src/apps/tok_input_util.h index edd90e1a9..97910ef50 100644 --- a/src/apps/tok_input_util.h +++ b/src/apps/tok_input_util.h @@ -18,7 +18,7 @@ * This structure is used to parse strings. The original string is * tokenized into a set of tokens via separation wrt white space. * Both the tokens and the original - * string are storred within the structure + * string are stored within the structure */ struct TOKEN { diff --git a/src/base/LogPrintCtrl.cpp b/src/base/LogPrintCtrl.cpp index 6402c7168..2da217433 100644 --- a/src/base/LogPrintCtrl.cpp +++ b/src/base/LogPrintCtrl.cpp @@ -4,7 +4,7 @@ * (see \ref Cantera::LogPrintCtrl). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/base/LogPrintCtrl.h b/src/base/LogPrintCtrl.h index 4635fc617..a6d5f0068 100644 --- a/src/base/LogPrintCtrl.h +++ b/src/base/LogPrintCtrl.h @@ -4,7 +4,7 @@ * (see \ref Cantera::LogPrintCtrl). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/base/PrintCtrl.cpp b/src/base/PrintCtrl.cpp index 1ae44c145..897f518ff 100644 --- a/src/base/PrintCtrl.cpp +++ b/src/base/PrintCtrl.cpp @@ -4,7 +4,7 @@ * (see \ref Cantera::PrintCtrl). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/base/checkFinite.cpp b/src/base/checkFinite.cpp index 6fb1194b1..5afb11dd1 100644 --- a/src/base/checkFinite.cpp +++ b/src/base/checkFinite.cpp @@ -4,7 +4,7 @@ * check for the presence of NaNs in the code. */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/base/clockWC.cpp b/src/base/clockWC.cpp index e8562b409..23fedef6c 100644 --- a/src/base/clockWC.cpp +++ b/src/base/clockWC.cpp @@ -4,7 +4,7 @@ * (see \ref Cantera::clockWC). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp index cb13d9481..28f2d8031 100644 --- a/src/base/ctml.cpp +++ b/src/base/ctml.cpp @@ -49,22 +49,22 @@ static doublereal fpValue(std::string val) * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string titleString = "doSpecialOp"; bool value = true; addBool(node, titleString, value); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim true <\integer> <\parentNode> - @endverbatum + @endverbatim * * @param node reference to the XML_Node object of the parent XML element * @param titleString String name of the title attribute @@ -89,24 +89,24 @@ void addBool(Cantera::XML_Node& node, const std::string& title, const bool val) * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string titleString = "maxIterations"; int value = 1000; std::string typeString = "optional"; std::string units = ""; addInteger(node, titleString, value, typeString, units); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim 100 <\integer> <\parentNode> - @endverbatum + @endverbatim * * @param node reference to the XML_Node object of the parent XML element * @param titleString String name of the title attribute @@ -144,7 +144,7 @@ void addInteger(Cantera::XML_Node& node, const std::string& title, const int val * * Example: * - * @verbatum + * @verbatim const XML_Node &node; std::string titleString = "additionalCases"; int n = 3; @@ -152,16 +152,16 @@ void addInteger(Cantera::XML_Node& node, const std::string& title, const int val std::string typeString = "optional"; std::string units = ""; addIntegerArray(node, titleString, n, &cases[0], typeString, units); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim 3, 6, 10 <\intArray> <\parentNode> - @endverbatum + @endverbatim * * * @param node reference to the XML_Node object of the parent XML element @@ -234,8 +234,8 @@ void addIntegerArray(Cantera::XML_Node& node, const std::string& title, const si * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string titleString = "activationEnergy"; double value = 50.3; @@ -244,16 +244,16 @@ void addIntegerArray(Cantera::XML_Node& node, const std::string& title, const si std::string typeString = "optional"; std::string unitsString = "kcal/gmol"; addFloat(node, titleString, value, unitsString, typeString, minval, maxval); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim 50.3 <\float> <\parentNode> - @endverbatum + @endverbatim * * @param node reference to the XML_Node object of the parent XML element * @param titleString String name of the title attribute @@ -303,8 +303,8 @@ void addFloat(Cantera::XML_Node& node, const std::string& title, * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string titleString = "additionalTemperatures"; int n = 3; @@ -312,16 +312,16 @@ void addFloat(Cantera::XML_Node& node, const std::string& title, std::string typeString = "optional"; std::string units = "Kelvin"; addFloatArray(node, titleString, n, &cases[0], typeString, units); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim 273.15, 298.15, 373.15 <\floatArray> <\parentNode> - @endverbatum + @endverbatim * * @param node reference to the XML_Node object of the parent XML element * @param titleString String name of the title attribute @@ -389,8 +389,8 @@ void addFloatArray(Cantera::XML_Node& node, const std::string& title, const size * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string titleString = "additionalTemperatures"; int n = 3; @@ -398,16 +398,16 @@ void addFloatArray(Cantera::XML_Node& node, const std::string& title, const size std::string typeString = "optional"; std::string units = "Kelvin"; addNamedFloatArray(node, titleString, n, &cases[0], typeString, units); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim 273.15, 298.15, 373.15 <\additionalTemperatures> <\parentNode> - @endverbatum + @endverbatim * * @param node reference to the XML_Node object of the parent XML element * @param name Name of the XML node @@ -479,19 +479,19 @@ void addNamedFloatArray(Cantera::XML_Node& node, const std::string& name, const * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; addString(XML_Node& node, std::string titleString, std::string valueString, std::string typeString); - @endverbatum + @endverbatim * * Creates the following the snippet in the XML file: - * @verbatum + * @verbatim valueString <\string> - @endverbatum + @endverbatim * * @param node reference to the XML_Node object of the parent XML element * @param valueString Value string to be used in the new XML node. @@ -526,26 +526,26 @@ XML_Node* getByTitle(const Cantera::XML_Node& node, const std::string& title) /* * If the child XML_node named "name" doesn't exist, the empty string is returned. * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &parent; string name = "vacency_species"; string valueString = getChildValue(parent, name std::string typeString); - @endverbatum + @endverbatim * * returns valueString = "O(V)" * * from the following the snippet in the XML file: * - * @verbatum + * @verbatim O(V) <\vancencySpecies> - @endverbatum + @endverbatim * * @param parent parent reference to the XML_Node object of the parent XML element - * @param name Name of the childe XML_Node to read the value from. + * @param name Name of the child XML_Node to read the value from. * * @return String value of the child XML_Node */ @@ -566,19 +566,19 @@ std::string getChildValue(const Cantera::XML_Node& parent, const std::string& na * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; getString(XML_Node& node, std::string titleString, std::string valueString, std::string typeString); - @endverbatum + @endverbatim * * Reads the following the snippet in the XML file: - * @verbatum + * @verbatim valueString <\string> - @endverbatum + @endverbatim * * @param node Reference to the XML_Node object of the parent XML element * @param titleString String name of the title attribute of the child node @@ -612,30 +612,30 @@ void getString(const Cantera::XML_Node& node, const std::string& titleString, st * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &node; std::string valueString; std::string typeString; std::string nameString = "timeIncrement"; getString(XML_Node& node, nameString, valueString, valueString, typeString); - @endverbatum + @endverbatim * * Reads the following the snippet in the XML file: * - * * @verbatum + * * @verbatim valueString <\nameString> - @endverbatum + @endverbatim * * or alternatively as a retrofit and special case, it also reads the following case * - * @verbatum + * @verbatim valueString <\string> - @endverbatum + @endverbatim * * @param node Reference to the XML_Node object of the parent XML element * @param nameString Name of the XML Node input variable @@ -676,22 +676,22 @@ void getNamedStringValue(const Cantera::XML_Node& node, const std::string& nameS * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &State_XMLNode; std::map v; getinteger(State_XMLNode, v); - @endverbatum + @endverbatim * * reads the corresponding XML file: * - * @verbatum + * @verbatim 1 <\integer> 2 <\integer> 3 <\integer> <\state> - @endverbatum + @endverbatim * * Will produce the mapping: * @@ -737,23 +737,23 @@ void getIntegers(const Cantera::XML_Node& node, * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &State_XMLNode; std::map v; bool convert = true; getFloats(State_XMLNode, v, convert); - @endverbatum + @endverbatim * * reads the corresponding XML file: * - * @verbatum + * @verbatim 32.4 <\float> 1. <\float> 100. <\float> <\state> - @endverbatum + @endverbatim * * Will produce the mapping: * @@ -815,21 +815,21 @@ void getFloats(const Cantera::XML_Node& node, std::map& v, * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; if (state_XMLNode.hasChild("pressure")) { pres = getFloat(State_XMLNode, "pressure", "toSI"); } - @endverbatum + @endverbatim * * reads the corresponding XML file: - * @verbatum + * @verbatim 101325.0 <\state> - @endverbatum + @endverbatim * * @param parent reference to the XML_Node object of the parent XML element * @param name Name of the XML child element @@ -860,7 +860,7 @@ doublereal getFloat(const Cantera::XML_Node& parent, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; @@ -962,7 +962,7 @@ bool getOptionalFloat(const Cantera::XML_Node& parent, * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; doublereal pres = OneAtm; @@ -1022,7 +1022,7 @@ doublereal getFloatDefaultUnits(const Cantera::XML_Node& parent, std::string nam * * Example: * - * Code snipet: + * Code snippet: * @verbatim std::string modelName = ""; bool exists = getOptionalModel(transportNode, "compositionDependence", @@ -1064,21 +1064,21 @@ bool getOptionalModel(const Cantera::XML_Node& parent, const std::string nodeNam * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &State_XMLNode; int number = 1; if (state_XMLNode.hasChild("NumProcs")) { number = getInteger(State_XMLNode, "numProcs"); } - @endverbatum + @endverbatim * * reads the corresponding XML file: - * @verbatum + * @verbatim 10 <\numProcs> <\state> - @endverbatum + @endverbatim * * @param parent reference to the XML_Node object of the parent XML element * @param name Name of the XML child element @@ -1133,23 +1133,23 @@ int getInteger(const Cantera::XML_Node& parent, std::string name) * * Example: * - * Code snipet: - * @verbatum + * Code snippet: + * @verbatim const XML_Node &State_XMLNode; vector_fp v; bool convert = true; unitsString = ""; nodeName="floatArray"; getFloatArray(State_XMLNode, v, convert, unitsString, nodeName); - @endverbatum + @endverbatim * * reads the corresponding XML file: * - * @verbatum + * @verbatim 32.4, 1, 100. <\floatArray> <\state> - @endverbatum + @endverbatim * * Will produce the vector * @@ -1405,12 +1405,12 @@ void getMap(const Cantera::XML_Node& node, std::map& m * argument list. * Warning: No spaces are allowed in each pair. Quotes get included as part * of the string. - * Example: @verbatum + * Example: @verbatim red:112 blue:34 green:banana - @endverbatum + @endverbatim * * Returns: * key val @@ -1608,7 +1608,7 @@ void getStringArray(const Cantera::XML_Node& node, std::vector& v) * * Example: * - * Code snipet: + * Code snippet: * @verbatim const XML_Node &State_XMLNode; vector_fp v; diff --git a/src/base/mdp_allo.cpp b/src/base/mdp_allo.cpp index 4e645e471..af74be129 100644 --- a/src/base/mdp_allo.cpp +++ b/src/base/mdp_allo.cpp @@ -7,7 +7,7 @@ * $Date$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -487,10 +487,10 @@ int* mdp_alloc_int_1(int nvalues, const int val) * Input * ------- * nvalues = Length of the array - * val = intialization value + * val = initialization value * Return * ------ - * Pointer to the intialized integer array + * Pointer to the initialized integer array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -651,10 +651,10 @@ int** mdp_alloc_int_2(int ndim1, int ndim2, const int val) * ------- * ndim1 = Length of the first dimension of the array * ndim2 = Length of the second dimension of the array - * val = intialization value + * val = initialization value * Return * ------ - * Pointer to the intialized integer array + * Pointer to the initialized integer array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -700,10 +700,10 @@ double* mdp_alloc_dbl_1(int nvalues, const double val) * Input * ------- * nvalues = Length of the array - * val = intialization value + * val = initialization value * Return * ------ - * Pointer to the intialized array of doubles + * Pointer to the initialized array of doubles * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -738,14 +738,14 @@ void mdp_safe_alloc_dbl_1(double** array_hdl, int nvalues, const double val) * * mdp_safe_alloc_dbl_1: * - * Allocates and/or initializse a one dimensional array of doubles. + * Allocates and/or initializes a one dimensional array of doubles. * * Input * ------- * *array_hdl = Previous value of pointer. If non-NULL will try * to free the memory at this address. * nvalues = Length of the array - * val = intialization value + * val = initialization value * Output * ------ * *array_hdl = This value is initialized to the correct address @@ -866,10 +866,10 @@ double** mdp_alloc_dbl_2(int ndim1, int ndim2, const double val) * ------- * ndim1 = Length of the first dimension of the array * ndim2 = Length of the second dimension of the array - * val = intialization value + * val = initialization value * Return * ------ - * Pointer to the intialized integer array + * Pointer to the initialized integer array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -915,10 +915,10 @@ char* mdp_alloc_char_1(int nvalues, const char val) * Input * ------- * nvalues = Length of the array - * val = intialization value + * val = initialization value * Return * ------ - * Pointer to the intialized character array + * Pointer to the initialized character array * Failures are indicated by returning the NULL pointer. **************************************************************************/ { @@ -956,14 +956,14 @@ void mdp_safe_alloc_char_1(char** array_hdl, int nvalues, const char val) * * This routine will free any old memory that was located at that * position, before it will allocate a new vector. - * Allocates and/or initializse a one dimensional array of characters. + * Allocates and/or initializes a one dimensional array of characters. * * Input * ------- * array_hdl = Previous value of pointer. If non-NULL will try * to free the memory at this address. * nvalues = Length of the array - * val = intialization value + * val = initialization value * Output * ------ * *array_hdl = This value is initialized to the correct address @@ -1005,7 +1005,7 @@ void mdp_safe_alloc_dbl_2(double** *array_hdl, int ndim1, int ndim2, * to free the memory at this address. * ndim1 = Length of the array * ndim2 = Length of inner loop of the array - * val = intialization value + * val = initialization value * Return * ------ * *array_hdl = This value is initialized to the correct address diff --git a/src/base/misc.cpp b/src/base/misc.cpp index 7134a45da..1957b462a 100644 --- a/src/base/misc.cpp +++ b/src/base/misc.cpp @@ -147,7 +147,7 @@ namespace Cantera * Cantera has an assortment of constant values for physical parameters. * Also, Cantera maintains a collection of global data which is specific * to each process that invokes Cantera functions. This process-specific - * data is storred in the class Application. + * data is stored in the class Application. */ //@{ //@} @@ -344,7 +344,7 @@ protected: //! Write an error message and quit. /*! * The default behavior is - * to write to the standard eror stream, and then call + * to write to the standard error stream, and then call * exit(). Note that no end-of-line character is appended to * the message, and so if one is desired it must be included * in the string. Note that this default behavior will @@ -812,7 +812,7 @@ public: //! Write an error message and quit. /*! * The default behavior is - * to write to the standard eror stream, and then call + * to write to the standard error stream, and then call * exit(). Note that no end-of-line character is appended to * the message, and so if one is desired it must be included * in the string. Note that this default behavior will @@ -1128,7 +1128,7 @@ XML_Node* Application::get_XML_File(std::string file, int debug) if (xmlfiles.find(ff) != xmlfiles.end()) { #ifdef DEBUG_PATHS cout << "get_XML_File(): File, " << ff << ", was previously read." - << " Retrieving the storred xml tree." << endl; + << " Retrieving the stored xml tree." << endl; #endif return xmlfiles[ff]; } @@ -2062,7 +2062,7 @@ static void split_at_pound(const std::string& src, std::string& file, std::strin * part of the file_ID string. Searches are based on the * ID attribute of the XML element only. * - * param file_ID This is a concatenation of two strings seperated + * param file_ID This is a concatenation of two strings separated * by the "#" character. The string before the * pound character is the file name of an xml * file to carry out the search. The string after @@ -2109,7 +2109,7 @@ XML_Node* get_XML_Node(const std::string& file_ID, XML_Node* root) * * @param nameTarget This is the XML element name to look for. * - * @param file_ID This is a concatenation of two strings seperated + * @param file_ID This is a concatenation of two strings separated * by the "#" character. The string before the * pound character is the file name of an xml * file to carry out the search. The string after diff --git a/src/base/units.h b/src/base/units.h index 6faca1896..b59a8a009 100644 --- a/src/base/units.h +++ b/src/base/units.h @@ -76,7 +76,7 @@ public: /** * Return the multiplier required to convert a dimensional quantity * with units specified by string 'units' to SI units. - * The list of recognized units is storred as a stl map + * The list of recognized units is stored as a stl map * called m_u[] and m_act_u for activity * coefficients. These maps are initialized with likely values. * diff --git a/src/base/xml.cpp b/src/base/xml.cpp index f47b9e8a5..113a07589 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -579,7 +579,7 @@ XML_Node& XML_Node::mergeAsChild(XML_Node& node) return *m_children.back(); } -// Add a child node to the current node by makeing a copy of an existing node tree +// Add a child node to the current node by making a copy of an existing node tree /* * This will add an XML_Node as a child to the current node. * Note, this actually adds the node. Therefore, node is changed. @@ -827,7 +827,7 @@ std::string XML_Node::operator[](const std::string& attr) const // Function returns the value of an attribute /* - * This function searches the attibutes vector for the parameter + * This function searches the attributes vector for the parameter * std::string attribute. If a match is found, the attribute value * is returned as a string. If no match is found, the empty string * is returned. @@ -948,7 +948,7 @@ const std::vector& XML_Node::children() const size_t XML_Node::nChildren(const bool discardComments) const { if (discardComments) { - size_t count = 0; + size_t count = 0; for (size_t i = 0; i < m_nchildren; i++) { XML_Node* xc = m_children[i]; if (!(xc->isComment())) { diff --git a/src/converters/Species.cpp b/src/converters/Species.cpp index a11dc345f..1dc228134 100644 --- a/src/converters/Species.cpp +++ b/src/converters/Species.cpp @@ -49,7 +49,7 @@ Species::Species(const Species& s) { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = s; } diff --git a/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp index 21a22cdf9..0b50037b9 100644 --- a/src/equil/BasisOptimize.cpp +++ b/src/equil/BasisOptimize.cpp @@ -36,7 +36,7 @@ static void print_stringTrunc(const char* str, int space, int alignment); //! Finds the location of the maximum component in a double vector INPUT /*! * @param x Vector to search - * @param j j <= i < n : i is the range of indecises to search in X(*) + * @param j j <= i < n : i is the range of indices to search in X(*) * @param n Length of the vector * * @return index of the greatest value on X(*) searched @@ -385,7 +385,7 @@ L_END_LOOP: * Formulate the matrix problem for the stoichiometric * coefficients. CX + B = 0 * C will be an nc x nc matrix made up of the formula - * vectors for the components. Each component's formular + * vectors for the components. Each component's formula * vector is a column. The rows are the elements. * n rhs's will be solved for. Thus, B is an nc x n * matrix. @@ -675,7 +675,7 @@ FOUND_PIVOT: * has an element column in FormulaMatrix[], but no species in the * mechanism * actually contains argon. Then, nc < ne. Unless the entry for - * desired elementabundance vector for Ar is zero, then this + * desired element abundance vector for Ar is zero, then this * element abundance constraint can never be satisfied. The * constraint vector is not in the range space of the formula * matrix. @@ -687,7 +687,7 @@ FOUND_PIVOT: * This routine borrows heavily from BasisOptimize algorithm. It * finds nc constraints which span the range space of the Component * Formula matrix, and assigns them as the first nc components in the - * formular matrix. This guarrantees that BasisOptimize has a + * formula matrix. This guarantees that BasisOptimize has a * nonsingular matrix to invert. */ size_t Cantera::ElemRearrange(size_t nComponents, const vector_fp& elementAbundances, @@ -830,7 +830,7 @@ size_t Cantera::ElemRearrange(size_t nComponents, const vector_fp& elementAbunda * Fill in the row for the current element, k, under consideration * The row will contain the Formula matrix value for that element * with respect to the vector of component species. - * (note j and k indecises are flipped compared to the previous routine) + * (note j and k indices are flipped compared to the previous routine) */ for (j = 0; j < nComponents; ++j) { jj = orderVectorSpecies[j]; diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index 0de2df1e5..283cf0d75 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -645,7 +645,7 @@ int ChemEquil::equilibrate(thermo_t& s, const char* XYstr, s.setMoleFractions(DATA_PTR(xmm)); /* - * Update the internally storred values of m_temp, + * Update the internally stored values of m_temp, * m_dens, and the element mole fractions. */ update(s); diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp index 11a33357f..e6a44f657 100644 --- a/src/equil/MultiPhaseEquil.cpp +++ b/src/equil/MultiPhaseEquil.cpp @@ -632,7 +632,7 @@ void MultiPhaseEquil::step(doublereal omega, vector_fp& deltaN, m_moles[k] += omega * deltaN[k]; } else { m_moles[k] = fabs(m_moles[k])*std::min(10.0, - exp(-m_deltaG_RT[ik - m_nel])); + exp(-m_deltaG_RT[ik - m_nel])); } } updateMixMoles(); diff --git a/src/equil/vcs_DoubleStarStar.h b/src/equil/vcs_DoubleStarStar.h index fa98707ec..4c68fd1c8 100644 --- a/src/equil/vcs_DoubleStarStar.h +++ b/src/equil/vcs_DoubleStarStar.h @@ -11,7 +11,7 @@ namespace VCSnonideal { using std::size_t; -//! A class for 2D double arrays storred in column-major +//! A class for 2D double arrays stored in column-major //! (Fortran-compatible) form. /*! * In this form, the data entry for an n row, m col diff --git a/src/equil/vcs_Exception.h b/src/equil/vcs_Exception.h index b0983c69d..b1971b65c 100644 --- a/src/equil/vcs_Exception.h +++ b/src/equil/vcs_Exception.h @@ -2,7 +2,7 @@ * @file vcs_Exception.h */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_Gibbs.cpp b/src/equil/vcs_Gibbs.cpp index 0c3ae3d10..b169e040b 100644 --- a/src/equil/vcs_Gibbs.cpp +++ b/src/equil/vcs_Gibbs.cpp @@ -3,7 +3,7 @@ * Functions which calculate the extrinsic Gibbs Free energies */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_IntStarStar.h b/src/equil/vcs_IntStarStar.h index 292cad529..cb20f2c87 100644 --- a/src/equil/vcs_IntStarStar.h +++ b/src/equil/vcs_IntStarStar.h @@ -11,7 +11,7 @@ namespace VCSnonideal { using std::size_t; -//! A class for 2D int arrays storred in column-major +//! A class for 2D int arrays stored in column-major //! (Fortran-compatible) form. /*! * In this form, the data entry for an n row, m col diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index 8aaa70657..9107cca66 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -3,7 +3,7 @@ * Driver routine for the VCSnonideal equilibrium solver package */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index 86255bb5d..b1878e23f 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -2,7 +2,7 @@ * @file vcs_VolPhase.cpp */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -585,7 +585,7 @@ void vcs_VolPhase::setMoleFractionsState(const double totalMoles, * a gather routine. * * - * @param molesSpeciesVCS array of mole numbers. Note, the indecises + * @param molesSpeciesVCS array of mole numbers. Note, the indices * for species in * this array may not be contiguous. IndSpecies[] is needed * to gather the species into the local contiguous vector @@ -713,7 +713,7 @@ void vcs_VolPhase::setMolesFromVCS(const int stateCalc, * nothing is done. * * @param molesSpeciesVCS array of mole numbers. Note, - * the indecises for species in + * the indices for species in * this array may not be contiguous. IndSpecies[] is needed * to gather the species into the local contiguous vector * format. diff --git a/src/equil/vcs_VolPhase.h b/src/equil/vcs_VolPhase.h index c0b7bd80d..f52ca3d4a 100644 --- a/src/equil/vcs_VolPhase.h +++ b/src/equil/vcs_VolPhase.h @@ -3,7 +3,7 @@ * Header for the object representing each phase within vcs */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -176,7 +176,7 @@ public: * then updates this object with their values. This is essentially * a gather routine. * - * @param molesSpeciesVCS Array of mole numbers. Note, the indecises + * @param molesSpeciesVCS Array of mole numbers. Note, the indices * for species in * this array may not be contiguous. IndSpecies[] is needed * to gather the species into the local contiguous vector @@ -195,7 +195,7 @@ public: * If this isn't the case, an error exit is carried out. * * - * @param molesSpeciesVCS array of mole numbers. Note, the indecises + * @param molesSpeciesVCS array of mole numbers. Note, the indices * for species in * this array may not be contiguous. IndSpecies[] is needed * to gather the species into the local contiguous vector @@ -415,7 +415,7 @@ private: public: - //! Return a const reference to the mole fractions storred in the + //! Return a const reference to the mole fractions stored in the //! object. const std::vector & moleFractions() const; @@ -427,7 +427,7 @@ public: */ void setCreationMoleNumbers(const double* const n_k, const std::vector &creationGlobalRxnNumbers); - //! Return a const reference to the creationMoleNumbers storred in the object. + //! Return a const reference to the creationMoleNumbers stored in the object. /*! * @return Returns a const reference to the vector of creationMoleNumbers */ @@ -469,7 +469,7 @@ public: * inerts which can't exist in any other phase. Or, * the phase exists always because it consists of a single * species, which is identified with the voltage, i.e., - * its an electron metal phase. + * it's an electron metal phase. */ int exists() const; @@ -715,7 +715,7 @@ public: //! Units for the chemical potential data, pressure data, volume, //! and species amounts /*! - * All internally storred quantities will have these units. Also, printed + * All internally stored quantities will have these units. Also, printed * quantitities will display in these units. Input quantities are expected * in these units. * @@ -797,7 +797,7 @@ private: std::vector m_speciesUnknownType; //! Index of the element number in the global list of elements - //! storred in VCS_PROB or VCS_SOLVE + //! stored in VCS_PROB or VCS_SOLVE std::vector m_elemGlobalIndex; //! Number of species in the phase @@ -812,7 +812,7 @@ private: double m_totalMolesInert; //! Boolean indicating whether the phase is an ideal solution - //! and therefore it's molar-based activity coefficients are + //! and therefore its molar-based activity coefficients are //! uniformly equal to one. bool m_isIdealSoln; diff --git a/src/equil/vcs_elem.cpp b/src/equil/vcs_elem.cpp index 19900530e..551f7b575 100644 --- a/src/equil/vcs_elem.cpp +++ b/src/equil/vcs_elem.cpp @@ -189,7 +189,7 @@ int VCS_SOLVE::vcs_elcorr(double aa[], double x[]) * ga Current element abundances * m_elemAbundancesGoal Required elemental abundances * m_molNumSpecies_old Current mole number of species. - * m_formulaMatrix[][] Formular matrix of the species + * m_formulaMatrix[][] Formula matrix of the species * ne Number of elements * nc Number of components. * diff --git a/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp index 0bf50fe86..22df46275 100644 --- a/src/equil/vcs_elem_rearrange.cpp +++ b/src/equil/vcs_elem_rearrange.cpp @@ -4,7 +4,7 @@ * it contains the algorithm for choosing the rearrangement. */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -47,7 +47,7 @@ namespace VCSnonideal * This routine borrows heavily from vcs_basopt's algorithm. It * finds nc constraints which span the range space of the Component * Formula matrix, and assigns them as the first nc components in the - * formular matrix. This guarrantees that vcs_basopt[] has a + * formula matrix. This guarantees that vcs_basopt[] has a * nonsingular matrix to invert. * * Other Variables @@ -217,7 +217,7 @@ int VCS_SOLVE::vcs_elem_rearrange(double* const aw, double* const sa, return VCS_SUCCESS; } -// Swaps the indecises for all of the global data for two elements, ipos +// Swaps the indices for all of the global data for two elements, ipos // and jpos. /* * This function knows all of the element information with VCS_SOLVE, and diff --git a/src/equil/vcs_equilibrate.cpp b/src/equil/vcs_equilibrate.cpp index 27ecae36a..1ea154923 100644 --- a/src/equil/vcs_equilibrate.cpp +++ b/src/equil/vcs_equilibrate.cpp @@ -3,7 +3,7 @@ * Driver routines for equilibrium solvers */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp index 4b0cb3bba..dfd3d7434 100644 --- a/src/equil/vcs_inest.cpp +++ b/src/equil/vcs_inest.cpp @@ -3,7 +3,7 @@ * Implementation methods for obtaining a good initial guess */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_internal.h b/src/equil/vcs_internal.h index 2fc8a7db2..86ced922b 100644 --- a/src/equil/vcs_internal.h +++ b/src/equil/vcs_internal.h @@ -3,7 +3,7 @@ * Internal declarations for the VCSnonideal package */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp index c707495ae..4d935224f 100644 --- a/src/equil/vcs_nondim.cpp +++ b/src/equil/vcs_nondim.cpp @@ -3,7 +3,7 @@ * Nondimensionalization routines within VCSnonideal */ /* - * Copywrite (2007) Sandia Corporation. Under the terms of + * Copyright (2007) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_phaseStability.cpp b/src/equil/vcs_phaseStability.cpp index 602e25b9b..53c21f9ff 100644 --- a/src/equil/vcs_phaseStability.cpp +++ b/src/equil/vcs_phaseStability.cpp @@ -671,7 +671,7 @@ double VCS_SOLVE::vcs_phaseStabilityTest(const size_t iph) // get the activity coefficients Vphase->sendToVCS_ActCoeff(VCS_STATECALC_OLD, VCS_DATA_PTR(m_actCoeffSpecies_new)); - // Get the storred estimate for the composition of the phase if + // Get the stored estimate for the composition of the phase if // it gets created fracDelta_new = Vphase->creationMoleNumbers(creationGlobalRxnNumbers); diff --git a/src/equil/vcs_prep.cpp b/src/equil/vcs_prep.cpp index ca36a6a8e..6dde7318a 100644 --- a/src/equil/vcs_prep.cpp +++ b/src/equil/vcs_prep.cpp @@ -4,7 +4,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp index 048a39d0c..6667e7f24 100644 --- a/src/equil/vcs_prob.cpp +++ b/src/equil/vcs_prob.cpp @@ -4,7 +4,7 @@ * equilibrium solver package, */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -373,7 +373,7 @@ void VCS_PROB::prob_report(int print_lvl) * This routine sorts through the elements defined in the * vcs_VolPhase object. It then adds the new elements to * the VCS_PROB object, and creates a global map, which is - * storred in the vcs_VolPhase object. + * stored in the vcs_VolPhase object. * Id and matching of elements is done strictly via the element name, * with case not mattering. * diff --git a/src/equil/vcs_prob.h b/src/equil/vcs_prob.h index ad1f9e9ce..a8ef0325b 100644 --- a/src/equil/vcs_prob.h +++ b/src/equil/vcs_prob.h @@ -3,7 +3,7 @@ * Header for the Interface class for the vcs thermo equilibrium solver package, */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -52,7 +52,7 @@ public: //! Species number used to malloc data structures size_t NSPECIES0; - //! Number of element contraints in the equilibrium problem + //! Number of element constraints in the equilibrium problem size_t ne; //! Number of element constraints used to malloc data structures @@ -156,7 +156,7 @@ public: //! Units for the chemical potential data, pressure data, volume, //! and species amounts /*! - * All internally storred quantities will have these units. Also, printed + * All internally stored quantities will have these units. Also, printed * quantitities will display in these units. * * Chem_Pot Pres vol moles @@ -312,7 +312,7 @@ public: * This routine sorts through the elements defined in the * vcs_VolPhase object. It then adds the new elements to * the VCS_PROB object, and creates a global map, which is - * storred in the vcs_VolPhase object. + * stored in the vcs_VolPhase object. * Id and matching of elements is done strictly via the element name, * with case not mattering. * diff --git a/src/equil/vcs_rearrange.cpp b/src/equil/vcs_rearrange.cpp index 018f75895..fbf498ddb 100644 --- a/src/equil/vcs_rearrange.cpp +++ b/src/equil/vcs_rearrange.cpp @@ -3,7 +3,7 @@ * implementation file for rearranging species. */ /* - * Copywrite (2007) Sandia Corporation. Under the terms of + * Copyright (2007) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_report.cpp b/src/equil/vcs_report.cpp index 137558ae1..41aa7bca9 100644 --- a/src/equil/vcs_report.cpp +++ b/src/equil/vcs_report.cpp @@ -1,6 +1,6 @@ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp index ba4758937..2ce141dc7 100644 --- a/src/equil/vcs_root1d.cpp +++ b/src/equil/vcs_root1d.cpp @@ -3,7 +3,7 @@ * Code for a one dimensional root finder program. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_rxnadj.cpp b/src/equil/vcs_rxnadj.cpp index 4cb7f5641..41fb27412 100644 --- a/src/equil/vcs_rxnadj.cpp +++ b/src/equil/vcs_rxnadj.cpp @@ -3,7 +3,7 @@ * Routines for carrying out various adjustments to the reaction steps */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_setMolesLinProg.cpp b/src/equil/vcs_setMolesLinProg.cpp index 04c4c76a3..248c3f864 100644 --- a/src/equil/vcs_setMolesLinProg.cpp +++ b/src/equil/vcs_setMolesLinProg.cpp @@ -3,7 +3,7 @@ * */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp index 2de828afc..aae53379d 100644 --- a/src/equil/vcs_solve.cpp +++ b/src/equil/vcs_solve.cpp @@ -3,7 +3,7 @@ * Header file for the internal class that holds the problem. */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_solve.h b/src/equil/vcs_solve.h index 523fc6ff7..c3df1b02a 100644 --- a/src/equil/vcs_solve.h +++ b/src/equil/vcs_solve.h @@ -4,7 +4,7 @@ * (see Class \link Cantera::VCS_SOLVE VCS_SOLVE\endlink and \ref equilfunctions ). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -45,7 +45,7 @@ class VCS_COUNTERS; //! This is the main structure used to hold the internal data //! used in vcs_solve_TP(), and to solve TP systems. /*! - * The indecises of information in this + * The indices of information in this * structure may change when the species basis changes or when * phases pop in and out of existence. Both of these operations * change the species ordering. @@ -241,7 +241,7 @@ public: /*! * All evaluations are done using the "old" version of the solution. * - * @param kspec Species to be evalulated + * @param kspec Species to be evaluated * * @return Returns the calculated species type */ @@ -261,7 +261,7 @@ public: * * For species in multispecies phases whose concentration is zero, * we need to set the mole fraction to a very low value. - * It's chemical potential + * Its chemical potential * is then calculated using the VCS_DELETE_MINORSPECIES_CUTOFF concentration * to keep numbers positive. * @@ -350,7 +350,7 @@ public: double* const ac, double* const mu_i, const bool do_deleted = false); - //! Calculalte the dimensionless chemical potentials of all species or + //! Calculate the dimensionless chemical potentials of all species or //! of certain groups of species, at a fixed temperature and pressure. /*! * We calculate the dimensionless chemical potentials of all species @@ -364,7 +364,7 @@ public: * * For species in multispecies phases whose concentration is zero, * we need to set the mole fraction to a very low value. - * It's chemical potential + * Its chemical potential * is then calculated using the VCS_DELETE_MINORSPECIES_CUTOFF concentration * to keep numbers positive. * @@ -650,7 +650,7 @@ public: void vcs_deltag_Phase(const size_t iphase, const bool doDeleted, const int stateCalc, const bool alterZeroedPhases = true); - //! Swaps the indecises for all of the global data for two species, k1 + //! Swaps the indices for all of the global data for two species, k1 //! and k2. /*! * @@ -864,7 +864,7 @@ public: * This routine borrows heavily from vcs_basopt's algorithm. It * finds nc constraints which span the range space of the Component * Formula matrix, and assigns them as the first nc components in the - * formular matrix. This guarrantees that vcs_basopt[] has a + * formula matrix. This guarantees that vcs_basopt[] has a * nonsingular matrix to invert. * * Other Variables @@ -877,7 +877,7 @@ public: int vcs_elem_rearrange(double* const aw, double* const sa, double* const sm, double* const ss); - //! Swaps the indecises for all of the global data for two elements, ipos + //! Swaps the indices for all of the global data for two elements, ipos //! and jpos. /*! * This function knows all of the element information with VCS_SOLVE, and @@ -1753,7 +1753,7 @@ public: //! Index that keeps track of the index of the species within the local //! phase /*! - * This returns the local index of the species within the phase. It's argument + * This returns the local index of the species within the phase. Its argument * is the global species index within the VCS problem. * * k = m_speciesLocalPhaseIndex[kspec] @@ -1847,7 +1847,7 @@ public: * -8 -> The species lies in a multicomponent phase which * currently does exist. Its concentration is currently * identically zero, though the phase exists. This is - * a permament condition due to stoich constraints + * a permanent condition due to stoich constraints * - VCS_SPECIES_STOICHZERO * */ diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index bcbaba58a..913beaee8 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -3,7 +3,7 @@ * main algorithm for finding an equilibrium */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -1049,7 +1049,7 @@ L_MAIN_LOOP_END_NO_PRINT: /*************************************************************************/ /* * We have a tentative m_deltaMolNumSpecies[]. Now apply other criteria - * to limit it's magnitude. + * to limit its magnitude. * * */ @@ -1972,7 +1972,7 @@ L_RETURN_BLOCK_B: // vcs_dzero(VCS_DATA_PTR(m_deltaGRxn_new), m_numComponents); /* * Evaluate the final mole fractions - * storring them in wt[] + * storing them in wt[] */ vcs_vdzero(m_molNumSpecies_new, m_numSpeciesTot); for (kspec = 0; kspec < m_numSpeciesTot; ++kspec) { @@ -3824,7 +3824,7 @@ size_t VCS_SOLVE::vcs_basisOptMax(const double* const molNum, const size_t j, /* * All evaluations are done using the "old" version of the solution. * - * @param kspec Species to be evalulated + * @param kspec Species to be evaluated * * @return Returns the calculated species type */ @@ -4041,7 +4041,7 @@ int VCS_SOLVE::vcs_species_type(const size_t kspec) const * * For species in multispecies phases whose concentration is zero, * we need to set the mole fraction to a very low value. - * It's chemical potential + * Its chemical potential * is then calculated using the VCS_DELETE_MINORSPECIES_CUTOFF concentration * to keep numbers positive. * @@ -4204,7 +4204,7 @@ void VCS_SOLVE::vcs_chemPotPhase(const int stateCalc, * * For species in multispecies phases whose concentration is zero, * we need to set the mole fraction to a very low value. - * It's chemical potential + * Its chemical potential * is then calculated using the VCS_DELETE_MINORSPECIES_CUTOFF concentration * to keep numbers positive. * @@ -4381,7 +4381,7 @@ void VCS_SOLVE::vcs_dfe(const int stateCalc, tlogMoles = VCS_DATA_PTR(m_TmpPhase); /* * Might as well recalculate the phase mole vector - * and compare to the storred one. They should be correct. + * and compare to the stored one. They should be correct. */ double* tPhInertMoles = VCS_DATA_PTR(TPhInertMoles); for (iph = 0; iph < m_numPhases; iph++) { @@ -4880,7 +4880,7 @@ void VCS_SOLVE::vcs_updateVP(const int vcsState) * -8 -> The species lies in a multicomponent phase which * currently does exist. Its concentration is currently * identically zero, though the phase exists. This is - * a permament condition due to stoich constraints + * a permanent condition due to stoich constraints * - VCS_SPECIES_STOICHZERO * */ @@ -5542,7 +5542,7 @@ void VCS_SOLVE::vcs_deltag_Phase(const size_t iphase, const bool doDeleted, } /****************************************************************************/ -// Swaps the indecises for all of the global data for two species, k1 +// Swaps the indices for all of the global data for two species, k1 // and k2. /* * @param ifunc: If true, switch the species data and the noncomponent reaction @@ -5633,7 +5633,7 @@ void VCS_SOLVE::vcs_switch_pos(const bool ifunc, const size_t k1, const size_t k if (ifunc) { /* - * Find the Rxn indecises corresponding to the two species + * Find the Rxn indices corresponding to the two species */ i1 = k1 - m_numComponents; i2 = k2 - m_numComponents; @@ -5745,7 +5745,7 @@ double VCS_SOLVE::vcs_birthGuess(const int kspec) */ double* sc_irxn = m_stoichCoeffRxnMatrix[irxn]; for (size_t j = 0; j < m_numComponents; ++j) { - // Only loop over element contraints that involve positive def. constraints + // Only loop over element constraints that involve positive def. constraints if (m_speciesUnknownType[j] != VCS_SPECIES_TYPE_INTERFACIALVOLTAGE) { if (m_molNumSpecies_old[j] > 0.0) { double tmp = sc_irxn[j] * dx; diff --git a/src/equil/vcs_solve_phaseStability.cpp b/src/equil/vcs_solve_phaseStability.cpp index 6b2e1d451..cd23d97ce 100644 --- a/src/equil/vcs_solve_phaseStability.cpp +++ b/src/equil/vcs_solve_phaseStability.cpp @@ -6,7 +6,7 @@ * $Id: vcs_solve_TP.cpp 626 2010-10-28 01:33:54Z hkmoffa $ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_species_thermo.cpp b/src/equil/vcs_species_thermo.cpp index bd9755b11..d1d61cff7 100644 --- a/src/equil/vcs_species_thermo.cpp +++ b/src/equil/vcs_species_thermo.cpp @@ -3,7 +3,7 @@ * Implementation for the VCS_SPECIES_THERMO object. */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_species_thermo.h b/src/equil/vcs_species_thermo.h index c89dc4441..4726a8a0d 100644 --- a/src/equil/vcs_species_thermo.h +++ b/src/equil/vcs_species_thermo.h @@ -1,6 +1,6 @@ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp index bcfca5bdb..022c9e644 100644 --- a/src/equil/vcs_util.cpp +++ b/src/equil/vcs_util.cpp @@ -3,7 +3,7 @@ * Internal definitions for utility functions for the VCSnonideal package */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -197,7 +197,7 @@ void vcs_vicopy(std::vector &vec_to, * x(*) - Vector to search * xSize(*) if nonnull, this is the multiplier vector to be * multiplied into x(*) before making the decision. - * j <= i < n : i is the range of indecises to search in X(*) + * j <= i < n : i is the range of indices to search in X(*) * * RETURN * return index of the greatest value on X(*) searched diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp index f9511087e..8d842f448 100644 --- a/src/kinetics/AqueousKinetics.cpp +++ b/src/kinetics/AqueousKinetics.cpp @@ -6,7 +6,7 @@ * */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index 65fcfd030..b0984319f 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -334,7 +334,7 @@ void InterfaceKinetics::_update_rates_C() * ThermoPhase class that makes up this kinetics object to * obtain the generalized concentrations for species within that * class. This is collected in the vector m_conc. m_start[] - * are integer indecises for that vector denoting the start of the + * are integer indices for that vector denoting the start of the * species for each phase. */ thermo(n).getActivityConcentrations(DATA_PTR(m_conc) + m_start[n]); diff --git a/src/kinetics/StoichManager.h b/src/kinetics/StoichManager.h index ca3a329fb..92a57c788 100644 --- a/src/kinetics/StoichManager.h +++ b/src/kinetics/StoichManager.h @@ -110,12 +110,12 @@ namespace Cantera * The function multiply() is usually used when evaluating the * forward and reverse rates of progress of reactions. * The rate constants are usually loaded into out[]. Then - * multply() is called to add in the dependence of the + * multiply() is called to add in the dependence of the * species concentrations to yield a forward and reverse rop. * * The function incrementSpecies() and its cousin decrementSpecies() * is used to translate from rates of progress to species production - * rates. The vector in[] is preloaed with the rates of progess of + * rates. The vector in[] is preloaded with the rates of progress of * all reactions. Then incrementSpecies() is called to * increment the species production vector, out[], with the rates * of progress. @@ -340,7 +340,7 @@ private: size_t m_rxn; /** - * Species indecise -> index into the species vector for the + * Species index -> index into the species vector for the * two species. */ size_t m_ic0, m_ic1; @@ -811,7 +811,7 @@ public: * @param rxn Reaction index of the current reaction. This is used * as an index into vectors which have length n_total_rxn. * @param k This is a vector of integer values specifying the - * species indecises. The length of this vector species + * species indices. The length of this vector species * the number of different species in the description. * The value of the entries are the species indices. * These are used as indexes into vectors which have diff --git a/src/kinetics/importKinetics.cpp b/src/kinetics/importKinetics.cpp index 9bd400871..d6d8eacac 100644 --- a/src/kinetics/importKinetics.cpp +++ b/src/kinetics/importKinetics.cpp @@ -6,7 +6,7 @@ * This file contains routines which are global routines, i.e., * not part of any object. These routine take as input, ctml * pointers to data, and pointers to %Cantera objects. The purpose - * of these routines is to intialize the %Cantera objects with data + * of these routines is to initialize the %Cantera objects with data * from the ctml tree structures. */ // Copyright 2002 California Institute of Technology @@ -199,7 +199,7 @@ bool getReagents(const XML_Node& rxn, kinetics_t& kin, int rp, /* * The species and stoichiometric coefficient for the species - * are stored as a colon seperated pair. Get all of these + * are stored as a colon separated pair. Get all of these * pairs in the reactions/products object. */ vector key, val; @@ -263,7 +263,7 @@ bool getReagents(const XML_Node& rxn, kinetics_t& kin, int rp, size_t loc = speciesMap[sp]; if (loc == 0) throw CanteraError("getReagents", - "reaction order specified for non-reactantt: " + "reaction order specified for non-reactant: " +sp); forder = fpValue(oo()); if (forder < 0.0) { @@ -295,7 +295,7 @@ static void getArrhenius(const XML_Node& node, int& highlow, highlow = 1; } /* - * We parse the children for the A, b, and E conponents. + * We parse the children for the A, b, and E components. */ A = getFloat(node, "A", "toSI"); b = getFloat(node, "b"); diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index 53a3d623f..10d1a47c0 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -2,7 +2,7 @@ * @file: solveSP.cpp Implicit surface site concentration solver */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/kinetics/solveSP.h b/src/kinetics/solveSP.h index 471326108..86a466b87 100644 --- a/src/kinetics/solveSP.h +++ b/src/kinetics/solveSP.h @@ -4,7 +4,7 @@ * (see \ref chemkinetics and class \link Cantera::solveSP solveSP\endlink). */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -114,7 +114,7 @@ class InterfaceKinetics; * C_N1-1_1 NO+N1-1 * * - * Note there are a couple of different types of species indecices + * Note there are a couple of different types of species indices * floating around in the formulation of this object. * * kindexSP This is the species index in the contiguous vector of unknowns @@ -124,7 +124,7 @@ class InterfaceKinetics; * vector will get more complicated. It will include the mole fraction and growth rates * of specified bulk phases * - * Indecises which relate to individual kinetics objects use the suffix KSI (kinetics + * Indices which relate to individual kinetics objects use the suffix KSI (kinetics * species index). * * @@ -403,7 +403,7 @@ private: //! Main routine that calculates the current residual and Jacobian /*! * @param JacCol Vector of pointers to the tops of columns of the - * Jacobian to be evalulated. + * Jacobian to be evaluated. * @param resid output Vector of residuals, length = m_neq * @param CSolnSP Vector of species concentrations, unknowns in the * problem, length = m_neq. These are tweaked in order @@ -613,7 +613,7 @@ private: */ vector_fp m_CSolnSP; - //! Saved inital solution vector + //! Saved initial solution vector /*! * length MAX(1, m_neq) */ diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp index 36dd4c679..15e6ccc8b 100644 --- a/src/numerics/BEulerInt.cpp +++ b/src/numerics/BEulerInt.cpp @@ -4,7 +4,7 @@ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -1758,7 +1758,7 @@ void BEulerInt::doNewtonSolve(double time_curr, double* y_curr, } /* - * row sum scaling -> Note, this is an unequivical success + * row sum scaling -> Note, this is an unequivocal success * at keeping the small numbers well balanced and * nonnegative. */ diff --git a/src/numerics/BEulerInt.h b/src/numerics/BEulerInt.h index 0cf56c8f5..2279042cf 100644 --- a/src/numerics/BEulerInt.h +++ b/src/numerics/BEulerInt.h @@ -7,7 +7,7 @@ * $Revision: 1.19 $ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/numerics/Func1.cpp b/src/numerics/Func1.cpp index b7f476f90..9ba3ecd99 100644 --- a/src/numerics/Func1.cpp +++ b/src/numerics/Func1.cpp @@ -100,7 +100,7 @@ doublereal Func1::c() const return m_c; } -// Function to set the storred constant +// Function to set the stored constant void Func1::setC(doublereal c) { m_c = c; diff --git a/src/numerics/GeneralMatrix.cpp b/src/numerics/GeneralMatrix.cpp index 1c984c0df..693f08742 100644 --- a/src/numerics/GeneralMatrix.cpp +++ b/src/numerics/GeneralMatrix.cpp @@ -7,7 +7,7 @@ * $Date: 2011-05-16 18:45:08 -0600 (Mon, 16 May 2011) $ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp index e5c213de7..e3847fb0d 100644 --- a/src/numerics/NonlinearSolver.cpp +++ b/src/numerics/NonlinearSolver.cpp @@ -10,7 +10,7 @@ * $Revision$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -794,7 +794,7 @@ void NonlinearSolver::scaleMatrix(GeneralMatrix& jac, doublereal* const y_comm, } } /* - * row sum scaling -> Note, this is an unequivical success + * row sum scaling -> Note, this is an unequivocal success * at keeping the small numbers well balanced and nonnegative. */ if (! jac.factored()) { @@ -815,7 +815,7 @@ void NonlinearSolver::scaleMatrix(GeneralMatrix& jac, doublereal* const y_comm, m_rowScales[irow] += fabs(*jptr); } if (m_colScaling) { - // This is needed in order to mitgate the change in J_ij carried out just above this loop. + // This is needed in order to mitigate the change in J_ij carried out just above this loop. // Alternatively, we could move this loop up to the top m_rowWtScales[irow] += fabs(*jptr) * m_ewt[jcol] / m_colScales[jcol]; } else { @@ -836,7 +836,7 @@ void NonlinearSolver::scaleMatrix(GeneralMatrix& jac, doublereal* const y_comm, m_rowScales[irow] += vv; } if (m_colScaling) { - // This is needed in order to mitgate the change in J_ij carried out just above this loop. + // This is needed in order to mitigate the change in J_ij carried out just above this loop. // Alternatively, we could move this loop up to the top m_rowWtScales[irow] += vv * m_ewt[jcol] / m_colScales[jcol]; } else { @@ -1067,7 +1067,7 @@ int NonlinearSolver::doAffineNewtonSolve(const doublereal* const y_curr, const // We can default to QR here ( or not ) jac.useFactorAlgorithm(1); int useQR = jac.factorAlgorithm(); - // multiplyl the residual by -1 + // multiply the residual by -1 // Scale the residual if there is row scaling. Note, the matrix has already been scaled if (m_rowScaling && !m_resid_scaled) { for (size_t n = 0; n < neq_; n++) { @@ -1419,7 +1419,7 @@ doublereal NonlinearSolver::doCauchyPointSolve(GeneralMatrix& jac) * actual equation * * Here we calculate the steepest descent direction. This is equation (11) in the notes. It is - * storred in deltaX_CP_[].The value corresponds to d_descent[]. + * stored in deltaX_CP_[].The value corresponds to d_descent[]. */ for (size_t j = 0; j < neq_; j++) { deltaX_CP_[j] = 0.0; @@ -1590,7 +1590,7 @@ void NonlinearSolver::descentComparison(doublereal time_curr, doublereal* ydot0 doublereal funcDecreaseNewt2 = 0.5 * (residNewt2 - normResid02) / (ffNewt * sNewt); - // This is the expected inital rate of decrease in the Cauchy direction. + // This is the expected initial rate of decrease in the Cauchy direction. // -> This is Eqn. 29 = Rhat dot Jhat dy / || d || doublereal funcDecreaseSDExp = RJd_norm_ / cauchyDistanceNorm * lambdaStar_; @@ -1614,7 +1614,7 @@ void NonlinearSolver::descentComparison(doublereal time_curr, doublereal* ydot0 * The steepest direction is always largest even when there are variable solution weights * * HKM When a hessian is used with junk on the diagonal, funcDecreaseNewtExp2 is no longer accurate as the - * direction gets signficantly shorter with increasing condition number. This suggests an algorithm where the + * direction gets significantly shorter with increasing condition number. This suggests an algorithm where the * newton step from the Hessian should be increased so as to match funcDecreaseNewtExp2 = funcDecreaseNewt2. * This roughly equals the ratio of the norms of the hessian and newton steps. This increased Newton step can * then be used with the trust region double dogleg algorithm. @@ -2074,7 +2074,7 @@ NonlinearSolver::deltaBoundStep(const doublereal* const y_n_curr, const doublere } else { /* * This handles the case where the value crosses the origin. - * - First we don't let it cross the origin until its shrunk to the size of m_deltaStepMinimum[i] + * - First we don't let it cross the origin until it's shrunk to the size of m_deltaStepMinimum[i] */ if (fabs(y_n_curr[i]) > m_deltaStepMinimum[i]) { ff = y_n_curr[i]/(y_new - y_n_curr[i]) * (1.0 - 2.0)/2.0; @@ -2837,8 +2837,8 @@ int NonlinearSolver::dampDogLeg(const doublereal time_curr, const doublereal* y_ * @param y0 INPUT Current value of the solution vector * @param ydot0 INPUT Current value of the derivative of the solution vector * @param step0 INPUT Trial step - * @param y1 OUTPUT Solution values at the conditions which are evalulated for success - * @param ydot1 OUTPUT Time derivates of solution at the conditions which are evalulated for success + * @param y1 OUTPUT Solution values at the conditions which are evaluated for success + * @param ydot1 OUTPUT Time derivates of solution at the conditions which are evaluated for success * @param trustDeltaOld INPUT Value of the trust length at the old conditions * * @@ -2869,7 +2869,7 @@ int NonlinearSolver::decideStep(const doublereal time_curr, int leg, doublereal // Calculate the distance to the cauchy point doublereal cauchyDistanceNorm = solnErrorNorm(DATA_PTR(deltaX_CP_)); - // This is the expected inital rate of decrease in the cauchy direction. + // This is the expected initial rate of decrease in the cauchy direction. // -> This is Eqn. 29 = Rhat dot Jhat dy / || d || doublereal funcDecreaseSDExp = RJd_norm_ / cauchyDistanceNorm * lambdaStar_; if (funcDecreaseSDExp > 0.0) { diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index 562c2738d..6598ae37b 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -7,7 +7,7 @@ * $Date$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -252,7 +252,7 @@ doublereal ResidJacEval::filterSolnPrediction(doublereal t, doublereal* const y) return 0.0; } //==================================================================================================================== -// Evalulate any stopping criteria other than a final time limit +// 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 diff --git a/src/numerics/RootFind.cpp b/src/numerics/RootFind.cpp index 8ac6fafea..a2eb0d4f4 100644 --- a/src/numerics/RootFind.cpp +++ b/src/numerics/RootFind.cpp @@ -5,7 +5,7 @@ * $Id$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index a08978a6a..8eb0431b0 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -7,7 +7,7 @@ * $Date$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. @@ -47,7 +47,7 @@ SquareMatrix::SquareMatrix() : * all elements to \c v. * * @param n size of the square matrix - * @param v intial value of all matrix components. + * @param v initial value of all matrix components. */ SquareMatrix::SquareMatrix(size_t n, doublereal v) : DenseMatrix(n, n, v), diff --git a/src/numerics/solveProb.cpp b/src/numerics/solveProb.cpp index 4527794f4..af8e827cf 100644 --- a/src/numerics/solveProb.cpp +++ b/src/numerics/solveProb.cpp @@ -5,7 +5,7 @@ * $Id$ */ /* - * Copywrite 2004 Sandia Corporation. Under the terms of Contract + * Copyright 2004 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government * retains certain rights in this software. * See file License.txt for licensing information. diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index be0176327..227b556dd 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -8,7 +8,7 @@ * obeys the Debye Huckel formulation for nonideality. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -126,7 +126,7 @@ DebyeHuckel::DebyeHuckel(const DebyeHuckel& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } @@ -311,7 +311,7 @@ doublereal DebyeHuckel::cv_mole() const /* * Pressure. Units: Pa. - * For this incompressible system, we return the internally storred + * For this incompressible system, we return the internally stored * independent value of the pressure. */ doublereal DebyeHuckel::pressure() const @@ -717,7 +717,7 @@ void DebyeHuckel::getPartialMolarEnthalpies(doublereal* hbar) const if (dAdT != 0.0) { /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnMolalityActCoeff(); s_update_dlnMolalityActCoeff_dT(); @@ -774,7 +774,7 @@ getPartialMolarEntropies(doublereal* sbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnMolalityActCoeff(); /* @@ -870,7 +870,7 @@ void DebyeHuckel::getPartialMolarCp(doublereal* cpbar) const if (dAdT != 0.0) { /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnMolalityActCoeff(); s_update_dlnMolalityActCoeff_dT(); @@ -1680,7 +1680,7 @@ void DebyeHuckel::setParametersFromXML(const XML_Node& eosdata) * and pressure. * * The default is to assume that it is constant, given - * in the initialization process and storred in the + * in the initialization process and stored in the * member double, m_A_Debye */ double DebyeHuckel::A_Debye_TP(double tempArg, double presArg) const @@ -1933,7 +1933,7 @@ double DebyeHuckel:: _lnactivityWaterHelgesonFixedForm() const { /* - * Update the internally storred vector of molalities + * Update the internally stored vector of molalities */ calcMolalities(); double oc = _osmoticCoeffHelgesonFixedForm(); @@ -1967,7 +1967,7 @@ void DebyeHuckel::s_update_lnMolalityActCoeff() const { double z_k, zs_k1, zs_k2; /* - * Update the internally storred vector of molalities + * Update the internally stored vector of molalities */ calcMolalities(); /* @@ -2010,7 +2010,7 @@ void DebyeHuckel::s_update_lnMolalityActCoeff() const } /* - * Possibly update the storred value of the + * Possibly update the stored value of the * Debye-Huckel parameter A_Debye * This parameter appears on the top of the activity * coefficient expression. @@ -2231,7 +2231,7 @@ void DebyeHuckel::s_update_lnMolalityActCoeff() const * We assume that the activity coefficients are current. * * solvent activity coefficient is on the molality - * scale. It's derivative is too. + * scale. Its derivative is too. */ void DebyeHuckel::s_update_dlnMolalityActCoeff_dT() const { @@ -2371,7 +2371,7 @@ void DebyeHuckel::s_update_dlnMolalityActCoeff_dT() const * We assume that the activity coefficients are current. * * solvent activity coefficient is on the molality - * scale. It's derivatives are too. + * scale. Its derivatives are too. */ void DebyeHuckel::s_update_d2lnMolalityActCoeff_dT2() const { @@ -2506,7 +2506,7 @@ void DebyeHuckel::s_update_d2lnMolalityActCoeff_dT2() const * and A_Debye are current. * * solvent activity coefficient is on the molality - * scale. It's derivatives are too. + * scale. Its derivatives are too. */ void DebyeHuckel::s_update_dlnMolalityActCoeff_dP() const { diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index f9e112cf4..2a0e573f1 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -6,7 +6,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. * diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index 8c15ee34c..5ffd87579 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -12,7 +12,7 @@ * the mole fractions. */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -287,9 +287,9 @@ void GibbsExcessVPSSTP::getElectrochemPotentials(doublereal* mu) const /* * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void GibbsExcessVPSSTP::getPartialMolarVolumes(doublereal* vbar) const diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index 5f6d513f6..5f0330f83 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -13,7 +13,7 @@ * Beta1, and Cphi.(CFJC, SNL) */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -243,7 +243,7 @@ HMWSoln::HMWSoln(const HMWSoln& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } @@ -758,7 +758,7 @@ doublereal HMWSoln::cv_mole() const /** * Pressure. Units: Pa. - * For this incompressible system, we return the internally storred + * For this incompressible system, we return the internally stored * independent value of the pressure. */ doublereal HMWSoln::pressure() const @@ -1173,7 +1173,7 @@ void HMWSoln::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnMolalityActCoeff(); s_update_dlnMolalityActCoeff_dT(); @@ -1325,7 +1325,7 @@ void HMWSoln::getPartialMolarCp(doublereal* cpbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnMolalityActCoeff(); s_update_dlnMolalityActCoeff_dT(); @@ -1446,7 +1446,7 @@ double HMWSoln::speciesMolarVolume(int k) const * of the parameter within the object, if it is changeable. * * The default is to assume that it is constant, given - * in the initialization process and storred in the + * in the initialization process and stored in the * member double, m_A_Debye * * A_Debye = (1/(8 Pi)) sqrt(2 Na dw /1000) @@ -5223,7 +5223,7 @@ void HMWSoln::s_updatePitzer_d2lnMolalityActCoeff_dT2() const * We assume that the activity coefficients are current. * * solvent activity coefficient is on the molality - * scale. It's derivative is too. + * scale. Its derivative is too. */ void HMWSoln::s_update_dlnMolalityActCoeff_dP() const { @@ -5261,7 +5261,7 @@ void HMWSoln::s_update_dlnMolalityActCoeff_dP() const * quantities do not need to be recalculated in this routine. * * solvent activity coefficient is on the molality - * scale. It's derivatives are too. + * scale. Its derivatives are too. */ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const { @@ -6097,7 +6097,7 @@ void HMWSoln::s_updatePitzer_dlnMolalityActCoeff_dP() const * Calculate E-lambda terms for charge combinations of like sign, * using method of Pitzer (1975). * - * This code snipet is included from Bethke, Appendix 2. + * This code snippet is included from Bethke, Appendix 2. */ void HMWSoln::calc_lambdas(double is) const { @@ -6167,7 +6167,7 @@ void HMWSoln::calc_lambdas(double is) const * on this effect. See the notes. * This interaction will be nonzero for species with the same charge. * - * This code snipet is included from Bethke, Appendix 2. + * This code snippet is included from Bethke, Appendix 2. */ void HMWSoln::calc_thetas(int z1, int z2, double* etheta, double* etheta_prime) const @@ -6213,7 +6213,7 @@ void HMWSoln::calc_thetas(int z1, int z2, } } -// This function will be called to update the internally storred +// This function will be called to update the internally stored // natural logarithm of the molality activity coefficients /* * Normally they are all one. However, sometimes they are not, diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp index 8bcfe2e12..f025c51e3 100644 --- a/src/thermo/HMWSoln_input.cpp +++ b/src/thermo/HMWSoln_input.cpp @@ -8,7 +8,7 @@ * in the formulation. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/IdealGasPhase.cpp b/src/thermo/IdealGasPhase.cpp index e03e0514b..676991497 100644 --- a/src/thermo/IdealGasPhase.cpp +++ b/src/thermo/IdealGasPhase.cpp @@ -36,12 +36,12 @@ IdealGasPhase::IdealGasPhase(const IdealGasPhase& right): { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = right; } -// Asignment operator +// Assignment operator /* * Assignment operator for the object. Constructed * object will be a clone of this object, but will diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index b00e934c8..45cafaeec 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -13,7 +13,7 @@ * highly nonlinear when the solvent densities get low. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -64,7 +64,7 @@ IdealMolalSoln::IdealMolalSoln(const IdealMolalSoln& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } @@ -1163,7 +1163,7 @@ doublereal IdealMolalSoln::err(std::string msg) const -// This function will be called to update the internally storred +// This function will be called to update the internally stored // natural logarithm of the molality activity coefficients /* * Normally they are all one. However, sometimes they are not, diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index 1d1e6c342..f3a1a110f 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -5,7 +5,7 @@ * \link Cantera::IdealSolidSolnPhase IdealSolidSolnPhase\endlink). */ /* - * Copywrite 2006 Sandia Corporation. Under the terms of Contract + * Copyright 2006 Sandia Corporation. Under the terms of Contract * DE-AC04-94AL85000, with Sandia Corporation, the U.S. Government * retains certain rights in this software. */ @@ -310,7 +310,7 @@ setDensity(const doublereal rho) { /* * Unless the input density is exactly equal to the density - * calculated and storred in the State object, we throw an + * calculated and stored in the State object, we throw an * exception. This is because the density is NOT an * independent variable. */ diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index f6ef26a5a..1cbcd604a 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -7,7 +7,7 @@ * class \link Cantera::IdealSolnGasVPSS IdealSolnGasVPSS\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index 6290acedb..09635584e 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -12,7 +12,7 @@ * the mole fractions. */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -356,7 +356,7 @@ void IonsFromNeutralVPSSTP::getActivityCoefficients(doublereal* ac) const s_update_lnActCoeff(); /* - * take the exp of the internally storred coefficients. + * take the exp of the internally stored coefficients. */ for (size_t k = 0; k < m_kk; k++) { ac[k] = exp(lnActCoeff_Scaled_[k]); @@ -473,7 +473,7 @@ void IonsFromNeutralVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeffdT(); @@ -507,7 +507,7 @@ void IonsFromNeutralVPSSTP::getPartialMolarEntropies(doublereal* sbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeffdT(); @@ -1347,7 +1347,7 @@ void IonsFromNeutralVPSSTP::initThermoXML(XML_Node& phaseNode, std::string id) //==================================================================================================================== // Update the activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * */ @@ -1479,7 +1479,7 @@ void IonsFromNeutralVPSSTP::getdlnActCoeffds(const doublereal dTds, const double //==================================================================================================================== // Update the temperature derivative of the ln activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * temperature derivative of the natural logarithm of the activity coefficients */ void IonsFromNeutralVPSSTP::s_update_dlnActCoeffdT() const @@ -1538,7 +1538,7 @@ void IonsFromNeutralVPSSTP::s_update_dlnActCoeffdT() const } //==================================================================================================================== /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * temperature derivative of the natural logarithm of the activity coefficients */ void IonsFromNeutralVPSSTP::s_update_dlnActCoeff_dlnX_diag() const @@ -1597,7 +1597,7 @@ void IonsFromNeutralVPSSTP::s_update_dlnActCoeff_dlnX_diag() const } //==================================================================================================================== /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * temperature derivative of the natural logarithm of the activity coefficients */ void IonsFromNeutralVPSSTP::s_update_dlnActCoeff_dlnN_diag() const @@ -1658,7 +1658,7 @@ void IonsFromNeutralVPSSTP::s_update_dlnActCoeff_dlnN_diag() const // Update the derivative of the log of the activity coefficients // wrt log(number of moles) - diagonal components /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt logarithm of the number of moles of given species. */ diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp index 606b9af3b..3781ccb28 100644 --- a/src/thermo/LatticePhase.cpp +++ b/src/thermo/LatticePhase.cpp @@ -551,7 +551,7 @@ void LatticePhase::initThermoXML(XML_Node& phaseNode, std::string id) // Update the species reference state thermodynamic functions /* * The polynomials for the standard state functions are only - * reevalulated if the temperature has changed. + * reevaluated if the temperature has changed. */ void LatticePhase::_updateThermo() const { diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp index 014484c68..9ba0c17a9 100644 --- a/src/thermo/LatticeSolidPhase.cpp +++ b/src/thermo/LatticeSolidPhase.cpp @@ -292,7 +292,7 @@ doublereal LatticeSolidPhase::calcDensity() // normalize them so that they sum to 1.0 for each of the subphases /* * On input, the mole fraction vector is assumed to sum to one for each of the sublattices. The sublattices - * are updated with this mole fraction vector. The mole fractions are also storred within this object, after + * are updated with this mole fraction vector. The mole fractions are also stored within this object, after * they are normalized to one by dividing by the number of sublattices. * * @param x Input vector of mole fractions. There is no restriction diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 3f9f03364..3a190ea4a 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -7,7 +7,7 @@ * */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -356,7 +356,7 @@ void MargulesVPSSTP::getLnActivityCoefficients(doublereal* lnac) const s_update_lnActCoeff(); /* - * take the exp of the internally storred coefficients. + * take the exp of the internally stored coefficients. */ for (size_t k = 0; k < m_kk; k++) { lnac[k] = lnActCoeff_Scaled_[k]; @@ -475,7 +475,7 @@ void MargulesVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -508,7 +508,7 @@ void MargulesVPSSTP::getPartialMolarCp(doublereal* cpbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -548,7 +548,7 @@ void MargulesVPSSTP::getPartialMolarEntropies(doublereal* sbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -574,9 +574,9 @@ void MargulesVPSSTP::getPartialMolarEntropies(doublereal* sbar) const /* * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void MargulesVPSSTP::getPartialMolarVolumes(doublereal* vbar) const @@ -731,7 +731,7 @@ void MargulesVPSSTP::initThermoXML(XML_Node& phaseNode, std::string id) // Update the activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * * he = X_A X_B(B + C X_B) @@ -765,7 +765,7 @@ void MargulesVPSSTP::s_update_lnActCoeff() const //=================================================================================================================== // Update the derivative of the log of the activity coefficients wrt T /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * * he = X_A X_B(B + C X_B) diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index 2830864a7..457c02001 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -7,7 +7,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. * diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index a0671714b..c2f3e3417 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -6,7 +6,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. * diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index 6940bb040..4414bb85d 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -7,7 +7,7 @@ * */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -358,7 +358,7 @@ void MixedSolventElectrolyte::getActivityCoefficients(doublereal* ac) const s_update_lnActCoeff(); /* - * take the exp of the internally storred coefficients. + * take the exp of the internally stored coefficients. */ for (size_t k = 0; k < m_kk; k++) { ac[k] = exp(lnActCoeff_Scaled_[k]); @@ -480,7 +480,7 @@ void MixedSolventElectrolyte::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -513,7 +513,7 @@ void MixedSolventElectrolyte::getPartialMolarCp(doublereal* cpbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -553,7 +553,7 @@ void MixedSolventElectrolyte::getPartialMolarEntropies(doublereal* sbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -579,9 +579,9 @@ void MixedSolventElectrolyte::getPartialMolarEntropies(doublereal* sbar) const /* * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void MixedSolventElectrolyte::getPartialMolarVolumes(doublereal* vbar) const @@ -735,7 +735,7 @@ void MixedSolventElectrolyte::initThermoXML(XML_Node& phaseNode, std::string id) // Update the activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * * he = X_A X_B(B + C X_B) @@ -769,7 +769,7 @@ void MixedSolventElectrolyte::s_update_lnActCoeff() const //=================================================================================================================== // Update the derivative of the log of the activity coefficients wrt T /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * * he = X_A X_B(B + C X_B) diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 1d8ed1d5b..47e1c5341 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -6,7 +6,7 @@ * */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -121,7 +121,7 @@ MixtureFugacityTP::operator=(const MixtureFugacityTP& b) /* * Ok, the VPSSMgr object is ready for business. * We need to resync the temperature and the pressure of the new standard states - * with what is storred in this object. + * with what is stored in this object. */ // m_VPSS_ptr->setState_TP(m_Tlast_ss, m_Plast_ss); } @@ -662,9 +662,9 @@ void MixtureFugacityTP::setState_TP(doublereal t, doublereal pres) //calcDensity(); } //==================================================================================================================== -// Set the internally storred temperature (K) and density (kg/m^3) +// Set the internally stored temperature (K) and density (kg/m^3) /* - * This overrides the default behavior. In addition to just storring the state in the object, we need to do + * This overrides the default behavior. In addition to just storing the state in the object, we need to do * an equation of state calculation and figure out what phase state we are in. * * @param t Temperature in kelvin diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index a7bffb93e..b23a10698 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -133,7 +133,7 @@ int MolalityVPSSTP::eosType() const // coefficients. /* * Single ion activity coefficients are not unique in terms of the - * representing actual measureable quantities. + * representing actual measurable quantities. */ void MolalityVPSSTP::setpHScale(const int pHscaleType) { @@ -148,7 +148,7 @@ void MolalityVPSSTP::setpHScale(const int pHscaleType) // coefficients. /* * Single ion activity coefficients are not unique in terms of the - * representing actual measureable quantities. + * representing actual measurable quantities. */ int MolalityVPSSTP::pHScale() const { @@ -722,8 +722,8 @@ void MolalityVPSSTP::applyphScale(doublereal* acMolality) const // Returns the index of the Cl- species. /* - * The Cl- species is special in the sense that it's single ion - * molalality-based activity coefficient is used in the specification + * The Cl- species is special in the sense that its single ion + * molality-based activity coefficient is used in the specification * of the pH scale for single ions. Therefore, we need to know * what species index Cl- is. If the species isn't in the species * list then this routine returns -1, and we can't use the NBS diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index ad6062217..43d7a9a01 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -12,7 +12,7 @@ * the mole fractions. */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -306,7 +306,7 @@ void MolarityIonicVPSSTP::getLnActivityCoefficients(doublereal* lnac) const s_update_lnActCoeff(); /* - * take the exp of the internally storred coefficients. + * take the exp of the internally stored coefficients. */ for (size_t k = 0; k < m_kk; k++) { lnac[k] = lnActCoeff_Scaled_[k]; @@ -378,7 +378,7 @@ void MolarityIonicVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -411,7 +411,7 @@ void MolarityIonicVPSSTP::getPartialMolarCp(doublereal* cpbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -451,7 +451,7 @@ void MolarityIonicVPSSTP::getPartialMolarEntropies(doublereal* sbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -472,9 +472,9 @@ void MolarityIonicVPSSTP::getPartialMolarEntropies(doublereal* sbar) const /* * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void MolarityIonicVPSSTP::getPartialMolarVolumes(doublereal* vbar) const @@ -572,7 +572,7 @@ void MolarityIonicVPSSTP::calcPseudoBinaryMoleFractions() const // Update the activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * */ diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h index 552f9650c..1893906c3 100644 --- a/src/thermo/NasaThermo.h +++ b/src/thermo/NasaThermo.h @@ -569,7 +569,7 @@ protected: /*! * This map takes as its index, the species index in the phase. * It returns the group index, where the temperature polynomials - * for that species are stored. group indecises start at 1, + * for that species are stored. group indices start at 1, * so a decrement is always performed to access vectors. */ mutable std::map m_group_map; diff --git a/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp index 7a5809b49..6f0c659a9 100644 --- a/src/thermo/PDSS.cpp +++ b/src/thermo/PDSS.cpp @@ -5,7 +5,7 @@ * (see class \link Cantera::PDSS PDSS\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -108,7 +108,7 @@ PDSS::PDSS(const PDSS& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index 20a40d93d..084445856 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -4,7 +4,7 @@ * virtual function. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -54,7 +54,7 @@ PDSS_ConstVol::PDSS_ConstVol(const PDSS_ConstVol& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index 583c9a849..dede626bd 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -6,7 +6,7 @@ * (see \ref pdssthermo and class \link Cantera::PDSS_HKFT PDSS_HKFT\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -147,7 +147,7 @@ PDSS_HKFT::PDSS_HKFT(const PDSS_HKFT& b) : m_presR_bar = OneAtm * 1.0E-5; /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index c459d3a9e..2e7badff0 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -4,7 +4,7 @@ * virtual function. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -60,7 +60,7 @@ PDSS_IdealGas::PDSS_IdealGas(const PDSS_IdealGas& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 211fa6a5a..5b0404cbd 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -4,7 +4,7 @@ * virtual function. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -68,7 +68,7 @@ PDSS_IonsFromNeutral::PDSS_IonsFromNeutral(const PDSS_IonsFromNeutral& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index c5d353f62..28d78de56 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -4,7 +4,7 @@ * virtual function. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -67,7 +67,7 @@ PDSS_SSVol::PDSS_SSVol(const PDSS_SSVol& b) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp index 044f309a6..0f1821445 100644 --- a/src/thermo/PDSS_Water.cpp +++ b/src/thermo/PDSS_Water.cpp @@ -3,7 +3,7 @@ * */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -127,7 +127,7 @@ PDSS_Water::PDSS_Water(const PDSS_Water& b) : m_sub = new WaterPropsIAPWS(); /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index cbe9ed397..bf0d1ffb9 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -3,7 +3,7 @@ * */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -370,7 +370,7 @@ void PhaseCombo_Interaction::getActivityCoefficients(doublereal* ac) const s_update_lnActCoeff(); /* - * take the exp of the internally storred coefficients. + * take the exp of the internally stored coefficients. */ for (size_t k = 0; k < m_kk; k++) { ac[k] = exp(lnActCoeff_Scaled_[k]); @@ -492,7 +492,7 @@ void PhaseCombo_Interaction::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -524,7 +524,7 @@ void PhaseCombo_Interaction::getPartialMolarCp(doublereal* cpbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -564,7 +564,7 @@ void PhaseCombo_Interaction::getPartialMolarEntropies(doublereal* sbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -589,9 +589,9 @@ void PhaseCombo_Interaction::getPartialMolarEntropies(doublereal* sbar) const /* * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void PhaseCombo_Interaction::getPartialMolarVolumes(doublereal* vbar) const @@ -744,7 +744,7 @@ void PhaseCombo_Interaction::initThermoXML(XML_Node& phaseNode, std::string id) //=================================================================================================================== // Update the activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * * he = X_A X_B(B + C X_B) @@ -794,7 +794,7 @@ void PhaseCombo_Interaction::s_update_lnActCoeff() const //=================================================================================================================== // Update the derivative of the log of the activity coefficients wrt T /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * * he = X_A X_B(B + C X_B) @@ -986,7 +986,7 @@ void PhaseCombo_Interaction::s_update_dlnActCoeff_dlnN_diag() const //==================================================================================================================== // Update the derivative of the log of the activity coefficients wrt ln N_k /* - * This function will be called to update the internally storred gradients of the + * This function will be called to update the internally stored gradients of the * logarithm of the activity coefficients. These are used in the determination * of the diffusion coefficients. * diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp index 77ca51280..169d4a159 100644 --- a/src/thermo/PseudoBinaryVPSSTP.cpp +++ b/src/thermo/PseudoBinaryVPSSTP.cpp @@ -12,7 +12,7 @@ * the mole fractions. */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp index 3aa033d1c..75bf55374 100644 --- a/src/thermo/PureFluidPhase.cpp +++ b/src/thermo/PureFluidPhase.cpp @@ -273,7 +273,7 @@ void PureFluidPhase::getPartialMolarEntropies(doublereal* sbar) const // Return an array of partial molar internal energies for the // species in the mixture. Units: J/kmol. /* - * @param ubar Output vector of speciar partial molar internal energies. + * @param ubar Output vector of species partial molar internal energies. * Length = m_kk. units are J/kmol. */ void PureFluidPhase::getPartialMolarIntEnergies(doublereal* ubar) const @@ -296,7 +296,7 @@ void PureFluidPhase::getPartialMolarCp(doublereal* cpbar) const // Return an array of partial molar volumes for the // species in the mixture. Units: m^3/kmol. /* - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void PureFluidPhase::getPartialMolarVolumes(doublereal* vbar) const diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index 019f3f5c7..b4f7894ce 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -7,7 +7,7 @@ * */ /* - * Copywrite (2009) Sandia Corporation. Under the terms of + * Copyright (2009) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -362,7 +362,7 @@ void RedlichKisterVPSSTP::getLnActivityCoefficients(doublereal* lnac) const s_update_lnActCoeff(); /* - * take the exp of the internally storred coefficients. + * take the exp of the internally stored coefficients. */ for (size_t k = 0; k < m_kk; k++) { lnac[k] = lnActCoeff_Scaled_[k]; @@ -481,7 +481,7 @@ void RedlichKisterVPSSTP::getPartialMolarEnthalpies(doublereal* hbar) const } /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -514,7 +514,7 @@ void RedlichKisterVPSSTP::getPartialMolarCp(doublereal* cpbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -554,7 +554,7 @@ void RedlichKisterVPSSTP::getPartialMolarEntropies(doublereal* sbar) const double T = temperature(); /* * Update the activity coefficients, This also update the - * internally storred molalities. + * internally stored molalities. */ s_update_lnActCoeff(); s_update_dlnActCoeff_dT(); @@ -580,9 +580,9 @@ void RedlichKisterVPSSTP::getPartialMolarEntropies(doublereal* sbar) const /* * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ void RedlichKisterVPSSTP::getPartialMolarVolumes(doublereal* vbar) const @@ -701,7 +701,7 @@ void RedlichKisterVPSSTP::initThermoXML(XML_Node& phaseNode, std::string id) //=================================================================================================================== // Update the activity coefficients /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * */ @@ -778,7 +778,7 @@ void RedlichKisterVPSSTP::s_update_lnActCoeff() const //=================================================================================================================== // Update the derivative of the log of the activity coefficients wrt T /* - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients * diff --git a/src/thermo/RedlichKisterVPSSTP.h b/src/thermo/RedlichKisterVPSSTP.h index 1173ecfd3..dee0e699e 100644 --- a/src/thermo/RedlichKisterVPSSTP.h +++ b/src/thermo/RedlichKisterVPSSTP.h @@ -12,7 +12,7 @@ * calculating liquid electrolyte thermodynamics. */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -592,9 +592,9 @@ public: /*! * Frequently, for this class of thermodynamics representations, * the excess Volume due to mixing is zero. Here, we set it as - * a default. It may be overriden in derived classes. + * a default. It may be overridden in derived classes. * - * @param vbar Output vector of speciar partial molar volumes. + * @param vbar Output vector of species partial molar volumes. * Length = m_kk. units are m^3/kmol. */ virtual void getPartialMolarVolumes(doublereal* vbar) const; @@ -832,14 +832,14 @@ private: //! Update the activity coefficients /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * natural logarithm of the activity coefficients */ void s_update_lnActCoeff() const; //! Update the derivative of the log of the activity coefficients wrt T /*! - * This function will be called to update the internally storred + * This function will be called to update the internally stored * derivative of the natural logarithm of the activity coefficients * wrt temperature. */ diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 74269a24b..5bcd478f2 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -7,7 +7,7 @@ * class \link Cantera::RedlichKwongMFTP RedlichKwongMFTP\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/ShomateThermo.h b/src/thermo/ShomateThermo.h index 11259383b..9ee030928 100644 --- a/src/thermo/ShomateThermo.h +++ b/src/thermo/ShomateThermo.h @@ -569,7 +569,7 @@ protected: /*! * This map takes as its index, the species index in the phase. * It returns the group index, where the temperature polynomials - * for that species are stored. group indecises start at 1, + * for that species are stored. group indices start at 1, * so a decrement is always performed to access vectors. */ mutable std::map m_group_map; diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index b50dd6e8c..547b0f9ed 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -6,7 +6,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index 7c3002487..a7d18f06c 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -958,7 +958,7 @@ installVPThermoForSpecies(size_t k, const XML_Node& speciesNode, * * @param type Species thermo type. * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. + * Defaults to NULL. */ SpeciesThermo* newSpeciesThermoMgr(int type, SpeciesThermoFactory* f) { @@ -973,7 +973,7 @@ SpeciesThermo* newSpeciesThermoMgr(int type, SpeciesThermoFactory* f) //the type and (optionally) a pointer to the factory to use to create it. /* * This utility program is a basic factory operation for spawning a - * new species reference-state thermo mananger + * new species reference-state thermo manager * * These functions allows for using a different factory class that * derives from SpeciesThermoFactory. However, no applications of this @@ -1006,8 +1006,8 @@ SpeciesThermo* newSpeciesThermoMgr(std::string& stype, * Each %speciesData node contains a list of XML species elements * e.g., \ * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. - * @param opt Boolean defaults to false. + * Defaults to NULL. + * @param opt Boolean defaults to false. */ SpeciesThermo* newSpeciesThermoMgr(std::vector spData_nodes, SpeciesThermoFactory* f, bool opt) diff --git a/src/thermo/State.cpp b/src/thermo/State.cpp index 360c82cdd..2d0a88901 100644 --- a/src/thermo/State.cpp +++ b/src/thermo/State.cpp @@ -111,7 +111,7 @@ void State::setMoleFractions(const doublereal* const x) doublereal norm = accumulate(x, x + m_kk, 0.0); m_mmw = sum/norm; - //! Call a routine to determin whether state has changed. + //! Call a routine to determine whether state has changed. stateMFChangeCalc(); } @@ -123,7 +123,7 @@ void State::setMoleFractions_NoNorm(const doublereal* const x) transform(m_ym.begin(), m_ym.begin() + m_kk, m_molwts.begin(), m_y.begin(), multiplies()); - //! Call a routine to determin whether state has changed. + //! Call a routine to determine whether state has changed. stateMFChangeCalc(); } @@ -167,7 +167,7 @@ void State::setMassFractions(const doublereal* const y) // } m_mmw = 1.0/sum; - //! Call a routine to determin whether state has changed. + //! Call a routine to determine whether state has changed. stateMFChangeCalc(); } diff --git a/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp index 86ccea88f..c13a374fc 100644 --- a/src/thermo/StoichSubstance.cpp +++ b/src/thermo/StoichSubstance.cpp @@ -45,7 +45,7 @@ StoichSubstance::StoichSubstance(const StoichSubstance& right) : *this = operator=(right); } -// Asignment operator +// Assignment operator /* * Assignment operator for the object. Constructed * object will be a clone of this object, but will diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp index 15b8a6d39..5752a58f8 100644 --- a/src/thermo/StoichSubstanceSSTP.cpp +++ b/src/thermo/StoichSubstanceSSTP.cpp @@ -6,7 +6,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. * diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index 4c13126e3..cc68720c7 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -106,7 +106,7 @@ SurfPhase::SurfPhase(const SurfPhase& right) : *this = operator=(right); } -// Asignment operator +// Assignment operator /* * Assignment operator for the object. Constructed * object will be a clone of this object, but will diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index 94dfc3b2d..2c8a156fe 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -1096,7 +1096,7 @@ void ThermoPhase::setStateFromXML(const XML_Node& state) * Called by function 'equilibrate' in ChemEquil.h to transfer * the element potentials to this object after every successful * equilibration routine. - * The element potentials are storred in their dimensionless + * The element potentials are stored in their dimensionless * forms, calculated by dividing by RT. * @param lambda vector containing the element potentials. * Length = nElements. Units are Joules/kmol. @@ -1118,8 +1118,8 @@ void ThermoPhase::setElementPotentials(const vector_fp& lambda) } /* - * Returns the storred element potentials. - * The element potentials are retrieved from their storred + * Returns the stored element potentials. + * The element potentials are retrieved from their stored * dimensionless forms by multiplying by RT. * @param lambda Vector containing the element potentials. * Length = nElements. Units are Joules/kmol. diff --git a/src/thermo/VPSSMgr.cpp b/src/thermo/VPSSMgr.cpp index 7ba2fd737..1c89bfe43 100644 --- a/src/thermo/VPSSMgr.cpp +++ b/src/thermo/VPSSMgr.cpp @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr VPSSMgr\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/VPSSMgrFactory.cpp b/src/thermo/VPSSMgrFactory.cpp index 03c1113e7..52d193be3 100644 --- a/src/thermo/VPSSMgrFactory.cpp +++ b/src/thermo/VPSSMgrFactory.cpp @@ -6,7 +6,7 @@ * \link Cantera::VPSSMgrFactory VPSSMgrFactory\endlink); */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h index 604cf28c8..218f84296 100644 --- a/src/thermo/VPSSMgrFactory.h +++ b/src/thermo/VPSSMgrFactory.h @@ -5,7 +5,7 @@ * (see \ref mgrpdssthermocalc and class \link Cantera::VPSSMgrFactory VPSSMgrFactory\endlink); */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -190,7 +190,7 @@ private: * @param vp_ptr Variable pressure standard state ThermoPhase object * that will be the owner. * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. + * Defaults to NULL. */ VPSSMgr* newVPSSMgr(VPSSMgr_enumType type, VPStandardStateTP* vp_ptr, VPSSMgrFactory* f=0); @@ -212,7 +212,7 @@ VPSSMgr* newVPSSMgr(VPSSMgr_enumType type, * of species XML nodes that will be in the phase * * @param f Pointer to a SpeciesThermoFactory. optional parameter. - * Defautls to NULL. + * Defaults to NULL. */ VPSSMgr* newVPSSMgr(VPStandardStateTP* vp_ptr, XML_Node* phaseNode_ptr, diff --git a/src/thermo/VPSSMgr_ConstVol.cpp b/src/thermo/VPSSMgr_ConstVol.cpp index 16f2bc8f1..3bb31bc4a 100644 --- a/src/thermo/VPSSMgr_ConstVol.cpp +++ b/src/thermo/VPSSMgr_ConstVol.cpp @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/VPSSMgr_General.cpp b/src/thermo/VPSSMgr_General.cpp index 3ea61b461..4eb96487a 100644 --- a/src/thermo/VPSSMgr_General.cpp +++ b/src/thermo/VPSSMgr_General.cpp @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr_General VPSSMgr_General\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -60,7 +60,7 @@ VPSSMgr_General& VPSSMgr_General::operator=(const VPSSMgr_General& b) VPSSMgr::operator=(b); /* * Must fill in the shallow pointers. These must have already been transfered - * and storred in the owning VPStandardStateTP class. Note we are aware that at this point + * and stored in the owning VPStandardStateTP class. Note we are aware that at this point * m_vptr_ptr may refer back to the wrong ThermoPhase object. However, the shallow copy * performed here is consistent with the assignment operator's general functionality. */ @@ -91,7 +91,7 @@ void VPSSMgr_General::initAllPtrs(VPStandardStateTP* vp_ptr, SpeciesThermo* sp_p VPSSMgr::initAllPtrs(vp_ptr, sp_ptr); /* * Must fill in the shallow pointers. These must have already been transfered - * and storred in the owning VPStandardStateTP class. + * and stored in the owning VPStandardStateTP class. */ m_PDSS_ptrs.resize(m_kk); for (size_t k = 0; k < m_kk; k++) { diff --git a/src/thermo/VPSSMgr_IdealGas.cpp b/src/thermo/VPSSMgr_IdealGas.cpp index de4876d54..71f8eef4e 100644 --- a/src/thermo/VPSSMgr_IdealGas.cpp +++ b/src/thermo/VPSSMgr_IdealGas.cpp @@ -7,7 +7,7 @@ * class \link Cantera::VPSSMgr_IdealGas VPSSMgr_IdealGas\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/VPSSMgr_Water_ConstVol.cpp b/src/thermo/VPSSMgr_Water_ConstVol.cpp index be7b6775c..ee09f6f49 100644 --- a/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -9,7 +9,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp index 6237a2ab7..247436207 100644 --- a/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -9,7 +9,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index ecd52c99a..d97be06cf 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -6,7 +6,7 @@ * class \link Cantera::VPStandardStateTP VPStandardStateTP\endlink). */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -118,7 +118,7 @@ VPStandardStateTP::operator=(const VPStandardStateTP& b) /* * Ok, the VPSSMgr object is ready for business. * We need to resync the temperature and the pressure of the new standard states - * with what is storred in this object. + * with what is stored in this object. */ m_VPSS_ptr->setState_TP(m_Tlast_ss, m_Plast_ss); } diff --git a/src/thermo/WaterProps.cpp b/src/thermo/WaterProps.cpp index bb46312f7..370f4f20a 100644 --- a/src/thermo/WaterProps.cpp +++ b/src/thermo/WaterProps.cpp @@ -2,7 +2,7 @@ * @file WaterProps.cpp */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/WaterPropsIAPWS.cpp b/src/thermo/WaterPropsIAPWS.cpp index 7210eb68e..5f5d0dc35 100644 --- a/src/thermo/WaterPropsIAPWS.cpp +++ b/src/thermo/WaterPropsIAPWS.cpp @@ -5,7 +5,7 @@ * basis (See class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -124,7 +124,7 @@ doublereal WaterPropsIAPWS::helmholtzFE() const /* * Calculate the pressure (Pascals), using the - * current internally storred temperature and density + * current internally stored temperature and density * Temperature: kelvin * rho: density in kg m-3 */ @@ -222,7 +222,7 @@ doublereal WaterPropsIAPWS::density(doublereal temperature, doublereal pressure, * takes a phase guess and a density guess as optional parameters. If no guesses are * * supplied to density(), a gas phase guess is assumed. This may or may not be what - * is wanted. Therefore, density() should usually at leat be supplied with a phase + * is wanted. Therefore, density() should usually at least be supplied with a phase * guess so that it may manufacture an appropriate density guess. * #density() manufactures the initial density guess, nondimensionalizes everything, * and then calls #WaterPropsIAPWSphi::dfind(), which does the iterative calculation @@ -312,7 +312,7 @@ doublereal WaterPropsIAPWS::density() const // Returns the temperature (Kelvin) /* - * @return Returns the internally storred temperature + * @return Returns the internally stored temperature */ doublereal WaterPropsIAPWS::temperature() const { diff --git a/src/thermo/WaterPropsIAPWSphi.cpp b/src/thermo/WaterPropsIAPWSphi.cpp index eba402dd3..0c8077372 100644 --- a/src/thermo/WaterPropsIAPWSphi.cpp +++ b/src/thermo/WaterPropsIAPWSphi.cpp @@ -4,7 +4,7 @@ * (see class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink and class #WaterPropsIAPWSphi). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index 07f13edb7..ff48698f1 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -4,7 +4,7 @@ * and class \link Cantera::WaterSSTP WaterSSTP\endlink). */ /* - * Copywrite (2006) Sandia Corporation. Under the terms of + * Copyright (2006) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ @@ -82,7 +82,7 @@ WaterSSTP::WaterSSTP(const WaterSSTP& b) : /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = b; } diff --git a/src/transport/LTPspecies.cpp b/src/transport/LTPspecies.cpp index 705d3c662..0e20e01b6 100644 --- a/src/transport/LTPspecies.cpp +++ b/src/transport/LTPspecies.cpp @@ -47,7 +47,7 @@ public: static void getArrhenius(const XML_Node& node, doublereal& A, doublereal& b, doublereal& E) { - /* parse the children for the A, b, and E conponents. + /* parse the children for the A, b, and E components. */ A = getFloat(node, "A", "toSI"); b = getFloat(node, "b"); @@ -55,7 +55,7 @@ static void getArrhenius(const XML_Node& node, E /= GasConstant; } //==================================================================================================================== -// Construct an LTPspecies object for a liquid tranport property. +// Construct an LTPspecies object for a liquid transport property. /* * The species transport property is constructed from the XML node, * \verbatim , \endverbatim that is a child of the @@ -117,7 +117,7 @@ LTPspecies::~LTPspecies() { } //==================================================================================================================== -// Returns the vector of pure species tranport property +// Returns the vector of pure species transport property /* * The pure species transport property (i.e. pure species viscosity) * is returned. Any temperature and composition dependence will be @@ -150,7 +150,7 @@ void LTPspecies::adjustCoeffsForComposition() { } //==================================================================================================================== -// Construct an LTPspecies object for a liquid tranport property +// Construct an LTPspecies object for a liquid transport property // expressed as a constant value. /* The transport property is constructed from the XML node, * \verbatim , \endverbatim that is a child of the @@ -206,7 +206,7 @@ doublereal LTPspecies_Const::getSpeciesTransProp() return m_coeffs[0]; } //==================================================================================================================== -// Construct an LTPspecies object for a liquid tranport property +// Construct an LTPspecies object for a liquid transport property // expressed in extended Arrhenius form. /* * The transport property is constructed from the XML node, @@ -321,7 +321,7 @@ doublereal LTPspecies_Arrhenius::getSpeciesTransProp() return m_prop; } //==================================================================================================================== -// Construct an LTPspecies object for a liquid tranport property expressed as a polynomial in temperature. +// Construct an LTPspecies object for a liquid transport property expressed as a polynomial in temperature. /* * The transport property is constructed from the XML node, \verbatim , \endverbatim that is a child of the * \verbatim \endverbatim node and specifies a type of transport property (like viscosity). @@ -393,7 +393,7 @@ doublereal LTPspecies_Poly::getSpeciesTransProp() return m_prop; } //==================================================================================================================== -// Construct an LTPspecies object for a liquid tranport property +// Construct an LTPspecies object for a liquid transport property // expressed as an exponential in temperature. /* * The transport property is constructed from the XML node, \verbatim , \endverbatim that is a child of the diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp index 00a1c7ae6..9cfce6e99 100644 --- a/src/transport/LiquidTransport.cpp +++ b/src/transport/LiquidTransport.cpp @@ -122,7 +122,7 @@ LiquidTransport::LiquidTransport(const LiquidTransport& right) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = right; } diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp index 3bbf8410c..5f5a2e63a 100644 --- a/src/transport/SimpleTransport.cpp +++ b/src/transport/SimpleTransport.cpp @@ -79,7 +79,7 @@ SimpleTransport::SimpleTransport(const SimpleTransport& right) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = right; } diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp index c2ea1763a..e5a20338d 100644 --- a/src/transport/SolidTransport.cpp +++ b/src/transport/SolidTransport.cpp @@ -48,7 +48,7 @@ SolidTransport::SolidTransport(const SolidTransport& right) : { /* * Use the assignment operator to do the brunt - * of the work for the copy construtor. + * of the work for the copy constructor. */ *this = right; } diff --git a/src/transport/Tortuosity.h b/src/transport/Tortuosity.h index e648556db..4dd598ed7 100644 --- a/src/transport/Tortuosity.h +++ b/src/transport/Tortuosity.h @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityBase.cpp b/src/transport/TortuosityBase.cpp index 5f65c2fcb..a2b05dc0e 100644 --- a/src/transport/TortuosityBase.cpp +++ b/src/transport/TortuosityBase.cpp @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityBase.h b/src/transport/TortuosityBase.h index 4c10e8119..cad12c9a3 100644 --- a/src/transport/TortuosityBase.h +++ b/src/transport/TortuosityBase.h @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityBruggeman.cpp b/src/transport/TortuosityBruggeman.cpp index 8da143362..0af0ade8c 100644 --- a/src/transport/TortuosityBruggeman.cpp +++ b/src/transport/TortuosityBruggeman.cpp @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityBruggeman.h b/src/transport/TortuosityBruggeman.h index ad5c835b1..b63e0e240 100644 --- a/src/transport/TortuosityBruggeman.h +++ b/src/transport/TortuosityBruggeman.h @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityMaxwell.cpp b/src/transport/TortuosityMaxwell.cpp index 31a28fca5..edb1b03e0 100644 --- a/src/transport/TortuosityMaxwell.cpp +++ b/src/transport/TortuosityMaxwell.cpp @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityMaxwell.h b/src/transport/TortuosityMaxwell.h index 4d70c2efd..b0720c40a 100644 --- a/src/transport/TortuosityMaxwell.h +++ b/src/transport/TortuosityMaxwell.h @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityPercolation.cpp b/src/transport/TortuosityPercolation.cpp index d778c3217..6f270b740 100644 --- a/src/transport/TortuosityPercolation.cpp +++ b/src/transport/TortuosityPercolation.cpp @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TortuosityPercolation.h b/src/transport/TortuosityPercolation.h index 0af6b1cae..99214f7b9 100644 --- a/src/transport/TortuosityPercolation.h +++ b/src/transport/TortuosityPercolation.h @@ -5,7 +5,7 @@ */ /* - * Copywrite (2005) Sandia Corporation. Under the terms of + * Copyright (2005) Sandia Corporation. Under the terms of * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp index 8375e2cd2..36b06fe04 100644 --- a/src/transport/TransportFactory.cpp +++ b/src/transport/TransportFactory.cpp @@ -623,7 +623,7 @@ void TransportFactory::setupMM(std::ostream& flog, const std::vector