Resolved issues with virtual function inheritance and warning from clang
Also removed __GNUC__ conditional compilation statements which are no longer needed.
This commit is contained in:
@ -799,6 +799,60 @@ Foam::heThermo<BasicThermo, MixtureType>::alphaEff
|
||||
}
|
||||
|
||||
|
||||
template<class BasicThermo, class MixtureType>
|
||||
Foam::scalar
|
||||
Foam::heThermo<BasicThermo, MixtureType>::Cp
|
||||
(
|
||||
const label speciei,
|
||||
const scalar p,
|
||||
const scalar T
|
||||
) const
|
||||
{
|
||||
notImplemented
|
||||
(
|
||||
"heThermo<BasicThermo, MixtureType>::"
|
||||
"Cp(const label speciei, const scalar p, const scalar T)"
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
template<class BasicThermo, class MixtureType>
|
||||
Foam::scalar
|
||||
Foam::heThermo<BasicThermo, MixtureType>::Cv
|
||||
(
|
||||
const label speciei,
|
||||
const scalar p,
|
||||
const scalar T
|
||||
) const
|
||||
{
|
||||
notImplemented
|
||||
(
|
||||
"heThermo<BasicThermo, MixtureType>::"
|
||||
"Cv(const label speciei, const scalar p, const scalar T)"
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
template<class BasicThermo, class MixtureType>
|
||||
Foam::scalar
|
||||
Foam::heThermo<BasicThermo, MixtureType>::kappa
|
||||
(
|
||||
const label speciei,
|
||||
const scalar p,
|
||||
const scalar T
|
||||
) const
|
||||
{
|
||||
notImplemented
|
||||
(
|
||||
"heThermo<BasicThermo, MixtureType>::"
|
||||
"kappa(const label speciei, const scalar p, const scalar T)"
|
||||
);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
template<class BasicThermo, class MixtureType>
|
||||
bool Foam::heThermo<BasicThermo, MixtureType>::read()
|
||||
{
|
||||
|
||||
@ -292,6 +292,34 @@ public:
|
||||
) const;
|
||||
|
||||
|
||||
// Dummy per-specie thermo properties to avoid problems
|
||||
// with virtual function inheritance
|
||||
|
||||
//- Heat capacity at constant pressure [J/(kg K)]
|
||||
virtual scalar Cp
|
||||
(
|
||||
const label speciei,
|
||||
const scalar p,
|
||||
const scalar T
|
||||
) const;
|
||||
|
||||
//- Heat capacity at constant volume [J/(kg K)]
|
||||
virtual scalar Cv
|
||||
(
|
||||
const label speciei,
|
||||
const scalar p,
|
||||
const scalar T
|
||||
) const;
|
||||
|
||||
//- Thermal conductivity [W/m/K]
|
||||
virtual scalar kappa
|
||||
(
|
||||
const label speciei,
|
||||
const scalar p,
|
||||
const scalar T
|
||||
) const;
|
||||
|
||||
|
||||
//- Read thermophysical properties dictionary
|
||||
virtual bool read();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user