Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
dumux-repositories
dumux
Commits
e21ea024
Commit
e21ea024
authored
5 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[efftoabs][2p] Remove underscore from public member function names
parent
7d3239ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1922
[efftoabs][2p] Remove underscore from public member function names
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+15
-5
15 additions, 5 deletions
dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
with
15 additions
and
5 deletions
dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+
15
−
5
View file @
e21ea024
...
@@ -243,10 +243,12 @@ public:
...
@@ -243,10 +243,12 @@ public:
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Absolute saturation of the non-wetting phase.
* \return Absolute saturation of the non-wetting phase.
*/
*/
static
Scalar
sweToSw
(
const
Params
&
params
,
Scalar
swe
)
{
return
swe
*
(
1.
-
params
.
swr
()
-
params
.
snr
())
+
params
.
swr
();
}
[[
deprecated
(
"Will be removed after 3.2. Use sweToSw (without underscore suffix) instead!"
)]]
static
Scalar
sweToSw_
(
const
Params
&
params
,
Scalar
swe
)
static
Scalar
sweToSw_
(
const
Params
&
params
,
Scalar
swe
)
{
{
return
sweToSw
(
params
,
swe
);
}
return
swe
*
(
1.
-
params
.
swr
()
-
params
.
snr
())
+
params
.
swr
();
}
/*!
/*!
* \brief Derivative of the effective saturation w.r.t. the absolute saturation.
* \brief Derivative of the effective saturation w.r.t. the absolute saturation.
...
@@ -256,9 +258,13 @@ public:
...
@@ -256,9 +258,13 @@ public:
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Derivative of the effective saturation w.r.t. the absolute saturation.
* \return Derivative of the effective saturation w.r.t. the absolute saturation.
*/
*/
static
Scalar
dswe_dsw
_
(
const
Params
&
params
)
static
Scalar
dswe_dsw
(
const
Params
&
params
)
{
return
1.0
/
(
1.
-
params
.
swr
()
-
params
.
snr
());
}
{
return
1.0
/
(
1.
-
params
.
swr
()
-
params
.
snr
());
}
[[
deprecated
(
"Will be removed after 3.2. Use dswe_dsw (without underscore suffix) instead!"
)]]
static
Scalar
dswe_dsw_
(
const
Params
&
params
)
{
return
dswe_dsw
(
params
);
}
/*!
/*!
* \brief Derivative of the absolute saturation w.r.t. the effective saturation.
* \brief Derivative of the absolute saturation w.r.t. the effective saturation.
*
*
...
@@ -267,8 +273,12 @@ public:
...
@@ -267,8 +273,12 @@ public:
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Derivative of the absolute saturation w.r.t. the effective saturation.
* \return Derivative of the absolute saturation w.r.t. the effective saturation.
*/
*/
static
Scalar
dsw_dswe
_
(
const
Params
&
params
)
static
Scalar
dsw_dswe
(
const
Params
&
params
)
{
return
1.
-
params
.
swr
()
-
params
.
snr
();
}
{
return
1.
-
params
.
swr
()
-
params
.
snr
();
}
[[
deprecated
(
"Will be removed after 3.2. Use dsw_dswe (without underscore suffix) instead!"
)]]
static
Scalar
dsw_dswe_
(
const
Params
&
params
)
{
return
dsw_dswe
(
params
);
}
};
};
}
// end namespace Dumux
}
// end namespace Dumux
...
...
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