Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
397cd813
Commit
397cd813
authored
Mar 03, 2021
by
Kilian Weishaupt
Browse files
[heatpipelaw] Use effective saturation
parent
cf8eb4dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
View file @
397cd813
...
...
@@ -274,11 +274,11 @@ public:
/*!
* \brief The capillary pressure-saturation curve.
*
* \param sw
e Effective s
aturation of the wetting phase \f$\mathrm{
\overline{S}
_w}\f$
* \param sw
S
aturation of the wetting phase \f$\mathrm{
S
_w}\f$
*/
template
<
class
Scalar
>
Scalar
pc
(
Scalar
swe
)
const
Scalar
pc
(
const
Scalar
sw
)
const
{
const
Scalar
swe
=
EffToAbs
::
swToSwe
(
sw
,
effToAbsParams_
);
const
Scalar
sne
=
1
-
swe
;
const
Scalar
p0Gamma
=
params_
.
p0
()
*
params_
.
gamma
();
...
...
@@ -298,7 +298,6 @@ public:
/*!
* \brief The capillary pressure at Swe = 1.0 also called end point capillary pressure
*/
template
<
class
Scalar
>
Scalar
endPointPc
()
const
{
return
0.0
;
}
...
...
@@ -306,30 +305,30 @@ public:
* \brief The partial derivative of the capillary
* pressure w.r.t. the effective saturation.
*
* \param sw
e Effective s
aturation of the wetting phase \f$\mathrm{
\overline{S}
_w}\f$
* \param sw
S
aturation of the wetting phase \f$\mathrm{
S
_w}\f$
*/
template
<
class
Scalar
>
Scalar
dpc_dswe
(
Scalar
swe
)
const
Scalar
dpc_dsw
(
const
Scalar
sw
)
const
{
const
Scalar
swe
=
EffToAbs
::
swToSwe
(
sw
,
effToAbsParams_
);
const
Scalar
sne
=
1
-
swe
;
const
Scalar
p0Gamma
=
params_
.
p0
()
*
params_
.
gamma
();
if
(
sne
>
1.0
)
sne
=
1.0
;
else
if
(
sne
<=
0.0
)
return
-
p0Gamma
*
1.417
;
return
-
p0Gamma
*
1.417
*
EffToAbs
::
dswe_dsw
(
effToAbsParams_
)
;
else
return
-
p0Gamma
*
((
3
*
1.263
*
sne
-
2
*
2.120
)
*
sne
+
1.417
);
return
-
p0Gamma
*
((
3
*
1.263
*
sne
-
2
*
2.120
)
*
sne
+
1.417
)
*
EffToAbs
::
dswe_dsw
(
effToAbsParams_
)
;
}
/*!
* \brief The relative permeability for the wetting phase of
* the medium.
*
* \param sw
e The mobile s
aturation of the wetting phase
.
* \param sw
S
aturation of the wetting phase
\f$\mathrm{S_w}\f$
*/
template
<
class
Scalar
>
Scalar
krw
(
Scalar
swe
)
const
Scalar
krw
(
const
Scalar
sw
)
const
{
const
Scalar
swe
=
EffToAbs
::
swToSwe
(
sw
,
effToAbsParams_
);
return
kr_
(
swe
);
}
...
...
@@ -337,11 +336,11 @@ public:
* \brief The relative permeability for the non-wetting phase
* of the medium.
*
* \param sw
e The mobile s
aturation of the wetting phase
.
* \param sw
S
aturation of the wetting phase
\f$\mathrm{S_w}\f$
*/
template
<
class
Scalar
>
Scalar
krn
(
Scalar
swe
)
const
Scalar
krn
(
const
Scalar
sw
)
const
{
const
Scalar
swe
=
EffToAbs
::
swToSwe
(
sw
,
effToAbsParams_
);
const
Scalar
sne
=
1
-
swe
;
// TODO does this make sense?
return
kr_
(
sne
);
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment