research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Took out namespaces from headers.

Browse source
This commit is contained in:
Harry Moffat 2011-03-28 20:41:51 +00:00
parent d7a00c9126
commit 566fcdea0c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cantera/src/spectra/LineBroadener.cpp
View file

@ -3,6 +3,7 @@
#include "LineBroadener.h"
using namespace std;
using namespace Cantera;
namespace CanteraSpectra {
@ -20,7 +21,7 @@ namespace CanteraSpectra {
* Units: 1/wavenumber (or cm).
*/
doublereal Lorentzian::profile(doublereal deltaFreq) {
return (1.0/Pi) *m_hwhm/(deltaFreq*deltaFreq + m_hwhm2);
return (1.0/Cantera::Pi) *m_hwhm/(deltaFreq*deltaFreq + m_hwhm2);
}
/**
@ -47,7 +48,7 @@ namespace CanteraSpectra {
//cout << "entered Gaussian::profile" << endl;
//cout << "deltaFreq = " << deltaFreq << endl;
//cout << "m_sigma = " << m_sigma << endl;
return 1.0/(m_sigma*SqrtTwo*SqrtPi) *
return 1.0/(m_sigma * Cantera::SqrtTwo *Cantera::SqrtPi) *
exp(-deltaFreq*deltaFreq/(2.0*m_sigma2));
}

5
Cantera/src/spectra/LineBroadener.h
View file

@ -7,7 +7,6 @@
#include "ct_defs.h"
#include "ctexceptions.h"
using namespace Cantera;
namespace CanteraSpectra {
/**
@ -38,7 +37,7 @@ namespace CanteraSpectra {
* an exception will be thrown.
*/
virtual doublereal profile(doublereal deltaFreq) {
throw CanteraError("LineBroadener::profile",
throw Cantera::CanteraError("LineBroadener::profile",
"base class method called!");
}
@ -53,7 +52,7 @@ namespace CanteraSpectra {
* \f]
*/
virtual doublereal cumulative(doublereal deltaFreq) {
throw CanteraError("LineBroadener::cumulative",
throw Cantera::CanteraError("LineBroadener::cumulative",
"base class method called!");
}