Commit 211c1254 authored by Hannes Bauser's avatar Hannes Bauser

renamed ExtendedMillerScaling to MilPorScaling

parent 98aa231f
......@@ -204,7 +204,7 @@ public:
/** For the Description of Miller scaling, see MillerScalingAdapter.
* In addition the porosity is scaled through an additive scaling \f$ \xi_theta \f$:
* \f$ Saturation = (\theta - \theta_r) (\theta_s - \xi_\theta - \theta_r) \f$
* The extended scaling violates the geometric similarity assumption of Miller scaling.
* The MilPor scaling violates the geometric similarity assumption of Miller scaling.
* The choice of - \xi_\theta (instead of + \xi_\theta ) is,
* that a smaller Material (Miller scaling factor <1) has a larger porosity.
*
......@@ -213,7 +213,7 @@ public:
* \date 2018
*/
template<typename Traits>
class ExtendedMillerScalingAdapter : public ScalingAdapter<Traits>
class MilPorScalingAdapter : public ScalingAdapter<Traits>
{
private:
using Base = ScalingAdapter<Traits>;
......@@ -222,7 +222,7 @@ private:
public:
/// Create this adapter and the internal interpolator.
explicit ExtendedMillerScalingAdapter (
explicit MilPorScalingAdapter (
const YAML::Node& scale_data_cfg,
//const YAML::Node& porosity_scale_data_cfg,
const std::shared_ptr<spdlog::logger> log
......@@ -234,7 +234,7 @@ public:
}
/// Export type of this scaling adapter
static inline std::string type = "ExtendedMiller";
static inline std::string type = "MilPor";
/// Evaluate this interpolator
return_t evaluate (const Domain& pos) const override
......@@ -245,7 +245,7 @@ public:
}
/// Delete this adapter
~ExtendedMillerScalingAdapter () override = default;
~MilPorScalingAdapter () override = default;
};
/// A ScalingAdapter that does not implement any scaling.
......@@ -321,8 +321,8 @@ public:
if (type == MillerScalingAdapter<Traits>::type) {
return std::make_shared<MillerScalingAdapter<Traits>>(config, log);
}
else if (type == ExtendedMillerScalingAdapter<Traits>::type) {
return std::make_shared<ExtendedMillerScalingAdapter<Traits>>(config, log);
else if (type == MilPorScalingAdapter<Traits>::type) {
return std::make_shared<MilPorScalingAdapter<Traits>>(config, log);
}
else if (to_lower(type) == DummyScalingAdapter<Traits>::type) {
return std::make_shared<DummyScalingAdapter<Traits>>(config, log);
......
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