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
Karsten Rink
ogs
Commits
97cd3fa8
Commit
97cd3fa8
authored
5 years ago
by
Norbert Grunwald
Committed by
Dmitri Naumov
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
complete saturation derivative by outer derivative
parent
0df33834
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MaterialLib/MPL/Properties/SaturationBrooksCorey.cpp
+4
-1
4 additions, 1 deletion
MaterialLib/MPL/Properties/SaturationBrooksCorey.cpp
Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp
+4
-2
4 additions, 2 deletions
Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp
with
8 additions
and
3 deletions
MaterialLib/MPL/Properties/SaturationBrooksCorey.cpp
+
4
−
1
View file @
97cd3fa8
...
...
@@ -61,6 +61,8 @@ PropertyDataType SaturationBrooksCorey::dValue(
"SaturationBrooksCorey::dValue is implemented for "
" derivatives with respect to capillary pressure only."
);
const
double
s_L_res
=
_residual_liquid_saturation
;
const
double
s_L_max
=
1.0
-
_residual_gas_saturation
;
const
double
p_b
=
_entry_pressure
;
const
double
p_cap
=
std
::
get
<
double
>
(
variable_array
[
static_cast
<
int
>
(
Variable
::
capillary_pressure
)]);
...
...
@@ -72,8 +74,9 @@ PropertyDataType SaturationBrooksCorey::dValue(
.
template
value
<
double
>(
variable_array
,
pos
,
t
);
const
double
lambda
=
_exponent
;
const
double
ds_L_d_s_eff
=
1.
/
(
s_L_max
-
s_L_res
);
return
-
lambda
/
p_cap
*
s_L
;
return
-
lambda
/
p_cap
*
s_L
*
ds_L_d_s_eff
;
}
PropertyDataType
SaturationBrooksCorey
::
d2Value
(
...
...
This diff is collapsed.
Click to expand it.
Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp
+
4
−
2
View file @
97cd3fa8
...
...
@@ -86,10 +86,12 @@ TEST(MaterialPropertyLib, SaturationBrooksCorey)
const
double
s_ref
=
s_eff
*
(
max_saturation
-
ref_residual_liquid_saturation
)
+
ref_residual_liquid_saturation
;
const
double
ds_dpc
=
const
double
ds_
eff_
dpc
=
(
p_cap
<=
ref_entry_pressure
)
?
0.
:
-
ref_lambda
/
p_cap
*
s_ref
;
const
double
ds_L_ds_eff
=
1.
/
(
max_saturation
-
ref_residual_liquid_saturation
);
const
double
ds_L_dpc
=
ds_L_ds_eff
*
ds_eff_dpc
;
ASSERT_NEAR
(
s_L
,
s_ref
,
1.e-10
);
ASSERT_NEAR
(
ds_L_dp_cap
,
ds_dpc
,
1.e-10
);
ASSERT_NEAR
(
ds_L_dp_cap
,
ds_
L_
dpc
,
1.e-10
);
}
}
\ No newline at end of file
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