From 200cb133459e7c499cff00145ef5e344905bfb7e Mon Sep 17 00:00:00 2001
From: hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Tue, 26 Jul 2016 11:21:09 +0200
Subject: [PATCH] moved the "using" command in front of the doxygen
description, as detailed in the FS315.
---
dumux/material/fluidsystems/1p.hh | 16 ++++++-------
dumux/material/fluidsystems/2pimmiscible.hh | 23 ++++++++-----------
dumux/material/fluidsystems/brineair.hh | 14 +++++------
dumux/material/fluidsystems/brineco2.hh | 16 ++++++-------
dumux/material/fluidsystems/gasphase.hh | 14 +++++------
dumux/material/fluidsystems/h2oair.hh | 14 +++++------
.../material/fluidsystems/h2oairmesitylene.hh | 15 ++++++------
dumux/material/fluidsystems/h2oairxylene.hh | 15 ++++++------
dumux/material/fluidsystems/h2on2.hh | 17 +++++++-------
dumux/material/fluidsystems/h2on2o2.hh | 17 +++++++-------
dumux/material/fluidsystems/liquidphase.hh | 16 ++++++-------
.../material/fluidsystems/purewatersimple.hh | 17 +++++++-------
12 files changed, 93 insertions(+), 101 deletions(-)
diff --git a/dumux/material/fluidsystems/1p.hh b/dumux/material/fluidsystems/1p.hh
index 97e8b4d010..2898244434 100644
--- a/dumux/material/fluidsystems/1p.hh
+++ b/dumux/material/fluidsystems/1p.hh
@@ -224,13 +224,13 @@ public:
static void init()
{ }
+ using Base::density;
/*!
* \brief Calculate the density \f$\mathrm{[kg/m^3]}\f$ of a fluid phase
*
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
@@ -242,13 +242,13 @@ public:
return Fluid::density(temperature, pressure);
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -260,6 +260,7 @@ public:
return Fluid::viscosity(temperature, pressure);
}
+ using Base::fugacityCoefficient;
/*!
* \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
* component in a fluid phase
@@ -270,7 +271,6 @@ public:
*
* \f[ f_\kappa = \phi_\kappa * x_{\kappa} \f]
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -288,6 +288,7 @@ public:
return std::numeric_limits<Scalar>::infinity();
}
+ using Base::diffusionCoefficient;
/*!
* \brief Calculate the molecular diffusion coefficient for a
* component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
@@ -311,7 +312,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -320,6 +320,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Not applicable: Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -330,7 +331,6 @@ public:
* \param compIIdx The index of the first component to consider
* \param compJIdx The index of the second component to consider
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -341,6 +341,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Not applicable: Binary diffusion coefficients");
}
+ using Base::enthalpy;
/*!
* \brief Given a phase's composition, temperature, pressure and
* density, calculate its specific enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -348,7 +349,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -360,6 +360,7 @@ public:
return Fluid::enthalpy(temperature, pressure);
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
*
@@ -370,7 +371,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
@@ -382,6 +382,7 @@ public:
return Fluid::thermalConductivity(temperature, pressure);
}
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of a fluid phase.
* \f$\mathrm{[J/(kg*K)]}\f$.
@@ -389,7 +390,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index 700562aafb..1c6d43d18f 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -254,19 +254,16 @@ public:
assert(WettingPhase::isLiquid() || NonwettingPhase::isLiquid());
}
+ using Base::density;
/*!
- * \brief Return the density of a phase \f$mathrm{[kg/m^3]}\f$.
- *
- * \param fluidState The fluid state of the two-phase model
- * \param phaseIdx Index of the fluid phase
+ * \brief Calculate the density \f$\mathrm{[kg/m^3]}\f$ of a fluid phase
*
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
{
- assert(0 <= phaseIdx && phaseIdx < numPhases);
+ assert(0 <= phaseIdx && phaseIdx < numPhases);
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
@@ -275,12 +272,12 @@ public:
return NonwettingPhase::density(temperature, pressure);
}
+ using Base::viscosity;
/*!
* \brief Return the viscosity of a phase \f$\mathrm{[Pa*s]}\f$.
* \param fluidState The fluid state of the two-phase model
* \param phaseIdx Index of the fluid phase
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -294,6 +291,7 @@ public:
return NonwettingPhase::viscosity(temperature, pressure);
}
+ using Base::fugacityCoefficient;
/*!
* \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
* component in a fluid phase
@@ -307,7 +305,6 @@ public:
*
* \f[ f_\kappa = \phi_\kappa * x_{\kappa} \f]
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -325,6 +322,7 @@ public:
return std::numeric_limits<Scalar>::infinity();
}
+ using Base::diffusionCoefficient;
/*!
* \brief Calculate the binary molecular diffusion coefficient for
* a component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
@@ -347,7 +345,6 @@ public:
* where \f$\mathrm{p_\alpha}\f$ and \f$\mathrm{T_\alpha}\f$ are the fluid phase'
* pressure and temperature.
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -358,6 +355,7 @@ public:
" immiscibility is assumed");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -367,7 +365,6 @@ public:
* \param compIIdx index of the component i
* \param compJIdx index of the component j
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -380,12 +377,12 @@ public:
" immiscibility is assumed");
}
+ using Base::enthalpy;
/*!
* \brief Return the specific enthalpy of a fluid phase \f$\mathrm{[J/kg]}\f$.
* \param fluidState The fluid state of the two-phase model
* \param phaseIdx Index of the fluid phase
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -399,12 +396,12 @@ public:
return NonwettingPhase::enthalpy(temperature, pressure);
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
* \param fluidState The fluid state of the two-phase model
* \param phaseIdx Index of the fluid phase
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
@@ -418,6 +415,7 @@ public:
return NonwettingPhase::thermalConductivity(temperature, pressure);
}
+ using Base::heatCapacity;
/*!
* @copybrief Base::thermalConductivity
*
@@ -429,7 +427,6 @@ public:
* \param fluidState The fluid state of the two-phase model
* \param phaseIdx for which phase to give back the heat capacity
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index f97b0996ca..0a5ac5ed7c 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -352,6 +352,7 @@ public:
}
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -367,7 +368,6 @@ public:
* - cited by: Bachu & Adams (2002)
* "Equations of State for basin geofluids" \cite adams2002
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
@@ -392,6 +392,7 @@ public:
}
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
@@ -402,7 +403,6 @@ public:
* component is neglected. This contribution is probably not big, but somebody
* would have to find out its influence.
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -430,6 +430,7 @@ public:
return result;
}
+ using Base::fugacityCoefficient;
/*!
* \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of a component in a
* phase.
@@ -451,7 +452,6 @@ public:
* inverse Henry constant for the solutes and the saturated vapor pressure
* both divided by phase pressure.
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -491,6 +491,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -501,7 +502,6 @@ public:
* \param compIIdx The index of the first component to consider
* \param compJIdx The index of the second component to consider
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -548,6 +548,7 @@ public:
}
}
+ using Base::enthalpy;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return its specific enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -567,7 +568,6 @@ public:
* is neglected. This contribution is probably not big. Somebody would have to
* find out the enthalpy of solution for this system. ...
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -633,6 +633,7 @@ public:
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
* \param fluidState An abitrary fluid state
@@ -642,7 +643,6 @@ public:
* component is neglected. This contribution is probably not big, but somebody
* would have to find out its influence.
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
@@ -655,6 +655,7 @@ public:
fluidState.pressure(phaseIdx));
}
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of a fluid phase.
* \f$\mathrm{[J/(kg*K)}\f$.
@@ -665,7 +666,6 @@ public:
* description of the influence of the composition on the phase property
* has to be found.
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 9c8cbe0faf..693e60a523 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -218,6 +218,7 @@ public:
}
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -226,7 +227,6 @@ public:
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
@@ -275,6 +275,7 @@ public:
}
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
@@ -285,7 +286,6 @@ public:
* component is neglected. This contribution is probably not big, but somebody
* would have to find out its influence.
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -305,6 +305,7 @@ public:
return result;
}
+ using Base::fugacityCoefficient;
/*!
* \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of a component in a
* phase.
@@ -331,7 +332,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -423,6 +423,7 @@ public:
}
+ using Base::diffusionCoefficient;
/*!
* \brief Calculate the molecular diffusion coefficient for a
* component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
@@ -448,7 +449,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -457,6 +457,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given the phase compositions, return the binary
* diffusion coefficent \f$\mathrm{[m^2/s]}\f$ of two components in a phase.
@@ -465,7 +466,6 @@ public:
* \param compIIdx Index of the component i
* \param compJIdx Index of the component j
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -500,13 +500,13 @@ public:
}
}
+ using Base::enthalpy;
/*!
* \brief Given the phase composition, return the specific
* phase enthalpy \f$\mathrm{[J/kg]}\f$.
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -539,6 +539,7 @@ public:
}
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
* \param fluidState An arbitrary fluid state
@@ -548,7 +549,6 @@ public:
* component is neglected. This contribution is probably not big, but somebody
* would have to find out its influence.
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
@@ -563,6 +563,7 @@ public:
fluidState.pressure(phaseIdx));
}
+ using Base::heatCapacity;
/*!
* \copydoc BaseFluidSystem::heatCapacity
*
@@ -573,7 +574,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index eb9761f0b2..fbc8530357 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -168,10 +168,10 @@ public:
static Scalar density(Scalar temperature, Scalar pressure)
{ return Component::gasDensity(temperature, pressure); }
+ using Base::density;
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of the component at a given pressure and temperature.
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
const int phaseIdx)
@@ -224,10 +224,10 @@ public:
static Scalar viscosity(Scalar temperature, Scalar pressure)
{ return Component::gasViscosity(temperature, pressure); }
+ using Base::viscosity;
/*!
* \brief The dynamic liquid viscosity \f$\mathrm{[N/m^3*s]}\f$ of the pure component.
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
const int phaseIdx)
@@ -236,10 +236,10 @@ public:
fluidState.pressure(phaseIdx));
}
+ using Base::fugacityCoefficient;
/*!
* \copydoc Base::fugacityCoefficient
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -257,10 +257,10 @@ public:
return std::numeric_limits<Scalar>::infinity();
}
+ using Base::diffusionCoefficient;
/*!
* \copydoc Base::diffusionCoefficient
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -269,10 +269,10 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Not applicable: Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \copydoc Base::binaryDiffusionCoefficient
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -291,10 +291,10 @@ public:
static Scalar thermalConductivity(Scalar temperature, Scalar pressure)
{ return Component::gasThermalConductivity(temperature, pressure); }
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of the fluid \f$\mathrm{[W/(m K)]}\f$.
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
const int phaseIdx)
@@ -311,10 +311,10 @@ public:
static Scalar heatCapacity(Scalar temperature, Scalar pressure)
{ return Component::gasHeatCapacity(temperature, pressure); }
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of the fluid \f$\mathrm{[J/(kg K)]}\f$.
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
const int phaseIdx)
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 78727c0c1c..522ae6acaa 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -374,6 +374,7 @@ public:
}
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -389,7 +390,6 @@ public:
* \param fluidState the fluid state
*
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
const int phaseIdx)
@@ -440,6 +440,7 @@ public:
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
@@ -452,7 +453,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -508,6 +508,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
+ using Base::fugacityCoefficient;
/*!
* \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of a component in a
* phase.
@@ -526,7 +527,6 @@ public:
* inverse Henry constant for the solutes and the saturated vapor pressure
* both divided by phase pressure.
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -558,6 +558,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAir::diffusionCoefficient()");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -568,7 +569,6 @@ public:
* \param compIIdx The index of the first component to consider
* \param compJIdx The index of the second component to consider
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -625,6 +625,7 @@ public:
<< " in phase " << phaseIdx << " is undefined!\n");
}
+ using Base::enthalpy;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return its specific enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -642,7 +643,6 @@ public:
* \todo This system neglects the contribution of gas-molecules in the liquid phase.
* This contribution is probably not big. Somebody would have to find out the enthalpy of solution for this system. ...
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -708,6 +708,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
* \param fluidState An arbitrary fluid state
@@ -717,7 +718,6 @@ public:
* Source:
* http://en.wikipedia.org/wiki/List_of_thermal_conductivities
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
@@ -738,6 +738,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of a fluid phase.
* \f$\mathrm{[J/(kg*K)}\f$.
@@ -748,7 +749,6 @@ public:
* \param params mutable parameters
* \param phaseIdx for which phase to give back the heat capacity
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index 2f2fb417ce..d13370d5ce 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -224,6 +224,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid component index " << compIdx);
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -236,7 +237,6 @@ public:
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState, int phaseIdx)
{
@@ -276,13 +276,13 @@ public:
NAPL::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
}
+ using Base::viscosity;
/*!
* \brief Return the viscosity of a phase \f$\mathrm{[Pa s]}\f$.
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
* \todo Check the parameter phiCAW for the mesitylene case and give a physical meaningful name
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -348,6 +348,7 @@ public:
}
+ using Base::diffusionCoefficient;
/*!
* \brief Given all mole fractions, return the diffusion
* coefficent in \f$\mathrm{[m^2/s]}\f$ of a component in a phase.
@@ -355,7 +356,6 @@ public:
* \param phaseIdx The index of the phase
* \param compIdx The index of the component
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -419,6 +419,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAirMesitylene::binaryDiffusionCoefficient()");
}
+ using Base::fugacityCoefficient;
/*!
* \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of a component in a
* phase.
@@ -432,7 +433,6 @@ public:
* \param phaseIdx The index of the phase
* \param compIdx The index of the component
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -474,7 +474,7 @@ public:
return 1.0;
}
-
+ using Base::enthalpy;
/*!
* \brief Given all mole fractions in a phase, return the specific
* phase enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -484,7 +484,6 @@ public:
* \note This system neglects the contribution of gas-molecules in the liquid phase.
* This contribution is probably not big. Somebody would have to find out the enthalpy of solution for this system. ...
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -513,12 +512,12 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
+ using Base::heatCapacity;
/*!
* \brief Return the heat capacity in \f$\mathrm{[J/(kg K)]}\f$.
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
@@ -526,12 +525,12 @@ public:
DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAirMesitylene::heatCapacity()");
}
+ using Base::thermalConductivity;
/*!
* \brief Return the thermal conductivity \f$\mathrm{[W/(m K)]}\f$.
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index c8444b0c8a..31368d9fa6 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -222,6 +222,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid component index " << compIdx);
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -234,7 +235,6 @@ public:
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState, int phaseIdx)
{
@@ -274,6 +274,7 @@ public:
NAPL::gasDensity(fluidState.temperature(phaseIdx), pNAPL);
}
+ using Base::viscosity;
/*!
* \brief Return the viscosity of a phase \f$\mathrm{[Pa s]}\f$.
* \param fluidState The fluid state
@@ -281,7 +282,6 @@ public:
*
* \todo Check the parameter phiCAW for the xylene case and give a physical meaningful name
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -347,6 +347,7 @@ public:
}
+ using Base::diffusionCoefficient;
/*!
* \brief Given all mole fractions, return the diffusion
* coefficent \f$\mathrm{[m^2/s]}\f$ of a component in a phase.
@@ -354,7 +355,6 @@ public:
* \param phaseIdx The index of the phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -418,6 +418,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAirXylene::binaryDiffusionCoefficient()");
}
+ using Base::fugacityCoefficient;
/*!
* \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of a component in a
* phase.
@@ -431,7 +432,6 @@ public:
* respectively in the liquid phases it is the inverse of the
* Henry coefficients scaled by pressure
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -473,7 +473,7 @@ public:
return 1.0;
}
-
+ using Base::enthalpy;
/*!
* \brief Given all mole fractions in a phase, return the specific
* phase enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -483,7 +483,6 @@ public:
* \note This system neglects the contribution of gas-molecules in the liquid phase.
* This contribution is probably not big. Somebody would have to find out the enthalpy of solution for this system. ...
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -512,12 +511,12 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
+ using Base::heatCapacity;
/*!
* \brief Return the heat capacity in \f$\mathrm{[J/(kg K)]}\f$.
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
@@ -525,12 +524,12 @@ public:
DUNE_THROW(Dune::NotImplemented, "FluidSystems::H2OAirXylene::heatCapacity()");
}
+ using Base::thermalConductivity;
/*!
* \brief Return the thermal conductivity \f$\mathrm{[W/(m K)]}\f$.
* \param fluidState The fluid state
* \param phaseIdx The index of the phase
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index ec45271609..096d02a8d0 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -334,6 +334,7 @@ public:
}
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -346,7 +347,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
@@ -396,6 +396,7 @@ public:
return (rho_gH2O + rho_gN2) / std::max(1e-5, sumMoleFrac);
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
@@ -408,7 +409,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -458,6 +458,7 @@ public:
}
}
+ using Base::fugacityCoefficient;
/*!
* \brief Calculate the fugacity coefficient \f$\mathrm{[-]}\f$ of an individual
* component in a fluid phase
@@ -485,7 +486,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -509,7 +509,7 @@ public:
return 1.0;
}
-
+ using Base::diffusionCoefficient;
/*!
* \brief Calculate the molecular diffusion coefficient for a
* component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
@@ -533,7 +533,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -542,6 +541,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -552,7 +552,6 @@ public:
* \param compIIdx The index of the first component to consider
* \param compJIdx The index of the second component to consider
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -594,6 +593,7 @@ public:
return undefined;
}
+ using Base::enthalpy;
/*!
* \brief Given a phase's composition, temperature, pressure and
* density, calculate its specific enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -606,7 +606,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -635,6 +634,7 @@ public:
}
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
*
@@ -643,7 +643,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
const int phaseIdx)
@@ -673,6 +672,7 @@ public:
}
}
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of a fluid phase.
* \f$\mathrm{[J/(kg K)]}\f$.
@@ -680,7 +680,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index b16143dfca..40bf8dddb7 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -401,6 +401,7 @@ public:
}
}
+ using Base::density;
/*!
* \brief Given a phase's composition, temperature, pressure, and
* the partial pressures of all components, return its
@@ -413,7 +414,6 @@ public:
* \param fluidState An abitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
@@ -467,6 +467,7 @@ public:
return (rho_gH2O + rho_gN2 + rho_gO2 ) / std::max(1e-5, sumMoleFrac);
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
@@ -479,7 +480,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -530,6 +530,7 @@ public:
}
}
+ using Base::fugacityCoefficient;
/*!
* \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of a component in a
* phase.
@@ -548,7 +549,6 @@ public:
* inverse Henry constant for the solutes and the saturated vapor pressure
* both divided by phase pressure.
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -575,7 +575,7 @@ public:
return 1.0;
}
-
+ using Base::diffusionCoefficient;
/*!
* \brief Calculate the molecular diffusion coefficient for a
* component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
@@ -599,7 +599,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -608,6 +607,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -618,7 +618,6 @@ public:
* \param compIIdx The index of the first component to consider
* \param compJIdx The index of the second component to consider
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -675,6 +674,7 @@ public:
<< " in phase " << phaseIdx << " is undefined!\n");
}
+ using Base::enthalpy;
/*!
* \brief Given a phase's composition, temperature, pressure and
* density, calculate its specific enthalpy \f$\mathrm{[J/kg]}\f$.
@@ -687,7 +687,6 @@ public:
* \param fluidState An abitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -732,6 +731,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "Component enthalpies");
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
*
@@ -741,7 +741,6 @@ public:
* \param fluidState An abitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
const int phaseIdx)
@@ -774,6 +773,7 @@ public:
}
}
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of a fluid phase.
* \f$\mathrm{[J/kg*K]}\f$.
@@ -781,7 +781,6 @@ public:
* \param fluidState An abitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index b30e0acc1f..8e399084f7 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -164,10 +164,10 @@ public:
static Scalar density(Scalar temperature, Scalar pressure)
{ return Component::liquidDensity(temperature, pressure); }
+ using Base::density;
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of the component at a given pressure and temperature.
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
const int phaseIdx)
@@ -188,10 +188,10 @@ public:
static const Scalar enthalpy(Scalar temperature, Scalar pressure)
{ return Component::liquidEnthalpy(temperature, pressure); }
+ using Base::enthalpy;
/*!
* \brief Specific enthalpy \f$\mathrm{[J/kg]}\f$ the pure component as a liquid.
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
const int phaseIdx)
@@ -212,10 +212,10 @@ public:
static Scalar viscosity(Scalar temperature, Scalar pressure)
{ return Component::liquidViscosity(temperature, pressure); }
+ using Base::viscosity;
/*!
* \brief The dynamic liquid viscosity \f$\mathrm{[N/m^3*s]}\f$ of the pure component.
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
const int phaseIdx)
@@ -224,10 +224,10 @@ public:
fluidState.pressure(phaseIdx));
}
+ using Base::fugacityCoefficient;
/*!
* \copydoc Base::fugacityCoefficient
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -245,10 +245,10 @@ public:
return std::numeric_limits<Scalar>::infinity();
}
+ using Base::diffusionCoefficient;
/*!
* \copydoc Base::diffusionCoefficient
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -257,10 +257,10 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Not applicable: Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \copydoc Base::binaryDiffusionCoefficient
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -277,10 +277,10 @@ public:
static Scalar thermalConductivity(Scalar temperature, Scalar pressure)
{ return Component::liquidThermalConductivity(temperature, pressure); }
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of the fluid \f$\mathrm{[W/(m K)]}\f$.
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
const int phaseIdx)
@@ -295,10 +295,10 @@ public:
static Scalar heatCapacity(Scalar temperature, Scalar pressure)
{ return Component::liquidHeatCapacity(temperature, pressure); }
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of the fluid \f$\mathrm{[J/(kg K)]}\f$.
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
const int phaseIdx)
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh
index b2a9f3d4e8..f60089298c 100644
--- a/dumux/material/fluidsystems/purewatersimple.hh
+++ b/dumux/material/fluidsystems/purewatersimple.hh
@@ -320,13 +320,13 @@ public:
std::cout << "Using very simple pure water fluid system\n";
}
+ using Base::density;
/*!
* \brief Calculate the density \f$\mathrm{[kg/m^3]}\f$ of a fluid phase
*
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
int phaseIdx)
@@ -345,13 +345,13 @@ public:
else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
+ using Base::viscosity;
/*!
* \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$
*
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::viscosity;
template <class FluidState>
static Scalar viscosity(const FluidState &fluidState,
int phaseIdx)
@@ -386,6 +386,7 @@ public:
return IAPWS::Region4<Scalar>::vaporTemperature( pressure );
}
+ using Base::fugacityCoefficient;
/*!
* \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
* component in a fluid phase
@@ -413,7 +414,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::fugacityCoefficient;
template <class FluidState>
static Scalar fugacityCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -438,7 +438,7 @@ public:
return 1.0;
}
-
+ using Base::diffusionCoefficient;
/*!
* \brief Calculate the molecular diffusion coefficient for a
* component in a fluid phase \f$\mathrm{[mol^2 * s / (kg*m^3)]}\f$
@@ -447,7 +447,6 @@ public:
* \param phaseIdx The index of the fluid phase to consider
* \param compIdx The index of the component to consider
*/
- using Base::diffusionCoefficient;
template <class FluidState>
static Scalar diffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -456,6 +455,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "Diffusion coefficients");
}
+ using Base::binaryDiffusionCoefficient;
/*!
* \brief Given a phase's composition, temperature and pressure,
* return the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for components
@@ -466,7 +466,6 @@ public:
* \param compIIdx The index of the first component to consider
* \param compJIdx The index of the second component to consider
*/
- using Base::binaryDiffusionCoefficient;
template <class FluidState>
static Scalar binaryDiffusionCoefficient(const FluidState &fluidState,
int phaseIdx,
@@ -477,13 +476,13 @@ public:
DUNE_THROW(Dune::NotImplemented, "Binary Diffusion coefficients");
}
+ using Base::enthalpy;
/*!
* \brief Calculate specific enthalpy \f$\mathrm{[J/kg]}\f$.
*
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::enthalpy;
template <class FluidState>
static Scalar enthalpy(const FluidState &fluidState,
int phaseIdx)
@@ -505,6 +504,7 @@ public:
else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
+ using Base::thermalConductivity;
/*!
* \brief Thermal conductivity of a fluid phase \f$\mathrm{[W/(m K)]}\f$.
*
@@ -513,7 +513,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::thermalConductivity;
template <class FluidState>
static Scalar thermalConductivity(const FluidState &fluidState,
const int phaseIdx)
@@ -531,6 +530,7 @@ public:
else DUNE_THROW(Dune::NotImplemented, "Wrong phase index");
}
+ using Base::heatCapacity;
/*!
* \brief Specific isobaric heat capacity of a fluid phase.
* \f$\mathrm{[J/kg / K]}\f$.
@@ -538,7 +538,6 @@ public:
* \param fluidState An arbitrary fluid state
* \param phaseIdx The index of the fluid phase to consider
*/
- using Base::heatCapacity;
template <class FluidState>
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
--
GitLab