Commit 9063491c authored by Timo Koch's avatar Timo Koch
Browse files

[cleanup][common][dimless] Fix indent

parent 0b2f862a
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
namespace Dumux { namespace Dumux {
/*! /*!
* \brief A container for possible values of the property for selecting which nusselt parametrization to choose. * \brief A container for possible values of the property for selecting which Nusselt parametrization to choose.
* The actual value is set vie the property NusseltFormulation * The actual value is set vie the property NusseltFormulation
*/ */
enum class NusseltFormulation enum class NusseltFormulation
...@@ -45,7 +45,7 @@ enum class NusseltFormulation ...@@ -45,7 +45,7 @@ enum class NusseltFormulation
}; };
/*! /*!
* \brief A container for possible values of the property for selecting which sherwood parametrization to choose. * \brief A container for possible values of the property for selecting which Sherwood parametrization to choose.
* The actual value is set vie the property SherwoodFormulation * The actual value is set vie the property SherwoodFormulation
*/ */
enum class SherwoodFormulation enum class SherwoodFormulation
...@@ -65,7 +65,7 @@ class DimensionlessNumbers ...@@ -65,7 +65,7 @@ class DimensionlessNumbers
{ {
public: public:
/*! /*!
* \brief Calculate the Reynolds Number [-] (Re). * \brief Calculate the Reynolds Number [-] (Re).
* *
* The Reynolds number is a measure for the relation of inertial to viscous forces. * The Reynolds number is a measure for the relation of inertial to viscous forces.
...@@ -85,14 +85,14 @@ public: ...@@ -85,14 +85,14 @@ public:
* *
* \return The Reynolds Number as calculated from the input parameters * \return The Reynolds Number as calculated from the input parameters
*/ */
static Scalar reynoldsNumber(const Scalar darcyMagVelocity, static Scalar reynoldsNumber(const Scalar darcyMagVelocity,
const Scalar charcteristicLength, const Scalar charcteristicLength,
const Scalar kinematicViscosity) const Scalar kinematicViscosity)
{ {
return darcyMagVelocity * charcteristicLength / kinematicViscosity ; return darcyMagVelocity * charcteristicLength / kinematicViscosity ;
} }
/*! /*!
* \brief Calculate the Prandtl Number [-] (Pr). * \brief Calculate the Prandtl Number [-] (Pr).
* *
* The Prandtl Number is a measure for the relation of viscosity and thermal diffusivity (temperaturleitfaehigkeit). * The Prandtl Number is a measure for the relation of viscosity and thermal diffusivity (temperaturleitfaehigkeit).
...@@ -115,14 +115,14 @@ static Scalar reynoldsNumber(const Scalar darcyMagVelocity, ...@@ -115,14 +115,14 @@ static Scalar reynoldsNumber(const Scalar darcyMagVelocity,
* \param thermalConductivity Conductivity to heat. Specifies how well matter transfers energy without moving. [W/(m K)] * \param thermalConductivity Conductivity to heat. Specifies how well matter transfers energy without moving. [W/(m K)]
* \return The Prandtl Number as calculated from the input parameters. * \return The Prandtl Number as calculated from the input parameters.
*/ */
static Scalar prandtlNumber(const Scalar dynamicViscosity, static Scalar prandtlNumber(const Scalar dynamicViscosity,
const Scalar heatCapacity, const Scalar heatCapacity,
const Scalar thermalConductivity) const Scalar thermalConductivity)
{ {
return dynamicViscosity * heatCapacity / thermalConductivity; return dynamicViscosity * heatCapacity / thermalConductivity;
} }
/*! /*!
* \brief Calculate the Nusselt Number [-] (Nu). * \brief Calculate the Nusselt Number [-] (Nu).
* *
* The Nusselt Number is a measure for the relation of convective- to conductive heat exchange. * The Nusselt Number is a measure for the relation of convective- to conductive heat exchange.
...@@ -148,11 +148,11 @@ static Scalar prandtlNumber(const Scalar dynamicViscosity, ...@@ -148,11 +148,11 @@ static Scalar prandtlNumber(const Scalar dynamicViscosity,
* Set via the property NusseltFormulation. * Set via the property NusseltFormulation.
* \return The Nusselt number as calculated from the input parameters [-]. * \return The Nusselt number as calculated from the input parameters [-].
*/ */
static Scalar nusseltNumberForced(const Scalar reynoldsNumber, static Scalar nusseltNumberForced(const Scalar reynoldsNumber,
const Scalar prandtlNumber, const Scalar prandtlNumber,
const Scalar porosity, const Scalar porosity,
NusseltFormulation formulation) NusseltFormulation formulation)
{ {
if (formulation == NusseltFormulation::dittusBoelter){ if (formulation == NusseltFormulation::dittusBoelter){
/* example: very common and simple case: flow straight circular pipe, only convection (no boiling), /* example: very common and simple case: flow straight circular pipe, only convection (no boiling),
* 10000<Re<120000, 0.7<Pr<120, far from pipe entrance, smooth surface of pipe ... * 10000<Re<120000, 0.7<Pr<120, far from pipe entrance, smooth surface of pipe ...
...@@ -197,10 +197,10 @@ static Scalar nusseltNumberForced(const Scalar reynoldsNumber, ...@@ -197,10 +197,10 @@ static Scalar nusseltNumberForced(const Scalar reynoldsNumber,
else { else {
DUNE_THROW(Dune::NotImplemented, "wrong index"); DUNE_THROW(Dune::NotImplemented, "wrong index");
} }
} }
/*! /*!
* \brief Calculate the Schmidt Number [-] (Sc). * \brief Calculate the Schmidt Number [-] (Sc).
* *
* The Schmidt Number is a measure for the relation of viscosity and mass diffusivity. * The Schmidt Number is a measure for the relation of viscosity and mass diffusivity.
...@@ -221,14 +221,14 @@ static Scalar nusseltNumberForced(const Scalar reynoldsNumber, ...@@ -221,14 +221,14 @@ static Scalar nusseltNumberForced(const Scalar reynoldsNumber,
* \param diffusionCoefficient Measure for how well a component can move through a phase due to a concentration gradient. [m^2/s] * \param diffusionCoefficient Measure for how well a component can move through a phase due to a concentration gradient. [m^2/s]
* \return The Schmidt Number as calculated from the input parameters. * \return The Schmidt Number as calculated from the input parameters.
*/ */
static Scalar schmidtNumber(const Scalar dynamicViscosity, static Scalar schmidtNumber(const Scalar dynamicViscosity,
const Scalar massDensity, const Scalar massDensity,
const Scalar diffusionCoefficient) const Scalar diffusionCoefficient)
{ {
return dynamicViscosity / (massDensity * diffusionCoefficient); return dynamicViscosity / (massDensity * diffusionCoefficient);
} }
/*! /*!
* \brief Calculate the Sherwood Number [-] (Sh). * \brief Calculate the Sherwood Number [-] (Sh).
* *
* The Sherwood Number is a measure for the relation of convective- to diffusive mass exchange. * The Sherwood Number is a measure for the relation of convective- to diffusive mass exchange.
...@@ -257,10 +257,10 @@ static Scalar schmidtNumber(const Scalar dynamicViscosity, ...@@ -257,10 +257,10 @@ static Scalar schmidtNumber(const Scalar dynamicViscosity,
* \return The Nusselt number as calculated from the input parameters [-]. * \return The Nusselt number as calculated from the input parameters [-].
*/ */
static Scalar sherwoodNumber(const Scalar reynoldsNumber, static Scalar sherwoodNumber(const Scalar reynoldsNumber,
const Scalar schmidtNumber, const Scalar schmidtNumber,
SherwoodFormulation formulation) SherwoodFormulation formulation)
{ {
if (formulation == SherwoodFormulation::WakaoKaguei){ if (formulation == SherwoodFormulation::WakaoKaguei){
/* example: flow through porous medium *single phase* /* example: flow through porous medium *single phase*
* Wakao and Kaguei, Heat and mass Transfer in Packed Beds, Gordon and Breach Science Publishers, page 156 * Wakao and Kaguei, Heat and mass Transfer in Packed Beds, Gordon and Breach Science Publishers, page 156
...@@ -273,10 +273,10 @@ static Scalar sherwoodNumber(const Scalar reynoldsNumber, ...@@ -273,10 +273,10 @@ static Scalar sherwoodNumber(const Scalar reynoldsNumber,
else { else {
DUNE_THROW(Dune::NotImplemented, "wrong index"); DUNE_THROW(Dune::NotImplemented, "wrong index");
} }
} }
/*! /*!
* \brief Calculate the thermal diffusivity alpha [m^2/s]. * \brief Calculate the thermal diffusivity alpha [m^2/s].
* *
* The thermal diffusivity is a measure for how fast "temperature (not heat!) spreads". * The thermal diffusivity is a measure for how fast "temperature (not heat!) spreads".
...@@ -291,14 +291,14 @@ static Scalar sherwoodNumber(const Scalar reynoldsNumber, ...@@ -291,14 +291,14 @@ static Scalar sherwoodNumber(const Scalar reynoldsNumber,
* \param heatCapacity A measure for how a much a material changes temperature for a given change of energy (at p=const.) [J/(kgm^3)]. * \param heatCapacity A measure for how a much a material changes temperature for a given change of energy (at p=const.) [J/(kgm^3)].
* \return The thermal diffusivity as calculated from the input parameters [m^2/s]. * \return The thermal diffusivity as calculated from the input parameters [m^2/s].
*/ */
static Scalar thermalDiffusivity(const Scalar & thermalConductivity , static Scalar thermalDiffusivity(const Scalar & thermalConductivity ,
const Scalar & phaseDensity , const Scalar & phaseDensity ,
const Scalar & heatCapacity) const Scalar & heatCapacity)
{ {
return thermalConductivity / (phaseDensity * heatCapacity); return thermalConductivity / (phaseDensity * heatCapacity);
} }
}; // end class DimensionlessNumbers };
} // end namespace Dumux } // end namespace Dumux
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment