Skip to content
Snippets Groups Projects
Commit 05a7a1be authored by ericsimo's avatar ericsimo Committed by wenqing
Browse files

implement pressure_threshold instead pthr

parent f609057d
No related branches found
No related tags found
No related merge requests found
\copydoc MaterialPropertyLib::GasPressureDependentPermeability::pthr_ \copydoc MaterialPropertyLib::GasPressureDependentPermeability::pressure_threshold_
...@@ -53,14 +53,14 @@ std::unique_ptr<Property> createGasPressureDependentPermeability( ...@@ -53,14 +53,14 @@ std::unique_ptr<Property> createGasPressureDependentPermeability(
parameter_name, parameters, 0, nullptr); parameter_name, parameters, 0, nullptr);
auto const a1 = auto const a1 =
//! \ogs_file_param{properties__property__GasPressureDependentPermeability__b1} //! \ogs_file_param{properties__property__GasPressureDependentPermeability__a1}
config.getConfigParameter<double>("a1"); config.getConfigParameter<double>("a1");
auto const a2 = auto const a2 =
//! \ogs_file_param{properties__property__GasPressureDependentPermeability__b2} //! \ogs_file_param{properties__property__GasPressureDependentPermeability__a2}
config.getConfigParameter<double>("a2"); config.getConfigParameter<double>("a2");
auto const pthr = auto const pressure_threshold =
//! \ogs_file_param{properties__property__GasPressureDependentPermeability__b3} //! \ogs_file_param{properties__property__GasPressureDependentPermeability__pressure_threshold}
config.getConfigParameter<double>("pthr"); config.getConfigParameter<double>("pressure_threshold");
auto const minimum_permeability = auto const minimum_permeability =
//! \ogs_file_param{properties__property__GasPressureDependentPermeability__minimum_permeability} //! \ogs_file_param{properties__property__GasPressureDependentPermeability__minimum_permeability}
config.getConfigParameter<double>("minimum_permeability"); config.getConfigParameter<double>("minimum_permeability");
...@@ -80,13 +80,13 @@ std::unique_ptr<Property> createGasPressureDependentPermeability( ...@@ -80,13 +80,13 @@ std::unique_ptr<Property> createGasPressureDependentPermeability(
if (geometry_dimension == 2) if (geometry_dimension == 2)
{ {
return std::make_unique<GasPressureDependentPermeability<2>>( return std::make_unique<GasPressureDependentPermeability<2>>(
std::move(property_name), parameter_k0, a1, a2, pthr, std::move(property_name), parameter_k0, a1, a2, pressure_threshold,
minimum_permeability, maximum_permeability, minimum_permeability, maximum_permeability,
local_coordinate_system); local_coordinate_system);
} }
return std::make_unique<GasPressureDependentPermeability<3>>( return std::make_unique<GasPressureDependentPermeability<3>>(
std::move(property_name), parameter_k0, a1, a2, pthr, std::move(property_name), parameter_k0, a1, a2, pressure_threshold,
minimum_permeability, maximum_permeability, local_coordinate_system); minimum_permeability, maximum_permeability, local_coordinate_system);
} }
} // namespace MaterialPropertyLib } // namespace MaterialPropertyLib
...@@ -26,13 +26,13 @@ template <int DisplacementDim> ...@@ -26,13 +26,13 @@ template <int DisplacementDim>
GasPressureDependentPermeability<DisplacementDim>:: GasPressureDependentPermeability<DisplacementDim>::
GasPressureDependentPermeability( GasPressureDependentPermeability(
std::string name, ParameterLib::Parameter<double> const& k0, std::string name, ParameterLib::Parameter<double> const& k0,
double const a1, double const a2, double const pthr, double const a1, double const a2, double const pressure_threshold,
double const minimum_permeability, double const maximum_permeability, double const minimum_permeability, double const maximum_permeability,
ParameterLib::CoordinateSystem const* const local_coordinate_system) ParameterLib::CoordinateSystem const* const local_coordinate_system)
: k0_(k0), : k0_(k0),
a1_(a1), a1_(a1),
a2_(a2), a2_(a2),
pthr_(pthr), pressure_threshold_(pressure_threshold),
minimum_permeability_(minimum_permeability), minimum_permeability_(minimum_permeability),
maximum_permeability_(maximum_permeability), maximum_permeability_(maximum_permeability),
local_coordinate_system_(local_coordinate_system) local_coordinate_system_(local_coordinate_system)
...@@ -62,10 +62,10 @@ PropertyDataType GasPressureDependentPermeability<DisplacementDim>::value( ...@@ -62,10 +62,10 @@ PropertyDataType GasPressureDependentPermeability<DisplacementDim>::value(
auto k_data = k0_(t, pos); auto k_data = k0_(t, pos);
double const factor = double const factor = (gas_pressure <= pressure_threshold_)
(gas_pressure <= pthr_) ? (1.0 + a1_ * gas_pressure)
? (1.0 + a1_ * gas_pressure) : (a2_ * (gas_pressure - pressure_threshold_) +
: (a2_ * (gas_pressure - pthr_) + 1.0 + a1_ * pthr_); 1.0 + a1_ * pressure_threshold_);
for (auto& k_i : k_data) for (auto& k_i : k_data)
{ {
......
...@@ -49,7 +49,7 @@ class GasPressureDependentPermeability final : public Property ...@@ -49,7 +49,7 @@ class GasPressureDependentPermeability final : public Property
public: public:
GasPressureDependentPermeability( GasPressureDependentPermeability(
std::string name, ParameterLib::Parameter<double> const& k0, std::string name, ParameterLib::Parameter<double> const& k0,
double const a1, double const a2, double const pthr, double const a1, double const a2, double const pressure_threshold,
double const minimum_permeability, double const maximum_permeability, double const minimum_permeability, double const maximum_permeability,
ParameterLib::CoordinateSystem const* const local_coordinate_system); ParameterLib::CoordinateSystem const* const local_coordinate_system);
...@@ -75,7 +75,7 @@ private: ...@@ -75,7 +75,7 @@ private:
double const a2_; double const a2_;
/// The threshold pressure which defines the low and high gas pressure /// The threshold pressure which defines the low and high gas pressure
/// domain. Different permeability functions are defined for each domain. /// domain. Different permeability functions are defined for each domain.
double const pthr_; double const pressure_threshold_;
double const minimum_permeability_; double const minimum_permeability_;
double const maximum_permeability_; double const maximum_permeability_;
ParameterLib::CoordinateSystem const* const local_coordinate_system_; ParameterLib::CoordinateSystem const* const local_coordinate_system_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment