diff --git a/Cantera/src/base/ct_defs.h b/Cantera/src/base/ct_defs.h index 8d1c2c270..6c3636664 100755 --- a/Cantera/src/base/ct_defs.h +++ b/Cantera/src/base/ct_defs.h @@ -102,8 +102,8 @@ namespace Cantera { //@} /// @name Electron Properties //@{ - const doublereal ElectronCharge = 1.602176487e-19; // C - const doublereal ElectronMass = 9.10938188e-31; // kg + const doublereal ElectronCharge = 1.60217648740e-19; // C + const doublereal ElectronMass = 9.1093821545e-31; // kg const doublereal Faraday = ElectronCharge * Avogadro; //@} @@ -117,6 +117,7 @@ namespace Cantera { /// Permeability of free space \f$ \mu_0 \f$ in N/A^2. const doublereal permeability_0 = 4.0e-7*Pi; // N/A^2 + /// Speed of Light (m/s). const doublereal lightSpeed = 1.0/sqrt(epsilon_0 * permeability_0); //@} diff --git a/Cantera/src/base/utilities.h b/Cantera/src/base/utilities.h index 240c10c8c..bf95df4d1 100755 --- a/Cantera/src/base/utilities.h +++ b/Cantera/src/base/utilities.h @@ -12,16 +12,12 @@ #include "ct_defs.h" -#ifdef DARWINNN -#include -#endif +//#ifdef DARWIN +//#include +//#endif //! Templated unary operator that carries out a multiplication operation /*! - * Class carries out a multiplication operation ON ITSELF using - * a unary call. It inherits from the STL class, std::unary_function. - * The class contains one template, which is the underlying class. - * Note. This is outside the Cantera namespace ?! */ template struct timesConstant : public std::unary_function { diff --git a/Cantera/src/spectra/LineBroadener.h b/Cantera/src/spectra/LineBroadener.h index bf318a6c5..b8420586f 100644 --- a/Cantera/src/spectra/LineBroadener.h +++ b/Cantera/src/spectra/LineBroadener.h @@ -1,8 +1,17 @@ +/** + * @file LinerBoadener.h + * Header file for class LineBroadener + */ + #include "ct_defs.h" #include "ctexceptions.h" namespace Cantera { + /** + * Base class for classes implementing line shapes of + * various types. + */ class LineBroadener { public: @@ -12,8 +21,15 @@ namespace Cantera { virtual ~LineBroadener() {} /** - * the line shape profile, as a function of distance from line + * The line shape profile + * \f[ + * P(\Delta\nu) + *\f] + * as a function of distance from line * center. This function must have total area = 1.0. + * Note that this method must be overloaded in each + * derived class. If the base class method is called, + * an exception will be thrown. */ virtual doublereal profile(doublereal deltaFreq) { throw CanteraError("LineBroadener::profile", @@ -33,6 +49,14 @@ namespace Cantera { }; + /** + * The line shape for pure collisional broadening. The Lorentzian line + * shape is + * \f[ + * L(\Delta\nu) = \frac{1}{\pi}\frac{\gamma}{\Delta\nu^2 + \gamma^2} + * \f] + * where \f$ \gamma = {\mbox{FWHM}/2 \f$. + */ class Lorentzian : public LineBroadener { public: Lorentzian(doublereal FWHM); @@ -45,8 +69,17 @@ namespace Cantera { doublereal m_hwhm2; }; + /** + * A Gaussian line profile. This profile results when Doppler + * broadening is dominant. + */ class Gaussian : public LineBroadener { public: + + /** + * Constructor. + * @param FWHM Full width at half-maximum. + */ Gaussian(doublereal FWHM); virtual doublereal profile(doublereal deltaFreq); virtual doublereal cumulative(doublereal deltaFreq);