Commit 688f03e8 authored by Lukas Riedel's avatar Lukas Riedel

Small changes to new parameterization

* Make parameters public
* Reorder initialization
* Explicit destructor override
parent aa0bb01d
......@@ -134,10 +134,10 @@ public:
(
theta_r,
theta_s,
k0,
alpha,
tau,
n,
k0
n
);
// insert parameters into map
......
......@@ -48,6 +48,10 @@ public:
inline static const std::string name = "tau";
};
Alpha _alpha;
Tau _tau;
N _n;
protected:
inline static std::function<Conductivity(const Saturation,
......@@ -82,18 +86,14 @@ protected:
};
};
Alpha _alpha;
Tau _tau;
N _n;
public:
MualemVanGenuchtenParameterization (
const ResidualWaterContent theta_r,
const SaturatedWaterContent theta_s,
const SaturatedConductivity k0,
const Alpha alpha,
const Tau tau,
const N n,
const SaturatedConductivity k0
const N n
):
RichardsParameterization<Traits>(theta_r, theta_s, k0),
_alpha(alpha),
......@@ -101,6 +101,9 @@ public:
_n(n)
{ }
/// Add default destructor to clarify override
~MualemVanGenuchtenParameterization () override = default;
std::function<Conductivity(const Saturation)> conductivity_f () const
override
{
......
......@@ -61,12 +61,11 @@ public:
inline static const std::string name = "theta_s";
};
protected:
ResidualWaterContent _theta_r;
SaturatedWaterContent _theta_s;
SaturatedConductivity _k0;
protected:
/// Functional relation for Saturation depending on water content
/** \param WaterContent Volumetric water content
* \return Saturation
......
Markdown is supported
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