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
e68beebc
Commit
e68beebc
authored
4 years ago
by
Simon Emmert
Browse files
Options
Downloads
Patches
Plain Diff
[fluidmatrixinteractions] Rename wettingPhaseIdx() -> wettingPhase()
parent
f800d756
No related branches found
No related tags found
1 merge request
!1929
[fluidmatrixinteractions] Rename wettingPhaseIdx() -> wettingPhase()
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+1
-1
1 addition, 1 deletion
...fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
with
1 addition
and
1 deletion
dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+
1
−
1
View file @
e68beebc
...
...
@@ -81,7 +81,7 @@ public:
static_assert
(
FluidSystem
::
numPhases
==
2
,
"ThermalConductivitySomerton only works for two-phase fluid systems!"
);
// TODO: there should be an assertion that the indices are correct and 0 is actually the wetting phase!
const
Scalar
sw
=
volVars
.
saturation
(
volVars
.
wettingPhase
Idx
());
const
Scalar
sw
=
volVars
.
saturation
(
volVars
.
wettingPhase
());
const
Scalar
lambdaW
=
volVars
.
fluidThermalConductivity
(
volVars
.
wettingPhase
());
const
Scalar
lambdaN
=
volVars
.
fluidThermalConductivity
(
1
-
volVars
.
wettingPhase
());
const
Scalar
lambdaSolid
=
volVars
.
solidThermalConductivity
();
...
...
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