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
a06160bf
Commit
a06160bf
authored
5 years ago
by
Katharina Heck
Browse files
Options
Downloads
Patches
Plain Diff
[fix][fickslaw] get return type of free functions out of volumevariables so that it is always clear
parent
5419ed54
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1728
[fix][fickslaw] get return type of free functions out of volumevariables so that it is always clear
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/flux/fickslaw.hh
+3
-2
3 additions, 2 deletions
dumux/flux/fickslaw.hh
with
3 additions
and
2 deletions
dumux/flux/fickslaw.hh
+
3
−
2
View file @
a06160bf
...
...
@@ -48,7 +48,8 @@ using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties
* \brief evaluates the density to be used in Fick's law based on the reference system
*/
template
<
class
VolumeVariables
>
auto
massOrMolarDensity
(
const
VolumeVariables
&
volVars
,
ReferenceSystemFormulation
referenceSys
,
const
int
phaseIdx
)
typename
VolumeVariables
::
PrimaryVariables
::
value_type
massOrMolarDensity
(
const
VolumeVariables
&
volVars
,
ReferenceSystemFormulation
referenceSys
,
const
int
phaseIdx
)
{
return
(
referenceSys
==
ReferenceSystemFormulation
::
massAveraged
)
?
volVars
.
density
(
phaseIdx
)
:
volVars
.
molarDensity
(
phaseIdx
);
}
...
...
@@ -58,7 +59,7 @@ auto massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulati
* \brief returns the mass or mole fraction to be used in Fick's law based on the reference system
*/
template
<
class
VolumeVariables
>
auto
massOrMoleFraction
(
const
VolumeVariables
&
volVars
,
ReferenceSystemFormulation
referenceSys
,
const
int
phaseIdx
,
const
int
compIdx
)
typename
VolumeVariables
::
PrimaryVariables
::
value_type
massOrMoleFraction
(
const
VolumeVariables
&
volVars
,
ReferenceSystemFormulation
referenceSys
,
const
int
phaseIdx
,
const
int
compIdx
)
{
return
(
referenceSys
==
ReferenceSystemFormulation
::
massAveraged
)
?
volVars
.
massFraction
(
phaseIdx
,
compIdx
)
:
volVars
.
moleFraction
(
phaseIdx
,
compIdx
);
}
...
...
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