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

Made constructPhaseFile() and constructPhaseXML() non-virtual.

Browse source 
They are called from the constructor, and it generally is a
tricky situation when virtual functions are called from constructors.
This commit is contained in:
Harry Moffat 2007-06-12 17:33:19 +00:00
parent 457a03317a
commit 440c74236c
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cantera/src/thermo/DebyeHuckel.h
View file

@ -1476,7 +1476,7 @@ namespace Cantera {
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void constructPhaseFile(std::string infile, std::string id="");
void constructPhaseFile(std::string infile, std::string id="");
//! Import and initialize a DebyeHuckel phase
//! specification in an XML tree into the current object.
@ -1503,7 +1503,7 @@ namespace Cantera {
* to see if phaseNode is pointing to the phase
* with the correct id.
*/
virtual void constructPhaseXML(XML_Node& phaseNode, std::string id="");
void constructPhaseXML(XML_Node& phaseNode, std::string id="");
//! Process the XML file after species are set up.
/*!

2
Cantera/src/thermo/HMWSoln.cpp
View file

@ -1419,7 +1419,7 @@ namespace Cantera {
void HMWSoln::setParametersFromXML(const XML_Node& eosdata) {
}
/**
/*
* Get the saturation pressure for a given temperature.
* Note the limitations of this function. Stability considerations
* concernting multiphase equilibrium are ignored in this

8
Cantera/src/thermo/HMWSoln.h
View file

@ -1448,7 +1448,7 @@ namespace Cantera {
SpeciesThermo& speciesThermo() { return *m_spthermo; }
/*
* constructPhaseFile() (virtual from HMWSoln)
* constructPhaseFile()
*
* Import, construct, and initialize a HMWSoln phase
* specification from an XML tree into the current object.
@ -1456,10 +1456,10 @@ namespace Cantera {
* This routine is a precursor to constructPhaseXML(XML_Node*)
* routine, which does most of the work.
*/
virtual void constructPhaseFile(std::string inputFile, std::string id);
void constructPhaseFile(std::string inputFile, std::string id);
/*
* constructPhaseXML (virtual from HMWSoln)
* constructPhaseXML
*
* This is the main routine for constructing the phase.
*
@ -1472,7 +1472,7 @@ namespace Cantera {
* particular to the specification of the activity
* coefficient model for the Pitzer parameterization.
*/
virtual void constructPhaseXML(XML_Node& phaseNode, std::string id);
void constructPhaseXML(XML_Node& phaseNode, std::string id);
/**
* @internal Initialize. This method is provided to allow

4
Cantera/src/thermo/IdealMolalSoln.h
View file

@ -926,7 +926,7 @@ namespace Cantera {
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void constructPhaseFile(std::string infile, std::string id="");
void constructPhaseFile(std::string infile, std::string id="");
//! Import and initialize an IdealMolalSoln phase
//! specification in an XML tree into the current object.
@ -958,7 +958,7 @@ namespace Cantera {
* to see if phaseNode is pointing to the phase
* with the correct id.
*/
virtual void constructPhaseXML(XML_Node& phaseNode, std::string id);
void constructPhaseXML(XML_Node& phaseNode, std::string id);
//! Import and initialize an IdealMolalSoln phase
//! specification in an XML tree into the current object.

4
Cantera/src/thermo/IdealSolidSolnPhase.h
View file

@ -918,7 +918,7 @@ namespace Cantera {
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void constructPhaseFile(std::string infile, std::string id="");
void constructPhaseFile(std::string infile, std::string id="");
/**
* Import and initialize an IdealSolidSolnPhase phase
@ -945,7 +945,7 @@ namespace Cantera {
* to see if phaseNode is pointing to the phase
* with the correct id.
*/
virtual void constructPhaseXML(XML_Node& phaseNode, std::string id="");
void constructPhaseXML(XML_Node& phaseNode, std::string id="");
/**
* Initialization of an IdealSolidSolnPhase phase:

6
Cantera/src/thermo/WaterSSTP.h
View file

@ -370,7 +370,7 @@ namespace Cantera {
virtual void setTemperature(double temp);
virtual void constructPhase();
void constructPhase();
//! Initialization of a pure water phase using an
@ -385,7 +385,7 @@ namespace Cantera {
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void constructPhaseFile(std::string inputFile, std::string id);
void constructPhaseFile(std::string inputFile, std::string id);
//! Initialization of a pure water phase using an xml file.
@ -399,7 +399,7 @@ namespace Cantera {
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void constructPhaseXML(XML_Node& phaseNode, std::string id);
void constructPhaseXML(XML_Node& phaseNode, std::string id);
//!Import and initialize a ThermoPhase object using an XML tree.
/*!