diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index f7509d99b4..af03ca21c6 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -273,7 +273,7 @@ class InterfaceKinetics : public Kinetics //! Update the standard state chemical potentials and species equilibrium //! constant entries /*! - * Virtual because it is overwritten when dealing with experimental open + * Virtual because it is overridden when dealing with experimental open * circuit voltage overrides */ virtual void updateMu0(); diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index c9e91a48d8..8e6db5ffd7 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -646,7 +646,7 @@ class DebyeHuckel : public MolalityVPSSTP public: //! Set the internally stored density (gm/m^3) of the phase. /*! - * Overwritten setDensity() function is necessary because the density is not + * Overridden setDensity() function is necessary because the density is not * an independent variable. * * This function will now throw an error condition @@ -668,7 +668,7 @@ class DebyeHuckel : public MolalityVPSSTP //! Set the internally stored molar density (kmol/m^3) of the phase. /** - * Overwritten setMolarDensity() function is necessary because the density + * Overridden setMolarDensity() function is necessary because the density * is not an independent variable. * * This function will now throw an error condition if the input isn't diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index 5cfe42f1a0..b1815d5823 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -1332,7 +1332,7 @@ class HMWSoln : public MolalityVPSSTP public: //! Set the internally stored density (kg/m^3) of the phase. /*! - * Overwritten setDensity() function is necessary because the density is not + * Overridden setDensity() function is necessary because the density is not * an independent variable. * * This function will now throw an error condition. @@ -1354,7 +1354,7 @@ class HMWSoln : public MolalityVPSSTP //! Set the internally stored molar density (kmol/m^3) for the phase. /** - * Overwritten setMolarDensity() function is necessary because of the + * Overridden setMolarDensity() function is necessary because of the * underlying water model. * * This function will now throw an error condition if the input isn't @@ -1790,7 +1790,7 @@ class HMWSoln : public MolalityVPSSTP //! pressure, and solution concentration. /*! * See Denbigh p. 278 for a thorough discussion. This class must be - * overwritten in classes which derive from MolalityVPSSTP. This function + * overridden in classes which derive from MolalityVPSSTP. This function * takes over from the molar-based activity coefficient calculation, * getActivityCoefficients(), in derived classes. * diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index 3ee75f5eb4..6ac329c4d4 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -219,7 +219,7 @@ class IdealMolalSoln : public MolalityVPSSTP public: /** - * Overwritten setDensity() function is necessary because the density is not + * Overridden setDensity() function is necessary because the density is not * an independent variable. * * This function will now throw an error condition @@ -233,7 +233,7 @@ class IdealMolalSoln : public MolalityVPSSTP void setDensity(const doublereal rho); /** - * Overwritten setMolarDensity() function is necessary because the density + * Overridden setMolarDensity() function is necessary because the density * is not an independent variable. * * This function will now throw an error condition. diff --git a/include/cantera/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h index b6dbb659f7..659a233cc9 100644 --- a/include/cantera/thermo/IdealSolidSolnPhase.h +++ b/include/cantera/thermo/IdealSolidSolnPhase.h @@ -224,7 +224,7 @@ class IdealSolidSolnPhase : public ThermoPhase void calcDensity(); /** - * Overwritten setDensity() function is necessary because the density is not + * Overridden setDensity() function is necessary because the density is not * an independent variable. * * This function will now throw an error condition @@ -238,7 +238,7 @@ class IdealSolidSolnPhase : public ThermoPhase virtual void setDensity(const doublereal rho); /** - * Overwritten setMolarDensity() function is necessary because the density + * Overridden setMolarDensity() function is necessary because the density * is not an independent variable. * * This function will now throw an error condition. diff --git a/include/cantera/thermo/MaskellSolidSolnPhase.h b/include/cantera/thermo/MaskellSolidSolnPhase.h index c4a7e34a65..1590443825 100644 --- a/include/cantera/thermo/MaskellSolidSolnPhase.h +++ b/include/cantera/thermo/MaskellSolidSolnPhase.h @@ -75,7 +75,7 @@ class MaskellSolidSolnPhase : public VPStandardStateTP virtual void setPressure(doublereal p); /** - * Overwritten setDensity() function is necessary because the density is not + * Overridden setDensity() function is necessary because the density is not * an independent variable. * * This function will now throw an error condition @@ -87,7 +87,7 @@ class MaskellSolidSolnPhase : public VPStandardStateTP virtual void calcDensity(); /** - * Overwritten setMolarDensity() function is necessary because the density + * Overridden setMolarDensity() function is necessary because the density * is not an independent variable. * * This function will now throw an error condition. diff --git a/include/cantera/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h index d91164b1dc..0554df5e20 100644 --- a/include/cantera/thermo/MolalityVPSSTP.h +++ b/include/cantera/thermo/MolalityVPSSTP.h @@ -409,7 +409,7 @@ class MolalityVPSSTP : public VPStandardStateTP //! the current solution temperature, pressure, and solution concentration. /*! * See Denbigh p. 278 for a thorough discussion. This class must be - * overwritten in classes which derive from MolalityVPSSTP. This function + * overridden in classes which derive from MolalityVPSSTP. This function * takes over from the molar-based activity coefficient calculation, * getActivityCoefficients(), in derived classes. * @@ -540,7 +540,7 @@ class MolalityVPSSTP : public VPStandardStateTP //! concentration. /*! * See Denbigh p. 278 for a thorough discussion. This class must be - * overwritten in classes which derive from MolalityVPSSTP. This function + * overridden in classes which derive from MolalityVPSSTP. This function * takes over from the molar-based activity coefficient calculation, * getActivityCoefficients(), in derived classes. * diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h index 6785cc810e..af0a31c315 100644 --- a/include/cantera/thermo/ThermoPhase.h +++ b/include/cantera/thermo/ThermoPhase.h @@ -978,7 +978,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the specific * entropy and temperature have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param s specific entropy (J/kg/K) * @param t temperature (K) @@ -994,7 +994,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the * temperature and specific volume have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param t temperature (K) * @param v specific volume (m^3/kg) @@ -1010,7 +1010,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the * pressure and specific volume have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param p pressure (Pa) * @param v specific volume (m^3/kg) @@ -1026,7 +1026,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the specific * internal energy and pressure have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param u specific internal energy (J/kg) * @param p pressure (Pa) @@ -1042,7 +1042,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the specific * volume and the specific enthalpy have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param v specific volume (m^3/kg) * @param h specific enthalpy (J/kg) @@ -1058,7 +1058,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the * temperature and specific enthalpy have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param t temperature (K) * @param h specific enthalpy (J/kg) @@ -1074,7 +1074,7 @@ class ThermoPhase : public Phase /*! * This function fixes the internal state of the phase so that the * temperature and pressure have the value of the input parameters. - * This base class function will print an error if not overwritten. + * This base class function will throw an exception if not overridden. * * @param s specific entropy (J/kg/K) * @param h specific enthalpy (J/kg) @@ -1094,7 +1094,7 @@ class ThermoPhase : public Phase * the temperature that will yield the desired input pressure and density. * The composition is held constant during this process. * - * This base class function will print an error, if not overwritten. + * This base class function will print an error, if not overridden. * * @param rho Density (kg/m^3) * @param p Pressure (Pa) diff --git a/include/cantera/thermo/WaterSSTP.h b/include/cantera/thermo/WaterSSTP.h index d86c8a635d..284e427a42 100644 --- a/include/cantera/thermo/WaterSSTP.h +++ b/include/cantera/thermo/WaterSSTP.h @@ -241,7 +241,7 @@ class WaterSSTP : public SingleSpeciesTP protected: /** - * @internal This internal routine must be overwritten because it is not + * @internal This internal routine must be overridden because it is not * applicable. */ void _updateThermo() const;