From 60b66f18af06cc2d41e128ae12aa84190599f4fe Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 4 Mar 2008 23:40:08 +0000 Subject: [PATCH] Minor mods to 10 files, due to trying to compile on multiple ASC platforms. Most of the mods had to do with namespace issues. --- Cantera/src/base/ct_defs.h | 2 +- Cantera/src/converters/ck2ctml.cpp | 6 +++--- Cantera/src/converters/ck2ctml.h | 2 +- Cantera/src/equil/vcs_VolPhase.cpp | 12 ++++++------ Cantera/src/equil/vcs_solve.cpp | 2 +- Cantera/src/equil/vcs_solve_TP.cpp | 2 ++ Cantera/src/equil/vcs_util.cpp | 2 ++ Cantera/src/numerics/CVodesIntegrator.h | 2 +- Cantera/src/spectra/LineBroadener.cpp | 1 + Cantera/src/spectra/Nuclei.h | 4 ++-- Cantera/src/spectra/rotor.cpp | 4 +++- Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp | 2 ++ Cantera/src/thermo/SemiconductorPhase.cpp | 2 ++ Cantera/src/thermo/WaterSSTP.cpp | 2 ++ 14 files changed, 29 insertions(+), 16 deletions(-) diff --git a/Cantera/src/base/ct_defs.h b/Cantera/src/base/ct_defs.h index d00f8fff1..37a3a267d 100755 --- a/Cantera/src/base/ct_defs.h +++ b/Cantera/src/base/ct_defs.h @@ -119,7 +119,7 @@ namespace Cantera { 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); + const doublereal lightSpeed = 1.0/std::sqrt(epsilon_0 * permeability_0); //@} //@} diff --git a/Cantera/src/converters/ck2ctml.cpp b/Cantera/src/converters/ck2ctml.cpp index 10b5027de..2aa7067c1 100755 --- a/Cantera/src/converters/ck2ctml.cpp +++ b/Cantera/src/converters/ck2ctml.cpp @@ -24,7 +24,7 @@ using namespace std; #include "xml.h" #include "ck2ctml.h" -//using namespace Cantera; +using namespace Cantera; namespace ctml { @@ -43,11 +43,11 @@ namespace ctml { XML_Node& f = node.addChild("NASA"); if (minx != -999.0) f.addAttribute("Tmin",minx); if (midx != -999.0) f.addAttribute("Tmax",midx); - addFloatArray(f,"coeffs",low.size(),low.begin()); + addFloatArray(f,"coeffs",low.size(),&low[0]); XML_Node& fh = node.addChild("NASA"); if (midx != -999.0) fh.addAttribute("Tmin",midx); if (maxx != -999.0) fh.addAttribute("Tmax",maxx); - addFloatArray(fh,"coeffs",high.size(),high.begin()); + addFloatArray(fh,"coeffs",high.size(),&high[0]); } /* diff --git a/Cantera/src/converters/ck2ctml.h b/Cantera/src/converters/ck2ctml.h index 53ac59777..6133615a9 100755 --- a/Cantera/src/converters/ck2ctml.h +++ b/Cantera/src/converters/ck2ctml.h @@ -46,7 +46,7 @@ namespace ctml { // void addTransport(istream& s, XML_Node& node); void ck2ctml(string idtag, ckr::CKReader& r, - XML_Node& root); + Cantera::XML_Node& root); int convert_ck(const char * const in_file, const char * const db_file, const char * const tr_file, const char * const out_file, const char * const id_tag); diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp index 652dbd4bd..66463aca4 100644 --- a/Cantera/src/equil/vcs_VolPhase.cpp +++ b/Cantera/src/equil/vcs_VolPhase.cpp @@ -233,11 +233,11 @@ void vcs_VolPhase::resize(int phaseNum, int nspecies, const char *phaseName, double molesInert) { if (nspecies <= 0) { plogf("nspecies Error\n"); - exit(-1); + std::exit(-1); } if (phaseNum < 0) { plogf("phaseNum should be greater than 0\n"); - exit(-1); + std::exit(-1); } TMolesInert = molesInert; @@ -252,7 +252,7 @@ void vcs_VolPhase::resize(int phaseNum, int nspecies, const char *phaseName, if (strcmp(PhaseName.c_str(), phaseName)) { plogf("Strings are different: %s %s :unknown situation\n", PhaseName.c_str(), phaseName); - exit(-1); + std::exit(-1); } } else { VP_ID = phaseNum; @@ -335,7 +335,7 @@ void vcs_VolPhase::evaluateActCoeff() const { break; default: plogf("%sERROR: unknown model\n", yo); - exit(-1); + std::exit(-1); } } m_UpToDate_AC = true; @@ -516,7 +516,7 @@ void vcs_VolPhase::setMoleFractions(const double * const xmol) { Xmol[k] = xmol[k]; sum+= xmol[k]; } - if (fabs(sum) > 1.0E-13) { + if (std::fabs(sum) > 1.0E-13) { for (int k = 0; k < NVolSpecies; k++) { Xmol[k] /= sum; } @@ -571,7 +571,7 @@ void vcs_VolPhase::setMolesFromVCSCheck(const double * const molesSpeciesVCS, } else { plogf("We have a consistency problem: %21.16g %21.16g\n", Tcheck, TMoles); - exit(-1); + std::exit(-1); } } } diff --git a/Cantera/src/equil/vcs_solve.cpp b/Cantera/src/equil/vcs_solve.cpp index 21d4ae096..3c05881f8 100644 --- a/Cantera/src/equil/vcs_solve.cpp +++ b/Cantera/src/equil/vcs_solve.cpp @@ -29,7 +29,7 @@ using namespace std; namespace VCSnonideal { - int VCSnonideal::vcs_timing_print_lvl = 1; + int vcs_timing_print_lvl = 1; VCS_SOLVE::VCS_SOLVE() : NSPECIES0(0), diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index de9ac1c81..70f954eb6 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -26,6 +26,8 @@ #pragma warning(disable:4996) #endif +using namespace std; + namespace VCSnonideal { diff --git a/Cantera/src/equil/vcs_util.cpp b/Cantera/src/equil/vcs_util.cpp index 31cfb53e6..31d2311d1 100644 --- a/Cantera/src/equil/vcs_util.cpp +++ b/Cantera/src/equil/vcs_util.cpp @@ -15,6 +15,8 @@ #include "vcs_internal.h" +using namespace std; + namespace VCSnonideal { /***************************************************************************/ diff --git a/Cantera/src/numerics/CVodesIntegrator.h b/Cantera/src/numerics/CVodesIntegrator.h index 73a8516bb..6a0bb29fe 100644 --- a/Cantera/src/numerics/CVodesIntegrator.h +++ b/Cantera/src/numerics/CVodesIntegrator.h @@ -111,7 +111,7 @@ namespace Cantera { #else -No sundials! +#error No sundials! #endif diff --git a/Cantera/src/spectra/LineBroadener.cpp b/Cantera/src/spectra/LineBroadener.cpp index 595edb198..167261e3d 100644 --- a/Cantera/src/spectra/LineBroadener.cpp +++ b/Cantera/src/spectra/LineBroadener.cpp @@ -1,4 +1,5 @@ #include "ct_defs.h" +#include #include "LineBroadener.h" using namespace std; diff --git a/Cantera/src/spectra/Nuclei.h b/Cantera/src/spectra/Nuclei.h index 5822ba296..ccb69d215 100644 --- a/Cantera/src/spectra/Nuclei.h +++ b/Cantera/src/spectra/Nuclei.h @@ -25,7 +25,7 @@ namespace CanteraSpectra { int nProtons() { return m_np; } int mNeutrons() { return m_nn; } doublereal spin() { return m_spin; } - int multiplicity() { return 2*m_spin + 1; } + int multiplicity() { return (int)(2*m_spin) + 1; } int atomicNumber() { return m_np; } std::string symbol() { return m_sym; } @@ -38,7 +38,7 @@ namespace CanteraSpectra { return !(*this == b); } - bool isBoson() { return (m_spin - floor(m_spin) < 0.001); } + bool isBoson() { return (m_spin - std::floor(m_spin) < 0.001); } protected: diff --git a/Cantera/src/spectra/rotor.cpp b/Cantera/src/spectra/rotor.cpp index 7c7385f2e..ea9d7a31a 100644 --- a/Cantera/src/spectra/rotor.cpp +++ b/Cantera/src/spectra/rotor.cpp @@ -10,6 +10,8 @@ #include "ct_defs.h" #include "rotor.h" +using namespace std; + namespace CanteraSpectra { /** @@ -65,7 +67,7 @@ namespace CanteraSpectra { if (T_Trot > 100.0) return T_Trot; else { - if (cutoff < 0) cutoff = 3.0*sqrt(T/m_Bv); + if (cutoff < 0) cutoff = (int) (3.0*sqrt(T/m_Bv)); doublereal dsum = 0.0, sum = 0.0; for (j = 0; j < cutoff; j++) { dsum = degeneracy(j)*exp(-wnum_to_J(energy_w(j))/(Boltzmann * T)); diff --git a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp b/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp index ddf2f8f86..47c5788e0 100644 --- a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -21,6 +21,8 @@ #include "ctexceptions.h" #include "Nasa9PolyMultiTempRegion.h" +using namespace std; + namespace Cantera { // The NASA 9 polynomial parameterization for a single species diff --git a/Cantera/src/thermo/SemiconductorPhase.cpp b/Cantera/src/thermo/SemiconductorPhase.cpp index 99c0f54c0..8368eda9b 100644 --- a/Cantera/src/thermo/SemiconductorPhase.cpp +++ b/Cantera/src/thermo/SemiconductorPhase.cpp @@ -1,6 +1,8 @@ #include "SemiconductorPhase.h" +using namespace std; + namespace Cantera { const doublereal JD_const1 = 1.0/sqrt(8.0); diff --git a/Cantera/src/thermo/WaterSSTP.cpp b/Cantera/src/thermo/WaterSSTP.cpp index 78915d092..bf79f4e4d 100644 --- a/Cantera/src/thermo/WaterSSTP.cpp +++ b/Cantera/src/thermo/WaterSSTP.cpp @@ -19,6 +19,8 @@ #include "ThermoFactory.h" #include +using namespace std; + namespace Cantera { /** * Basic list of constructors and duplicators