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
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
Yuhao Liu
ogs
Commits
b4403c84
Commit
b4403c84
authored
8 years ago
by
wenqing
Browse files
Options
Downloads
Patches
Plain Diff
[Unsat] Corrected keyword documentation.
parent
688a27ae
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
+10
-10
10 additions, 10 deletions
...operty/CapillaryPressure/CreateCapillaryPressureModel.cpp
with
10 additions
and
10 deletions
MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
+
10
−
10
View file @
b4403c84
...
...
@@ -34,16 +34,16 @@ static std::unique_ptr<CapillaryPressureSaturation> createBrookCorey(
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__type}
config
.
checkConfigParameter
(
"type"
,
"BrookCorey"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__pd}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
BrookCorey
__pd}
const
double
pd
=
config
.
getConfigParameter
<
double
>
(
"pd"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__sr}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
BrookCorey
__sr}
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__smax}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
BrookCorey
__smax}
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__m}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
BrookCorey
__m}
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
if
(
m
<
1.0
)
// m >= 1
{
...
...
@@ -51,7 +51,7 @@ static std::unique_ptr<CapillaryPressureSaturation> createBrookCorey(
"The exponent parameter of BrookCorey capillary pressure "
"saturation model, m, must not be smaller than 1"
);
}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__pc_max}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
BrookCorey
__pc_max}
const
double
Pc_max
=
config
.
getConfigParameter
<
double
>
(
"pc_max"
);
return
std
::
unique_ptr
<
CapillaryPressureSaturation
>
(
...
...
@@ -69,16 +69,16 @@ static std::unique_ptr<CapillaryPressureSaturation> createVanGenuchten(
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__type}
config
.
checkConfigParameter
(
"type"
,
"vanGenuchten"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__pd}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
vanGenuchten
__pd}
const
double
pd
=
config
.
getConfigParameter
<
double
>
(
"pd"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__sr}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
vanGenuchten
__sr}
const
double
Sr
=
config
.
getConfigParameter
<
double
>
(
"sr"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__smax}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
vanGenuchten
__smax}
const
double
Smax
=
config
.
getConfigParameter
<
double
>
(
"smax"
);
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__m}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
vanGenuchten
__m}
const
double
m
=
config
.
getConfigParameter
<
double
>
(
"m"
);
if
(
m
>
1.0
)
// m <= 1
{
...
...
@@ -86,7 +86,7 @@ static std::unique_ptr<CapillaryPressureSaturation> createVanGenuchten(
"The exponent parameter of van Genuchten capillary pressure "
"saturation model, m, must be in an interval of [0, 1]"
);
}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
type
__pc_max}
//! \ogs_file_param{material_property__porous_medium__porous_medium__capillary_pressure__
vanGenuchten
__pc_max}
const
double
Pc_max
=
config
.
getConfigParameter
<
double
>
(
"pc_max"
);
return
std
::
unique_ptr
<
CapillaryPressureSaturation
>
(
...
...
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