Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic
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
MostafaMollaali
dynamic
Commits
117e8c64
Commit
117e8c64
authored
5 years ago
by
Norbert Grunwald
Committed by
Dmitri Naumov
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
removed small offsets of capillary pressure
parent
a649f629
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/MPL/Properties/SaturationBrooksCorey.cpp
+10
-14
10 additions, 14 deletions
MaterialLib/MPL/Properties/SaturationBrooksCorey.cpp
with
10 additions
and
14 deletions
MaterialLib/MPL/Properties/SaturationBrooksCorey.cpp
+
10
−
14
View file @
117e8c64
...
@@ -37,10 +37,8 @@ PropertyDataType SaturationBrooksCorey::value(
...
@@ -37,10 +37,8 @@ PropertyDataType SaturationBrooksCorey::value(
ParameterLib
::
SpatialPosition
const
&
/*pos*/
,
ParameterLib
::
SpatialPosition
const
&
/*pos*/
,
double
const
/*t*/
)
const
double
const
/*t*/
)
const
{
{
const
double
p_cap
=
std
::
max
(
const
double
p_cap
=
std
::
get
<
double
>
(
std
::
numeric_limits
<
double
>::
min
(),
variable_array
[
static_cast
<
int
>
(
Variable
::
capillary_pressure
)]);
std
::
get
<
double
>
(
variable_array
[
static_cast
<
int
>
(
Variable
::
capillary_pressure
)]));
const
double
s_L_res
=
_residual_liquid_saturation
;
const
double
s_L_res
=
_residual_liquid_saturation
;
const
double
s_L_max
=
1.0
-
_residual_gas_saturation
;
const
double
s_L_max
=
1.0
-
_residual_gas_saturation
;
...
@@ -51,10 +49,7 @@ PropertyDataType SaturationBrooksCorey::value(
...
@@ -51,10 +49,7 @@ PropertyDataType SaturationBrooksCorey::value(
return
s_L_max
;
return
s_L_max
;
const
double
s_eff
=
std
::
pow
(
p_b
/
p_cap
,
lambda
);
const
double
s_eff
=
std
::
pow
(
p_b
/
p_cap
,
lambda
);
const
double
s
=
s_eff
*
(
s_L_max
-
s_L_res
)
+
s_L_res
;
return
s_eff
*
(
s_L_max
-
s_L_res
)
+
s_L_res
;
return
MathLib
::
limitValueInInterval
(
s
,
s_L_res
+
_minor_offset
,
s_L_max
-
_minor_offset
);
}
}
PropertyDataType
SaturationBrooksCorey
::
dValue
(
PropertyDataType
SaturationBrooksCorey
::
dValue
(
...
@@ -67,10 +62,11 @@ PropertyDataType SaturationBrooksCorey::dValue(
...
@@ -67,10 +62,11 @@ PropertyDataType SaturationBrooksCorey::dValue(
" derivatives with respect to capillary pressure only."
);
" derivatives with respect to capillary pressure only."
);
const
double
p_b
=
_entry_pressure
;
const
double
p_b
=
_entry_pressure
;
const
double
p_cap
=
std
::
max
(
const
double
p_cap
=
std
::
get
<
double
>
(
p_b
,
variable_array
[
static_cast
<
int
>
(
Variable
::
capillary_pressure
)]);
std
::
get
<
double
>
(
variable_array
[
static_cast
<
int
>
(
Variable
::
capillary_pressure
)]));
if
(
p_cap
<=
p_b
)
return
0.
;
auto
const
s_L
=
_medium
->
property
(
PropertyType
::
saturation
)
auto
const
s_L
=
_medium
->
property
(
PropertyType
::
saturation
)
.
template
value
<
double
>(
variable_array
,
pos
,
t
);
.
template
value
<
double
>(
variable_array
,
pos
,
t
);
...
@@ -82,8 +78,8 @@ PropertyDataType SaturationBrooksCorey::dValue(
...
@@ -82,8 +78,8 @@ PropertyDataType SaturationBrooksCorey::dValue(
PropertyDataType
SaturationBrooksCorey
::
d2Value
(
PropertyDataType
SaturationBrooksCorey
::
d2Value
(
VariableArray
const
&
variable_array
,
Variable
const
primary_variable1
,
VariableArray
const
&
variable_array
,
Variable
const
primary_variable1
,
Variable
const
primary_variable2
,
ParameterLib
::
SpatialPosition
const
&
/*pos*/
,
Variable
const
primary_variable2
,
double
const
/*t*/
)
const
ParameterLib
::
SpatialPosition
const
&
/*pos*/
,
double
const
/*t*/
)
const
{
{
(
void
)
primary_variable1
;
(
void
)
primary_variable1
;
(
void
)
primary_variable2
;
(
void
)
primary_variable2
;
...
...
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