Took out namespaces from headers.

This commit is contained in:
Harry Moffat 2011-03-28 20:39:34 +00:00
parent 361c8f655b
commit d7a00c9126
2 changed files with 6 additions and 6 deletions

View file

@ -11,6 +11,7 @@
#include "rotor.h" #include "rotor.h"
using namespace std; using namespace std;
using namespace Cantera;
namespace CanteraSpectra { namespace CanteraSpectra {

View file

@ -14,7 +14,6 @@
*/ */
#include "ct_defs.h" #include "ct_defs.h"
using namespace Cantera;
/** /**
* Namespace for spectroscopic functions and classes. * Namespace for spectroscopic functions and classes.
@ -63,24 +62,24 @@ namespace CanteraSpectra {
/** convert from Hz to wavenmbers */ /** convert from Hz to wavenmbers */
inline doublereal hz_to_wnum(doublereal freq) { inline doublereal hz_to_wnum(doublereal freq) {
return freq/(100.0*lightSpeed); return freq/(100.0*Cantera::lightSpeed);
} }
/** Convert from wavenumbers to Joules. */ /** Convert from wavenumbers to Joules. */
inline doublereal wnum_to_J(doublereal w) { inline doublereal wnum_to_J(doublereal w) {
return Planck * w * 100.0 * lightSpeed; return Cantera::Planck * w * 100.0 * Cantera::lightSpeed;
} }
inline doublereal J_to_wnum(doublereal e) { inline doublereal J_to_wnum(doublereal e) {
return e /(Planck * 100.0 * lightSpeed); return e /(Cantera::Planck * 100.0 * Cantera::lightSpeed);
} }
inline doublereal wnum_to_eV(doublereal w) { inline doublereal wnum_to_eV(doublereal w) {
return Planck * w * 100.0 * lightSpeed / ElectronCharge; return Cantera::Planck * w * 100.0 * Cantera::lightSpeed / Cantera::ElectronCharge;
} }
inline doublereal eV_to_wnum(doublereal e) { inline doublereal eV_to_wnum(doublereal e) {
return e * ElectronCharge / (Planck * 100.0 * lightSpeed); return e * Cantera::ElectronCharge / (Cantera::Planck * 100.0 * Cantera::lightSpeed);
} }
} }