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
3d240bf6
Commit
3d240bf6
authored
5 years ago
by
Timo Koch
Committed by
Martin Schneider
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[privarswitch][cleanup] Apply naming conventions for private member functions
parent
cf2202c1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1843
Fix/privar switch box boundary
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+4
-4
4 additions, 4 deletions
...x/porousmediumflow/compositional/primaryvariableswitch.hh
with
4 additions
and
4 deletions
dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+
4
−
4
View file @
3d240bf6
...
@@ -112,7 +112,7 @@ public:
...
@@ -112,7 +112,7 @@ public:
visited_
[
dofIdxGlobal
]
=
true
;
visited_
[
dofIdxGlobal
]
=
true
;
// Compute volVars on which grounds we decide
// Compute volVars on which grounds we decide
// if we need to switch the primary variables
// if we need to switch the primary variables
auto
&
volVars
=
getVolVarAccess
(
gridVariables
.
curGridVolVars
(),
elemVolVars
,
scv
);
auto
&
volVars
=
getVolVarAccess
_
(
gridVariables
.
curGridVolVars
(),
elemVolVars
,
scv
);
volVars
.
update
(
curElemSol
,
problem
,
element
,
scv
);
volVars
.
update
(
curElemSol
,
problem
,
element
,
scv
);
if
(
asImp_
().
update_
(
curSol
[
dofIdxGlobal
],
volVars
,
dofIdxGlobal
,
scv
.
dofPosition
()))
if
(
asImp_
().
update_
(
curSol
[
dofIdxGlobal
],
volVars
,
dofIdxGlobal
,
scv
.
dofPosition
()))
...
@@ -269,7 +269,7 @@ public:
...
@@ -269,7 +269,7 @@ public:
{
{
if
(
stateChanged
[
scv
.
dofIndex
()])
if
(
stateChanged
[
scv
.
dofIndex
()])
{
{
auto
&
volVars
=
getVolVarAccess
(
gridVariables
.
curGridVolVars
(),
elemVolVars
,
scv
);
auto
&
volVars
=
getVolVarAccess
_
(
gridVariables
.
curGridVolVars
(),
elemVolVars
,
scv
);
volVars
.
update
(
curElemSol
,
problem
,
element
,
scv
);
volVars
.
update
(
curElemSol
,
problem
,
element
,
scv
);
}
}
}
}
...
@@ -386,12 +386,12 @@ protected:
...
@@ -386,12 +386,12 @@ protected:
private
:
private
:
template
<
class
GridVolumeVariables
,
class
ElementVolumeVariables
,
class
SubControlVolume
>
template
<
class
GridVolumeVariables
,
class
ElementVolumeVariables
,
class
SubControlVolume
>
static
auto
getVolVarAccess
(
GridVolumeVariables
&
gridVolVars
,
ElementVolumeVariables
&
elemVolVars
,
const
SubControlVolume
&
scv
)
static
auto
getVolVarAccess
_
(
GridVolumeVariables
&
gridVolVars
,
ElementVolumeVariables
&
elemVolVars
,
const
SubControlVolume
&
scv
)
->
std
::
enable_if_t
<!
GridVolumeVariables
::
cachingEnabled
,
decltype
(
elemVolVars
[
scv
])
>
->
std
::
enable_if_t
<!
GridVolumeVariables
::
cachingEnabled
,
decltype
(
elemVolVars
[
scv
])
>
{
return
elemVolVars
[
scv
];
}
{
return
elemVolVars
[
scv
];
}
template
<
class
GridVolumeVariables
,
class
ElementVolumeVariables
,
class
SubControlVolume
>
template
<
class
GridVolumeVariables
,
class
ElementVolumeVariables
,
class
SubControlVolume
>
static
auto
getVolVarAccess
(
GridVolumeVariables
&
gridVolVars
,
ElementVolumeVariables
&
elemVolVars
,
const
SubControlVolume
&
scv
)
static
auto
getVolVarAccess
_
(
GridVolumeVariables
&
gridVolVars
,
ElementVolumeVariables
&
elemVolVars
,
const
SubControlVolume
&
scv
)
->
std
::
enable_if_t
<
GridVolumeVariables
::
cachingEnabled
,
decltype
(
gridVolVars
.
volVars
(
scv
))
>
->
std
::
enable_if_t
<
GridVolumeVariables
::
cachingEnabled
,
decltype
(
gridVolVars
.
volVars
(
scv
))
>
{
return
gridVolVars
.
volVars
(
scv
);
}
{
return
gridVolVars
.
volVars
(
scv
);
}
...
...
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