Skip to content
Snippets Groups Projects
Commit b492aac2 authored by wenqing's avatar wenqing
Browse files

[Unsat] Added a description for a class member and removed an unused argument

parent 8f243414
No related branches found
No related tags found
No related merge requests found
...@@ -82,6 +82,12 @@ private: ...@@ -82,6 +82,12 @@ private:
const double _mm; ///< Exponent (<=1.0), n=1/(1-mm). const double _mm; ///< Exponent (<=1.0), n=1/(1-mm).
const double _Pc_max; ///< Maximum capillaray pressure const double _Pc_max; ///< Maximum capillaray pressure
/** A small number for an offset:
* 1. to set the bound of S, the saturation, such that
* S in [_Sr+_minor_offset, _Smax-_minor_offset]
* 2. to set the bound of Pc, the capillary pressure, such that
* Pc in [_minor_offset, _Pc_max]
*/
const double _minor_offset = std::numeric_limits<double>::epsilon(); const double _minor_offset = std::numeric_limits<double>::epsilon();
}; };
......
...@@ -31,8 +31,7 @@ namespace PorousMedium ...@@ -31,8 +31,7 @@ namespace PorousMedium
and it has a tag of <capillary_pressure> and it has a tag of <capillary_pressure>
*/ */
static std::unique_ptr<CapillaryPressureSaturation> static std::unique_ptr<CapillaryPressureSaturation>
createBrookCorey(BaseLib::ConfigTree const& config, createBrookCorey(BaseLib::ConfigTree const& config)
const bool is_brook_corey)
{ {
std::array<double, 5> parameters = { std::array<double, 5> parameters = {
{//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__type__pd} {//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__type__pd}
...@@ -57,8 +56,7 @@ static std::unique_ptr<CapillaryPressureSaturation> ...@@ -57,8 +56,7 @@ static std::unique_ptr<CapillaryPressureSaturation>
and it has a tag of <capillary_pressure> and it has a tag of <capillary_pressure>
*/ */
static std::unique_ptr<CapillaryPressureSaturation> static std::unique_ptr<CapillaryPressureSaturation>
createVanGenuchten(BaseLib::ConfigTree const& config, createVanGenuchten(BaseLib::ConfigTree const& config)
const bool is_brook_corey)
{ {
std::array<double, 5> parameters = { std::array<double, 5> parameters = {
{//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__type__pd} {//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__type__pd}
...@@ -85,13 +83,11 @@ std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel( ...@@ -85,13 +83,11 @@ std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel(
if (type == "BrookCorey") if (type == "BrookCorey")
{ {
const bool brook_corey = true; return createBrookCorey(config);
return createBrookCorey(config, brook_corey);
} }
else if (type == "vanGenuchten") else if (type == "vanGenuchten")
{ {
const bool brook_corey = false; return createVanGenuchten(config);
return createVanGenuchten(config, brook_corey);
} }
else else
{ {
......
...@@ -87,6 +87,12 @@ private: ...@@ -87,6 +87,12 @@ private:
const double _mm; ///< Exponent (<=1.0), n=1/(1-mm). const double _mm; ///< Exponent (<=1.0), n=1/(1-mm).
const double _Pc_max; ///< Maximum capillaray pressure const double _Pc_max; ///< Maximum capillaray pressure
/** A small number for an offset:
* 1. to set the bound of S, the saturation, such that
* S in [_Sr+_minor_offset, _Smax-_minor_offset]
* 2. to set the bound of Pc, the capillary pressure, such that
* Pc in [_minor_offset, _Pc_max]
*/
const double _minor_offset = std::numeric_limits<double>::epsilon(); const double _minor_offset = std::numeric_limits<double>::epsilon();
}; };
......
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