From 361c8f655b6e83270e3b398dafdb266ae3a76747 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 28 Mar 2011 20:29:33 +0000 Subject: [PATCH] Took out namespaces from headers --- Cantera/src/thermo/ConstDensityThermo.cpp | 2 ++ Cantera/src/thermo/DebyeHuckel.cpp | 1 + Cantera/src/thermo/FixedChemPotSSTP.cpp | 4 ++-- Cantera/src/thermo/HMWSoln_input.cpp | 1 + Cantera/src/thermo/IdealMolalSoln.cpp | 2 ++ Cantera/src/thermo/IdealSolidSolnPhase.cpp | 2 +- Cantera/src/thermo/LatticePhase.cpp | 6 +++--- Cantera/src/thermo/LatticeSolidPhase.cpp | 2 +- Cantera/src/thermo/MargulesVPSSTP.cpp | 8 ++++---- Cantera/src/thermo/MetalPhase.h | 2 +- Cantera/src/thermo/MetalSHEelectrons.cpp | 4 ++-- Cantera/src/thermo/MineralEQ3.cpp | 14 +++++++------- Cantera/src/thermo/MolalityVPSSTP.cpp | 4 ++-- Cantera/src/thermo/PDSS_ConstVol.cpp | 2 +- Cantera/src/thermo/PDSS_HKFT.cpp | 1 + Cantera/src/thermo/PDSS_SSVol.cpp | 6 +++--- Cantera/src/thermo/Phase.h | 1 - Cantera/src/thermo/PhaseCombo_Interaction.cpp | 8 ++++---- Cantera/src/thermo/PhaseCombo_Interaction.h | 4 ++-- Cantera/src/thermo/SemiconductorPhase.h | 16 ++++++++-------- Cantera/src/thermo/StoichSubstance.cpp | 2 +- Cantera/src/thermo/StoichSubstanceSSTP.cpp | 4 ++-- Cantera/src/thermo/SurfPhase.cpp | 2 ++ Cantera/src/thermo/ThermoFactory.cpp | 1 + Cantera/src/thermo/ThermoPhase.cpp | 1 + Cantera/src/thermo/VPSSMgr_ConstVol.cpp | 4 ++-- Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp | 4 ++-- 27 files changed, 59 insertions(+), 49 deletions(-) diff --git a/Cantera/src/thermo/ConstDensityThermo.cpp b/Cantera/src/thermo/ConstDensityThermo.cpp index b0adfaca1..f4129d143 100644 --- a/Cantera/src/thermo/ConstDensityThermo.cpp +++ b/Cantera/src/thermo/ConstDensityThermo.cpp @@ -22,6 +22,8 @@ #include +using namespace ctml; + namespace Cantera { ConstDensityThermo::ConstDensityThermo() : m_tlast(0.0) { diff --git a/Cantera/src/thermo/DebyeHuckel.cpp b/Cantera/src/thermo/DebyeHuckel.cpp index d3dca91f5..b2b1f9c81 100644 --- a/Cantera/src/thermo/DebyeHuckel.cpp +++ b/Cantera/src/thermo/DebyeHuckel.cpp @@ -28,6 +28,7 @@ #include using namespace std; +using namespace ctml; namespace Cantera { diff --git a/Cantera/src/thermo/FixedChemPotSSTP.cpp b/Cantera/src/thermo/FixedChemPotSSTP.cpp index 42a99d96e..0e7f87f4f 100644 --- a/Cantera/src/thermo/FixedChemPotSSTP.cpp +++ b/Cantera/src/thermo/FixedChemPotSSTP.cpp @@ -489,7 +489,7 @@ namespace Cantera { "thermo model attribute must be FixedChemPot or StoichSubstance or StoichSubstanceSSTP"); } if (model == "FixedChemPot") { - double val = getFloatDefaultUnits(tnode, "chemicalPotential", "J/kmol"); + double val = ctml::getFloatDefaultUnits(tnode, "chemicalPotential", "J/kmol"); chemPot_ = val; } SingleSpeciesTP::initThermoXML(phaseNode, id); @@ -528,7 +528,7 @@ namespace Cantera { "thermo model attribute must be FixedChemPot or StoichSubstance or StoichSubstanceSSTP"); } if (model == "FixedChemPotSSTP") { - doublereal val = getFloatDefaultUnits(eosdata, "chemicalPotential", "J/kmol"); + doublereal val = ctml::getFloatDefaultUnits(eosdata, "chemicalPotential", "J/kmol"); chemPot_ = val; } } diff --git a/Cantera/src/thermo/HMWSoln_input.cpp b/Cantera/src/thermo/HMWSoln_input.cpp index bca1ae93f..f4380c784 100644 --- a/Cantera/src/thermo/HMWSoln_input.cpp +++ b/Cantera/src/thermo/HMWSoln_input.cpp @@ -24,6 +24,7 @@ #include using namespace std; +using namespace ctml; namespace Cantera { diff --git a/Cantera/src/thermo/IdealMolalSoln.cpp b/Cantera/src/thermo/IdealMolalSoln.cpp index 3730d60cb..9a60d5da1 100644 --- a/Cantera/src/thermo/IdealMolalSoln.cpp +++ b/Cantera/src/thermo/IdealMolalSoln.cpp @@ -33,6 +33,8 @@ #endif //@} +using namespace ctml; + namespace Cantera { //! Small value to be used in cutoff expressions with logs diff --git a/Cantera/src/thermo/IdealSolidSolnPhase.cpp b/Cantera/src/thermo/IdealSolidSolnPhase.cpp index 8841712eb..4425531a7 100644 --- a/Cantera/src/thermo/IdealSolidSolnPhase.cpp +++ b/Cantera/src/thermo/IdealSolidSolnPhase.cpp @@ -1244,7 +1244,7 @@ namespace Cantera { for (int k = 0; k < m_kk; k++) { XML_Node* s = speciesDB->findByAttr("name", sss[k]); XML_Node *ss = s->findByName("standardState"); - m_speciesMolarVolume[k] = getFloat(*ss, "molarVolume", "toSI"); + m_speciesMolarVolume[k] = ctml::getFloat(*ss, "molarVolume", "toSI"); } /* diff --git a/Cantera/src/thermo/LatticePhase.cpp b/Cantera/src/thermo/LatticePhase.cpp index a0c900464..f23b5b009 100644 --- a/Cantera/src/thermo/LatticePhase.cpp +++ b/Cantera/src/thermo/LatticePhase.cpp @@ -499,7 +499,7 @@ namespace Cantera { XML_Node *ss = s->findByName("standardState"); if (ss) { if (ss->findByName("molarVolume")) { - m_speciesMolarVolume[k] = getFloat(*ss, "molarVolume", "toSI"); + m_speciesMolarVolume[k] = ctml::getFloat(*ss, "molarVolume", "toSI"); } } } @@ -541,8 +541,8 @@ namespace Cantera { //===================================================================================================== void LatticePhase::setParametersFromXML(const XML_Node& eosdata) { eosdata._require("model", "Lattice"); - m_site_density = getFloat(eosdata, "site_density", "toSI"); - m_vacancy = getChildValue(eosdata, "vacancy_species"); + m_site_density = ctml::getFloat(eosdata, "site_density", "toSI"); + m_vacancy = ctml::getChildValue(eosdata, "vacancy_species"); } //===================================================================================================== } diff --git a/Cantera/src/thermo/LatticeSolidPhase.cpp b/Cantera/src/thermo/LatticeSolidPhase.cpp index 6b0d04385..4a024cfc9 100644 --- a/Cantera/src/thermo/LatticeSolidPhase.cpp +++ b/Cantera/src/thermo/LatticeSolidPhase.cpp @@ -639,7 +639,7 @@ namespace Cantera { std::vector pnam; std::vector pval; XML_Node& ls = eosdata.child("LatticeStoichiometry"); - int np = getPairs(ls, pnam, pval); + int np = ctml::getPairs(ls, pnam, pval); theta_.resize(nl); for (int i = 0; i < np; i++) { double val = fpValueCheck(pval[i]); diff --git a/Cantera/src/thermo/MargulesVPSSTP.cpp b/Cantera/src/thermo/MargulesVPSSTP.cpp index b3e85eda7..b2c57cde8 100644 --- a/Cantera/src/thermo/MargulesVPSSTP.cpp +++ b/Cantera/src/thermo/MargulesVPSSTP.cpp @@ -1145,7 +1145,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessEnthalpy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessEnthalpy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { @@ -1161,7 +1161,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessEntropy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessEntropy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { @@ -1177,7 +1177,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Enthalpy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Enthalpy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { @@ -1193,7 +1193,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Entropy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Entropy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { diff --git a/Cantera/src/thermo/MetalPhase.h b/Cantera/src/thermo/MetalPhase.h index 32ad3431d..315e4c344 100644 --- a/Cantera/src/thermo/MetalPhase.h +++ b/Cantera/src/thermo/MetalPhase.h @@ -104,7 +104,7 @@ namespace Cantera { virtual void setParametersFromXML(const XML_Node& eosdata) { eosdata._require("model","Metal"); - doublereal rho = getFloat(eosdata, "density", "density"); + doublereal rho = ctml::getFloat(eosdata, "density", "density"); setDensity(rho); } diff --git a/Cantera/src/thermo/MetalSHEelectrons.cpp b/Cantera/src/thermo/MetalSHEelectrons.cpp index 221fa5ae9..d9ef37ec5 100644 --- a/Cantera/src/thermo/MetalSHEelectrons.cpp +++ b/Cantera/src/thermo/MetalSHEelectrons.cpp @@ -433,7 +433,7 @@ namespace Cantera { XML_Node &tnode = phaseNode.child("thermo"); doublereal dens = 2.65E3; if (tnode.hasChild("density")) { - dens = getFloatDefaultUnits(tnode, "density", "kg/m3"); + dens = ctml::getFloatDefaultUnits(tnode, "density", "kg/m3"); } setDensity(dens); SingleSpeciesTP::initThermoXML(phaseNode, id); @@ -537,7 +537,7 @@ namespace Cantera { } doublereal rho = 2.65E3; if (eosdata.hasChild("density")) { - rho = getFloat(eosdata, "density", "toSI"); + rho = ctml::getFloat(eosdata, "density", "toSI"); } setDensity(rho); } diff --git a/Cantera/src/thermo/MineralEQ3.cpp b/Cantera/src/thermo/MineralEQ3.cpp index 1758f95de..e97c8f9e2 100644 --- a/Cantera/src/thermo/MineralEQ3.cpp +++ b/Cantera/src/thermo/MineralEQ3.cpp @@ -493,7 +493,7 @@ namespace Cantera { Aunits = aV.attrib("units"); Afactor = toSI(Aunits); } - volVal = getFloat(*aStandardState, "V0_Pr_Tr"); + volVal = ctml::getFloat(*aStandardState, "V0_Pr_Tr"); m_V0_pr_tr= volVal; volVal *= Afactor; m_speciesSize[0] = volVal; @@ -509,13 +509,13 @@ namespace Cantera { m_deltaG_formation_pr_tr = - getFloatDefaultUnits(MinEQ3node, "DG0_f_Pr_Tr", "cal/gmol", "actEnergy"); + ctml::getFloatDefaultUnits(MinEQ3node, "DG0_f_Pr_Tr", "cal/gmol", "actEnergy"); m_deltaH_formation_pr_tr = - getFloatDefaultUnits(MinEQ3node, "DH0_f_Pr_Tr", "cal/gmol", "actEnergy"); - m_Entrop_pr_tr = getFloatDefaultUnits(MinEQ3node, "S0_Pr_Tr", "cal/gmol/K"); - m_a = getFloatDefaultUnits(MinEQ3node, "a", "cal/gmol/K"); - m_b = getFloatDefaultUnits(MinEQ3node, "b", "cal/gmol/K2"); - m_c = getFloatDefaultUnits(MinEQ3node, "c", "cal-K/gmol"); + ctml::getFloatDefaultUnits(MinEQ3node, "DH0_f_Pr_Tr", "cal/gmol", "actEnergy"); + m_Entrop_pr_tr = ctml::getFloatDefaultUnits(MinEQ3node, "S0_Pr_Tr", "cal/gmol/K"); + m_a = ctml::getFloatDefaultUnits(MinEQ3node, "a", "cal/gmol/K"); + m_b = ctml::getFloatDefaultUnits(MinEQ3node, "b", "cal/gmol/K2"); + m_c = ctml::getFloatDefaultUnits(MinEQ3node, "c", "cal-K/gmol"); convertDGFormation(); diff --git a/Cantera/src/thermo/MolalityVPSSTP.cpp b/Cantera/src/thermo/MolalityVPSSTP.cpp index da2a30e60..617f0224b 100644 --- a/Cantera/src/thermo/MolalityVPSSTP.cpp +++ b/Cantera/src/thermo/MolalityVPSSTP.cpp @@ -590,12 +590,12 @@ namespace Cantera { */ void MolalityVPSSTP::setStateFromXML(const XML_Node& state) { VPStandardStateTP::setStateFromXML(state); - string comp = getChildValue(state,"soluteMolalities"); + string comp = ctml::getChildValue(state,"soluteMolalities"); if (comp != "") { setMolalitiesByName(comp); } if (state.hasChild("pressure")) { - double p = getFloat(state, "pressure", "pressure"); + double p = ctml::getFloat(state, "pressure", "pressure"); setPressure(p); } } diff --git a/Cantera/src/thermo/PDSS_ConstVol.cpp b/Cantera/src/thermo/PDSS_ConstVol.cpp index 6bd07eac0..c5e33b749 100644 --- a/Cantera/src/thermo/PDSS_ConstVol.cpp +++ b/Cantera/src/thermo/PDSS_ConstVol.cpp @@ -119,7 +119,7 @@ namespace Cantera { "standardState model for species isn't constant_incompressible: " + speciesNode.name()); } - m_constMolarVolume = getFloat(*ss, "molarVolume", "toSI"); + m_constMolarVolume = ctml::getFloat(*ss, "molarVolume", "toSI"); std::string id = ""; // initThermoXML(phaseNode, id); diff --git a/Cantera/src/thermo/PDSS_HKFT.cpp b/Cantera/src/thermo/PDSS_HKFT.cpp index 1ba20f27f..224c08d0a 100644 --- a/Cantera/src/thermo/PDSS_HKFT.cpp +++ b/Cantera/src/thermo/PDSS_HKFT.cpp @@ -24,6 +24,7 @@ #include using namespace std; +using namespace ctml; namespace Cantera { diff --git a/Cantera/src/thermo/PDSS_SSVol.cpp b/Cantera/src/thermo/PDSS_SSVol.cpp index 4ca9cd46f..78cd4f3e5 100644 --- a/Cantera/src/thermo/PDSS_SSVol.cpp +++ b/Cantera/src/thermo/PDSS_SSVol.cpp @@ -131,17 +131,17 @@ namespace Cantera { std::string model = (*ss)["model"]; if (model == "constant_incompressible" || model == "constant") { volumeModel_ = cSSVOLUME_CONSTANT; - m_constMolarVolume = getFloat(*ss, "molarVolume", "toSI"); + m_constMolarVolume = ctml::getFloat(*ss, "molarVolume", "toSI"); } else if (model == "temperature_polynomial") { volumeModel_ = cSSVOLUME_TPOLY; - int num = getFloatArray(*ss, TCoeff_, true, "toSI", "volumeTemperaturePolynomial"); + int num = ctml::getFloatArray(*ss, TCoeff_, true, "toSI", "volumeTemperaturePolynomial"); if (num != 4) { throw CanteraError("PDSS_SSVol::constructPDSSXML", " Didn't get 4 density polynomial numbers for species " + speciesNode.name()); } } else if (model == "density_temperature_polynomial") { volumeModel_ = cSSVOLUME_DENSITY_TPOLY; - int num = getFloatArray(*ss, TCoeff_, true, "toSI", "densityTemperaturePolynomial"); + int num = ctml::getFloatArray(*ss, TCoeff_, true, "toSI", "densityTemperaturePolynomial"); if (num != 4) { throw CanteraError("PDSS_SSVol::constructPDSSXML", " Didn't get 4 density polynomial numbers for species " + speciesNode.name()); diff --git a/Cantera/src/thermo/Phase.h b/Cantera/src/thermo/Phase.h index d6de40b1a..5163d6d42 100644 --- a/Cantera/src/thermo/Phase.h +++ b/Cantera/src/thermo/Phase.h @@ -22,7 +22,6 @@ #include "vec_functions.h" #include "ctml.h" -using namespace ctml; namespace Cantera { diff --git a/Cantera/src/thermo/PhaseCombo_Interaction.cpp b/Cantera/src/thermo/PhaseCombo_Interaction.cpp index f3ac98ab1..ae891ec49 100644 --- a/Cantera/src/thermo/PhaseCombo_Interaction.cpp +++ b/Cantera/src/thermo/PhaseCombo_Interaction.cpp @@ -1208,7 +1208,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessEnthalpy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessEnthalpy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { @@ -1224,7 +1224,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessEntropy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessEntropy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { @@ -1240,7 +1240,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Enthalpy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Enthalpy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { @@ -1256,7 +1256,7 @@ namespace Cantera { /* * Get the string containing all of the values */ - getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Entropy"); + ctml::getFloatArray(xmlChild, vParams, true, "toSI", "excessVolume_Entropy"); nParamsFound = vParams.size(); if (nParamsFound != 2) { diff --git a/Cantera/src/thermo/PhaseCombo_Interaction.h b/Cantera/src/thermo/PhaseCombo_Interaction.h index 56603aeae..59ffb72e0 100644 --- a/Cantera/src/thermo/PhaseCombo_Interaction.h +++ b/Cantera/src/thermo/PhaseCombo_Interaction.h @@ -17,8 +17,8 @@ * $Revision: 255 $ */ -#ifndef CT_LIFES_X_ONEPHASE_VPSSTP_H -#define CT_LIFES_X_ONEPHASE_VPSSTP_H +#ifndef CT_PHASECOMBO_INTERACTION_H +#define CT_PHASECOMBO_INTERACTION_H #include "GibbsExcessVPSSTP.h" diff --git a/Cantera/src/thermo/SemiconductorPhase.h b/Cantera/src/thermo/SemiconductorPhase.h index 561d7df0b..a6e121f02 100644 --- a/Cantera/src/thermo/SemiconductorPhase.h +++ b/Cantera/src/thermo/SemiconductorPhase.h @@ -70,15 +70,15 @@ namespace Cantera { virtual void setParametersFromXML(const XML_Node& eosdata) { eosdata._require("model","Semiconductor"); - doublereal rho = getFloat(eosdata, "density", "-"); + doublereal rho = ctml::getFloat(eosdata, "density", "-"); setDensity(rho); - doublereal bandgap = getFloat(eosdata, "bandgap", "-"); - doublereal e_mass = getFloat(eosdata, "electron_mass", "-"); - doublereal h_mass = getFloat(eosdata, "hole_mass", "-"); - doublereal e_donor = getFloat(eosdata, "donor_energy", "-"); - doublereal n_donor = getFloat(eosdata, "donor_concentration", "-"); - doublereal e_acceptor = getFloat(eosdata, "acceptor_energy", "-"); - doublereal n_acceptor = getFloat(eosdata, "acceptor_concentration", "-"); + doublereal bandgap = ctml::getFloat(eosdata, "bandgap", "-"); + doublereal e_mass = ctml::getFloat(eosdata, "electron_mass", "-"); + doublereal h_mass = ctml::getFloat(eosdata, "hole_mass", "-"); + doublereal e_donor = ctml::getFloat(eosdata, "donor_energy", "-"); + doublereal n_donor = ctml::getFloat(eosdata, "donor_concentration", "-"); + doublereal e_acceptor = ctml::getFloat(eosdata, "acceptor_energy", "-"); + doublereal n_acceptor = ctml::getFloat(eosdata, "acceptor_concentration", "-"); setEffectiveMasses(e_mass, h_mass); setDonorDoping(n_donor, e_donor); setAcceptorDoping(n_acceptor, e_acceptor); diff --git a/Cantera/src/thermo/StoichSubstance.cpp b/Cantera/src/thermo/StoichSubstance.cpp index 7770c149a..995333aa9 100644 --- a/Cantera/src/thermo/StoichSubstance.cpp +++ b/Cantera/src/thermo/StoichSubstance.cpp @@ -293,7 +293,7 @@ namespace Cantera { void StoichSubstance::setParametersFromXML(const XML_Node& eosdata) { eosdata._require("model","StoichSubstance"); - doublereal rho = getFloat(eosdata, "density", "toSI"); + doublereal rho = ctml::getFloat(eosdata, "density", "toSI"); setDensity(rho); } diff --git a/Cantera/src/thermo/StoichSubstanceSSTP.cpp b/Cantera/src/thermo/StoichSubstanceSSTP.cpp index 565e7cfc5..84345f861 100644 --- a/Cantera/src/thermo/StoichSubstanceSSTP.cpp +++ b/Cantera/src/thermo/StoichSubstanceSSTP.cpp @@ -434,7 +434,7 @@ namespace Cantera { "no thermo XML node"); } XML_Node &tnode = phaseNode.child("thermo"); - double dens = getFloatDefaultUnits(tnode, "density", "kg/m3"); + double dens = ctml::getFloatDefaultUnits(tnode, "density", "kg/m3"); setDensity(dens); SingleSpeciesTP::initThermoXML(phaseNode, id); } @@ -482,7 +482,7 @@ namespace Cantera { throw CanteraError("StoichSubstanceSSTP::setParametersFromXML", "thermo model attribute must be StoichSubstance"); } - doublereal rho = getFloat(eosdata, "density", "toSI"); + doublereal rho = ctml::getFloat(eosdata, "density", "toSI"); setDensity(rho); } diff --git a/Cantera/src/thermo/SurfPhase.cpp b/Cantera/src/thermo/SurfPhase.cpp index 44fea43fd..acd506062 100644 --- a/Cantera/src/thermo/SurfPhase.cpp +++ b/Cantera/src/thermo/SurfPhase.cpp @@ -23,6 +23,8 @@ #include "EdgePhase.h" #include "ThermoFactory.h" +using namespace ctml; + using namespace std; /////////////////////////////////////////////////////////// diff --git a/Cantera/src/thermo/ThermoFactory.cpp b/Cantera/src/thermo/ThermoFactory.cpp index 18454b841..a7181554c 100644 --- a/Cantera/src/thermo/ThermoFactory.cpp +++ b/Cantera/src/thermo/ThermoFactory.cpp @@ -81,6 +81,7 @@ #include using namespace std; +using namespace ctml; namespace Cantera { diff --git a/Cantera/src/thermo/ThermoPhase.cpp b/Cantera/src/thermo/ThermoPhase.cpp index 0d8a11618..0acf3a7ca 100644 --- a/Cantera/src/thermo/ThermoPhase.cpp +++ b/Cantera/src/thermo/ThermoPhase.cpp @@ -30,6 +30,7 @@ //@} using namespace std; +using namespace ctml; namespace Cantera { diff --git a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp b/Cantera/src/thermo/VPSSMgr_ConstVol.cpp index 12bc083be..1734384ca 100644 --- a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp +++ b/Cantera/src/thermo/VPSSMgr_ConstVol.cpp @@ -154,7 +154,7 @@ namespace Cantera { throw CanteraError("VPSSMgr_ConstVol::initThermoXML", "standardState model for species isn't constant_incompressible: " + s->name()); } - m_Vss[k] = getFloat(*ss, "molarVolume", "toSI"); + m_Vss[k] = ctml::getFloat(*ss, "molarVolume", "toSI"); } } @@ -181,7 +181,7 @@ namespace Cantera { if ((int) m_Vss.size() < k+1) { m_Vss.resize(k+1, 0.0); } - m_Vss[k] = getFloat(*ss, "molarVolume", "toSI"); + m_Vss[k] = ctml::getFloat(*ss, "molarVolume", "toSI"); installSTSpecies(k, speciesNode, phaseNode_ptr); diff --git a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp index 40a65a8eb..c9d803cff 100644 --- a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -249,7 +249,7 @@ namespace Cantera { "standardState model for species isn't " "constant_incompressible: " + sName); } - m_Vss[k] = getFloat(*ss, "molarVolume", "toSI"); + m_Vss[k] = ctml::getFloat(*ss, "molarVolume", "toSI"); } } @@ -300,7 +300,7 @@ namespace Cantera { if ((int) m_Vss.size() < k+1) { m_Vss.resize(k+1, 0.0); } - m_Vss[k] = getFloat(*ss, "molarVolume", "toSI"); + m_Vss[k] = ctml::getFloat(*ss, "molarVolume", "toSI"); // instantiate a new kPDSS object kPDSS = new PDSS_ConstVol(m_vptp_ptr, k, speciesNode, *phaseNode_ptr, true);