[Thermo] Remove unimplemented overrides of getParameters/setParameters
This commit is contained in:
parent
675df76b1c
commit
08e9d94ad6
8 changed files with 0 additions and 188 deletions
|
|
@ -1029,46 +1029,6 @@ public:
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
//! Set the equation of state parameters
|
|
||||||
/*!
|
|
||||||
* @internal
|
|
||||||
* The number and meaning of these depends on the subclass.
|
|
||||||
*
|
|
||||||
* @param n number of parameters
|
|
||||||
* @param c array of \a n coefficients
|
|
||||||
*/
|
|
||||||
virtual void setParameters(int n, doublereal* const c);
|
|
||||||
|
|
||||||
//! Get the equation of state parameters in a vector
|
|
||||||
/*!
|
|
||||||
* @internal
|
|
||||||
* The number and meaning of these depends on the subclass.
|
|
||||||
*
|
|
||||||
* @param n number of parameters
|
|
||||||
* @param c array of \a n coefficients
|
|
||||||
*/
|
|
||||||
virtual void getParameters(int& n, doublereal* const c) const;
|
|
||||||
|
|
||||||
//! Set equation of state parameter values from XML entries.
|
|
||||||
/*!
|
|
||||||
*
|
|
||||||
* This method is called by function importPhase() in
|
|
||||||
* file importCTML.cpp when processing a phase definition in
|
|
||||||
* an input file. It should be overloaded in subclasses to set
|
|
||||||
* any parameters that are specific to that particular phase
|
|
||||||
* model. Note, this method is called before the phase is
|
|
||||||
* initialized with elements and/or species.
|
|
||||||
*
|
|
||||||
* HKM -> Right now, the parameters are set elsewhere (initThermoXML)
|
|
||||||
* It just didn't seem to fit.
|
|
||||||
*
|
|
||||||
* @param eosdata An XML_Node object corresponding to
|
|
||||||
* the "thermo" entry for this phase in the input file.
|
|
||||||
*/
|
|
||||||
virtual void setParametersFromXML(const XML_Node& eosdata);
|
|
||||||
|
|
||||||
//@}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* -------------- Utilities -------------------------------
|
* -------------- Utilities -------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1858,43 +1858,6 @@ public:
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
//! Set the equation of state parameters
|
|
||||||
/*!
|
|
||||||
* @internal
|
|
||||||
* The number and meaning of these depends on the subclass.
|
|
||||||
*
|
|
||||||
* @param n number of parameters
|
|
||||||
* @param c array of \a n coefficients
|
|
||||||
*/
|
|
||||||
virtual void setParameters(int n, doublereal* const c);
|
|
||||||
|
|
||||||
//! Get the equation of state parameters in a vector
|
|
||||||
/*!
|
|
||||||
* @internal
|
|
||||||
* The number and meaning of these depends on the subclass.
|
|
||||||
*
|
|
||||||
* @param n number of parameters
|
|
||||||
* @param c array of \a n coefficients
|
|
||||||
*/
|
|
||||||
virtual void getParameters(int& n, doublereal* const c) const;
|
|
||||||
|
|
||||||
//! Set equation of state parameter values from XML
|
|
||||||
//! entries.
|
|
||||||
/*!
|
|
||||||
* This method is called by function importPhase in
|
|
||||||
* file importCTML.cpp when processing a phase definition in
|
|
||||||
* an input file. It should be overloaded in subclasses to set
|
|
||||||
* any parameters that are specific to that particular phase
|
|
||||||
* model.
|
|
||||||
*
|
|
||||||
* HKM -> Right now, the parameters are set elsewhere (initThermoXML)
|
|
||||||
* It just didn't seem to fit.
|
|
||||||
*
|
|
||||||
* @param eosdata An XML_Node object corresponding to
|
|
||||||
* the "thermo" entry for this phase in the input file.
|
|
||||||
*/
|
|
||||||
virtual void setParametersFromXML(const XML_Node& eosdata);
|
|
||||||
|
|
||||||
//! Get the saturation pressure for a given temperature.
|
//! Get the saturation pressure for a given temperature.
|
||||||
/*!
|
/*!
|
||||||
* Note the limitations of this function. Stability considerations
|
* Note the limitations of this function. Stability considerations
|
||||||
|
|
|
||||||
|
|
@ -579,41 +579,6 @@ public:
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
/**
|
|
||||||
* @internal
|
|
||||||
* Set equation of state parameters. The number and meaning of
|
|
||||||
* these depends on the subclass.
|
|
||||||
* @param n number of parameters
|
|
||||||
* @param c array of <I>n</I> coefficients
|
|
||||||
*/
|
|
||||||
virtual void setParameters(int n, doublereal* const c);
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* @internal
|
|
||||||
* Get the parameters used to initialize the phase.
|
|
||||||
*
|
|
||||||
* @param n number of parameters (output)
|
|
||||||
* @param c array of <I>n</I> coefficients
|
|
||||||
*/
|
|
||||||
virtual void getParameters(int& n, doublereal* const c) const;
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Set equation of state parameter values from XML
|
|
||||||
* entries. This method is called by function importPhase in
|
|
||||||
* file importCTML.cpp when processing a phase definition in
|
|
||||||
* an input file. It should be overloaded in subclasses to set
|
|
||||||
* any parameters that are specific to that particular phase
|
|
||||||
* model.
|
|
||||||
*
|
|
||||||
* HKM -> Right now, the parameters are set elsewhere (initThermo)
|
|
||||||
* It just didn't seem to fit.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* @param eosdata An XML_Node object corresponding to
|
|
||||||
* the "thermo" entry for this phase in the input file.
|
|
||||||
*/
|
|
||||||
virtual void setParametersFromXML(const XML_Node& eosdata);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* -------------- Utilities -------------------------------
|
* -------------- Utilities -------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -451,33 +451,6 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void setState_SV(doublereal s, doublereal v,
|
virtual void setState_SV(doublereal s, doublereal v,
|
||||||
doublereal tol = 1.e-8);
|
doublereal tol = 1.e-8);
|
||||||
|
|
||||||
/**
|
|
||||||
* @internal
|
|
||||||
* Set equation of state parameters. The number and meaning of
|
|
||||||
* these depends on the subclass.
|
|
||||||
* @param n number of parameters
|
|
||||||
* @param c array of n coefficients
|
|
||||||
*/
|
|
||||||
virtual void setParameters(int n, doublereal* const c) {
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void getParameters(int& n, doublereal* const c) const {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set equation of state parameter values from XML
|
|
||||||
* entries. This method is called by function importPhase in
|
|
||||||
* file importCTML.cpp when processing a phase definition in
|
|
||||||
* an input file. It should be overloaded in subclasses to set
|
|
||||||
* any parameters that are specific to that particular phase
|
|
||||||
* model.
|
|
||||||
*
|
|
||||||
* @param eosdata An XML_Node object corresponding to
|
|
||||||
* the "thermo" entry for this phase in the input file.
|
|
||||||
*/
|
|
||||||
virtual void setParametersFromXML(const XML_Node& eosdata) {}
|
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -470,19 +470,6 @@ public:
|
||||||
*/
|
*/
|
||||||
//@{
|
//@{
|
||||||
|
|
||||||
/**
|
|
||||||
* Set equation of state parameter values from XML
|
|
||||||
* entries. This method is called by function importPhase in
|
|
||||||
* file importCTML.cpp when processing a phase definition in
|
|
||||||
* an input file. It should be overloaded in subclasses to set
|
|
||||||
* any parameters that are specific to that particular phase
|
|
||||||
* model.
|
|
||||||
*
|
|
||||||
* @param eosdata An XML_Node object corresponding to
|
|
||||||
* the "thermo" entry for this phase in the input file.
|
|
||||||
*/
|
|
||||||
virtual void setParametersFromXML(const XML_Node& eosdata) {}
|
|
||||||
|
|
||||||
virtual void initThermo();
|
virtual void initThermo();
|
||||||
|
|
||||||
//! Initialize a ThermoPhase object, potentially reading activity
|
//! Initialize a ThermoPhase object, potentially reading activity
|
||||||
|
|
|
||||||
|
|
@ -1085,18 +1085,6 @@ void DebyeHuckel::initThermoXML(XML_Node& phaseNode, const std::string& id_)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DebyeHuckel::setParameters(int n, doublereal* const c)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void DebyeHuckel::getParameters(int& n, doublereal* const c) const
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void DebyeHuckel::setParametersFromXML(const XML_Node& eosdata)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
double DebyeHuckel::A_Debye_TP(double tempArg, double presArg) const
|
double DebyeHuckel::A_Debye_TP(double tempArg, double presArg) const
|
||||||
{
|
{
|
||||||
double T = temperature();
|
double T = temperature();
|
||||||
|
|
|
||||||
|
|
@ -983,18 +983,6 @@ void HMWSoln::getPartialMolarCp(doublereal* cpbar) const
|
||||||
* -------------- Utilities -------------------------------
|
* -------------- Utilities -------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void HMWSoln::setParameters(int n, doublereal* const c)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HMWSoln::getParameters(int& n, doublereal* const c) const
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void HMWSoln::setParametersFromXML(const XML_Node& eosdata)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
doublereal HMWSoln::satPressure(doublereal t) {
|
doublereal HMWSoln::satPressure(doublereal t) {
|
||||||
double p_old = pressure();
|
double p_old = pressure();
|
||||||
double t_old = temperature();
|
double t_old = temperature();
|
||||||
|
|
|
||||||
|
|
@ -662,18 +662,6 @@ void IdealMolalSoln::initThermoXML(XML_Node& phaseNode, const std::string& id_)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void IdealMolalSoln::setParameters(int n, doublereal* const c)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void IdealMolalSoln::getParameters(int& n, doublereal* const c) const
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void IdealMolalSoln::setParametersFromXML(const XML_Node& eosdata)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ------------ Private and Restricted Functions ------------------
|
* ------------ Private and Restricted Functions ------------------
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue