Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Özgür Ozan Sen
ogs
Commits
6f13cd3b
Commit
6f13cd3b
authored
8 years ago
by
wenqing
Browse files
Options
Downloads
Patches
Plain Diff
[Unsat] Changed the documentation for relative permeability keywords
parent
bbadb6a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.cpp
+25
-24
25 additions, 24 deletions
.../RelativePermeability/CreateRelativePermeabilityModel.cpp
with
25 additions
and
24 deletions
MaterialLib/PorousMedium/UnsaturatedProperty/RelativePermeability/CreateRelativePermeabilityModel.cpp
+
25
−
24
View file @
6f13cd3b
...
@@ -41,16 +41,16 @@ namespace PorousMedium
...
@@ -41,16 +41,16 @@ namespace PorousMedium
std
::
unique_ptr
<
RelativePermeability
>
createWettingPhaseVanGenuchten
(
std
::
unique_ptr
<
RelativePermeability
>
createWettingPhaseVanGenuchten
(
BaseLib
::
ConfigTree
const
&
config
)
BaseLib
::
ConfigTree
const
&
config
)
{
{
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__
type
}
//! \ogs_file_param{material__porous_medium__relative_permeability__
WettingPhaseVanGenuchten
}
config
.
checkConfigParameter
(
"type"
,
"WettingPhaseVanGenuchten"
);
config
.
checkConfigParameter
(
"type"
,
"WettingPhaseVanGenuchten"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseVanGenuchten__sr}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseVanGenuchten__sr}
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseVanGenuchten__smax}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseVanGenuchten__smax}
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseVanGenuchten__m}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseVanGenuchten__m}
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
if
(
m
<
0.
||
m
>
1.0
)
// m <= 1
if
(
m
<
0.
||
m
>
1.0
)
// m <= 1
{
{
...
@@ -58,7 +58,7 @@ std::unique_ptr<RelativePermeability> createWettingPhaseVanGenuchten(
...
@@ -58,7 +58,7 @@ std::unique_ptr<RelativePermeability> createWettingPhaseVanGenuchten(
"The exponent parameter of WettingPhaseVanGenuchten relative
\n
"
"The exponent parameter of WettingPhaseVanGenuchten relative
\n
"
" permeability model, m, must be in an interval of [0, 1]"
);
" permeability model, m, must be in an interval of [0, 1]"
);
}
}
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseVanGenuchten__krel_min}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseVanGenuchten__krel_min}
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
return
std
::
unique_ptr
<
RelativePermeability
>
(
return
std
::
unique_ptr
<
RelativePermeability
>
(
...
@@ -73,16 +73,16 @@ std::unique_ptr<RelativePermeability> createWettingPhaseVanGenuchten(
...
@@ -73,16 +73,16 @@ std::unique_ptr<RelativePermeability> createWettingPhaseVanGenuchten(
std
::
unique_ptr
<
RelativePermeability
>
createNonWettingPhaseVanGenuchten
(
std
::
unique_ptr
<
RelativePermeability
>
createNonWettingPhaseVanGenuchten
(
BaseLib
::
ConfigTree
const
&
config
)
BaseLib
::
ConfigTree
const
&
config
)
{
{
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__
type
}
//! \ogs_file_param{material__porous_medium__relative_permeability__
NonWettingPhaseVanGenuchten
}
config
.
checkConfigParameter
(
"type"
,
"NonWettingPhaseVanGenuchten"
);
config
.
checkConfigParameter
(
"type"
,
"NonWettingPhaseVanGenuchten"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__sr}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__sr}
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__smax}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__smax}
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__m}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__m}
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
if
(
m
<
0.
||
m
>
1.0
)
// m <= 1
if
(
m
<
0.
||
m
>
1.0
)
// m <= 1
{
{
...
@@ -91,7 +91,7 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseVanGenuchten(
...
@@ -91,7 +91,7 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseVanGenuchten(
" permeability model, m, must be in an interval of [0, 1]"
);
" permeability model, m, must be in an interval of [0, 1]"
);
}
}
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__krel_min}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseVanGenuchten__krel_min}
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
return
std
::
unique_ptr
<
RelativePermeability
>
(
return
std
::
unique_ptr
<
RelativePermeability
>
(
...
@@ -106,16 +106,16 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseVanGenuchten(
...
@@ -106,16 +106,16 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseVanGenuchten(
std
::
unique_ptr
<
RelativePermeability
>
createWettingPhaseBrookCoreyOilGas
(
std
::
unique_ptr
<
RelativePermeability
>
createWettingPhaseBrookCoreyOilGas
(
BaseLib
::
ConfigTree
const
&
config
)
BaseLib
::
ConfigTree
const
&
config
)
{
{
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__
type
}
//! \ogs_file_param{material__porous_medium__relative_permeability__
WettingPhaseBrookCoreyOilGas
}
config
.
checkConfigParameter
(
"type"
,
"WettingPhaseBrookCoreyOilGas"
);
config
.
checkConfigParameter
(
"type"
,
"WettingPhaseBrookCoreyOilGas"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__sr}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__sr}
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__smax}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__smax}
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__m}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__m}
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
if
(
m
<
1.0
)
// m >= 1
if
(
m
<
1.0
)
// m >= 1
{
{
...
@@ -124,7 +124,7 @@ std::unique_ptr<RelativePermeability> createWettingPhaseBrookCoreyOilGas(
...
@@ -124,7 +124,7 @@ std::unique_ptr<RelativePermeability> createWettingPhaseBrookCoreyOilGas(
"relative permeability model, m, must not be smaller than 1"
);
"relative permeability model, m, must not be smaller than 1"
);
}
}
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__krel_min}
//! \ogs_file_param{material__porous_medium__relative_permeability__WettingPhaseBrookCoreyOilGas__krel_min}
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
return
std
::
unique_ptr
<
RelativePermeability
>
(
return
std
::
unique_ptr
<
RelativePermeability
>
(
...
@@ -139,16 +139,16 @@ std::unique_ptr<RelativePermeability> createWettingPhaseBrookCoreyOilGas(
...
@@ -139,16 +139,16 @@ std::unique_ptr<RelativePermeability> createWettingPhaseBrookCoreyOilGas(
std
::
unique_ptr
<
RelativePermeability
>
createNonWettingPhaseBrookCoreyOilGas
(
std
::
unique_ptr
<
RelativePermeability
>
createNonWettingPhaseBrookCoreyOilGas
(
BaseLib
::
ConfigTree
const
&
config
)
BaseLib
::
ConfigTree
const
&
config
)
{
{
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__
type
}
//! \ogs_file_param{material__porous_medium__relative_permeability__
NonWettingPhaseBrookCoreyOilGas
}
config
.
checkConfigParameter
(
"type"
,
"NonWettingPhaseBrookCoreyOilGas"
);
config
.
checkConfigParameter
(
"type"
,
"NonWettingPhaseBrookCoreyOilGas"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__sr}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__sr}
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__smax}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__smax}
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__m}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__m}
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
if
(
m
<
1.0
)
// m >= 1
if
(
m
<
1.0
)
// m >= 1
{
{
...
@@ -157,7 +157,7 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseBrookCoreyOilGas(
...
@@ -157,7 +157,7 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseBrookCoreyOilGas(
"relative permeability model, m, must not be smaller than 1"
);
"relative permeability model, m, must not be smaller than 1"
);
}
}
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__krel_min}
//! \ogs_file_param{material__porous_medium__relative_permeability__NonWettingPhaseBrookCoreyOilGas__krel_min}
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
const
double
krel_min
=
config
.
getConfigParameter
<
double
>
(
"krel_min"
);
return
std
::
unique_ptr
<
RelativePermeability
>
(
return
std
::
unique_ptr
<
RelativePermeability
>
(
...
@@ -167,7 +167,7 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseBrookCoreyOilGas(
...
@@ -167,7 +167,7 @@ std::unique_ptr<RelativePermeability> createNonWettingPhaseBrookCoreyOilGas(
std
::
unique_ptr
<
RelativePermeability
>
createRelativePermeabilityModel
(
std
::
unique_ptr
<
RelativePermeability
>
createRelativePermeabilityModel
(
BaseLib
::
ConfigTree
const
&
config
)
BaseLib
::
ConfigTree
const
&
config
)
{
{
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__type}
//! \ogs_file_param{material__porous_medium__relative_permeability__type}
auto
const
type
=
config
.
peekConfigParameter
<
std
::
string
>
(
"type"
);
auto
const
type
=
config
.
peekConfigParameter
<
std
::
string
>
(
"type"
);
if
(
type
==
"WettingPhaseVanGenuchten"
)
if
(
type
==
"WettingPhaseVanGenuchten"
)
...
@@ -188,18 +188,19 @@ std::unique_ptr<RelativePermeability> createRelativePermeabilityModel(
...
@@ -188,18 +188,19 @@ std::unique_ptr<RelativePermeability> createRelativePermeabilityModel(
}
}
else
if
(
type
==
"Curve"
)
else
if
(
type
==
"Curve"
)
{
{
//! \ogs_file_param{material__porous_medium__relative_permeability__Curve}
config
.
checkConfigParameter
(
"type"
,
"Curve"
);
config
.
checkConfigParameter
(
"type"
,
"Curve"
);
// TODO: parsing of curve will be replaced by the function for creating
// TODO: parsing of curve will be replaced by the function for creating
// curve.
// curve.
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__Curve__curve}
//! \ogs_file_param{material__porous_medium__relative_permeability__Curve__curve}
auto
const
&
curve_config
=
config
.
getConfigSubtree
(
"curve"
);
auto
const
&
curve_config
=
config
.
getConfigSubtree
(
"curve"
);
auto
variables
=
auto
variables
=
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__Curve__curve__coords}
//! \ogs_file_param{material__porous_medium__relative_permeability__Curve__curve__coords}
curve_config
.
getConfigParameter
<
std
::
vector
<
double
>>
(
"coords"
);
curve_config
.
getConfigParameter
<
std
::
vector
<
double
>>
(
"coords"
);
auto
values
=
auto
values
=
//! \ogs_file_param{material_
property__porous_medium_
_porous_medium__relative_permeability__Curve__curve__values}
//! \ogs_file_param{material__porous_medium__relative_permeability__Curve__curve__values}
curve_config
.
getConfigParameter
<
std
::
vector
<
double
>>
(
"values"
);
curve_config
.
getConfigParameter
<
std
::
vector
<
double
>>
(
"values"
);
if
(
variables
.
empty
()
||
values
.
empty
())
if
(
variables
.
empty
()
||
values
.
empty
())
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment