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
0b14598f
Commit
0b14598f
authored
4 years ago
by
Ned Coltman
Browse files
Options
Downloads
Patches
Plain Diff
[freeflow][staggeredupwindfluxvars] replace enable_if_t with static assert
parent
de347d82
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!2134
WIP Feature/timestepper test
,
!2127
cleanup/staggeredupwindfluxvars ifconstexpr
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh
+2
-2
2 additions, 2 deletions
...ow/navierstokes/staggered/staggeredupwindfluxvariables.hh
with
2 additions
and
2 deletions
dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh
+
2
−
2
View file @
0b14598f
...
@@ -232,10 +232,10 @@ private:
...
@@ -232,10 +232,10 @@ private:
* \param ownScvf The sub control volume face
* \param ownScvf The sub control volume face
* \param selfIsUpstream bool describing upstream face.
* \param selfIsUpstream bool describing upstream face.
*/
*/
template
<
bool
enable
=
useHigherOrder
,
std
::
enable_if_t
<
enable
,
int
>
=
0
>
static
std
::
array
<
Scalar
,
3
>
getFrontalDistances_
(
const
SubControlVolumeFace
&
ownScvf
,
static
std
::
array
<
Scalar
,
3
>
getFrontalDistances_
(
const
SubControlVolumeFace
&
ownScvf
,
const
bool
selfIsUpstream
)
const
bool
selfIsUpstream
)
{
{
static_assert
(
useHigherOrder
,
"Should only be reached if higher order methods are enabled"
);
// Depending on selfIsUpstream the downstream and the (up)upstream distances are saved.
// Depending on selfIsUpstream the downstream and the (up)upstream distances are saved.
// distances {upstream to downstream distance, up-upstream to upstream distance, downstream staggered cell size}
// distances {upstream to downstream distance, up-upstream to upstream distance, downstream staggered cell size}
std
::
array
<
Scalar
,
3
>
distances
;
std
::
array
<
Scalar
,
3
>
distances
;
...
@@ -469,11 +469,11 @@ private:
...
@@ -469,11 +469,11 @@ private:
* \param localSubFaceIdx The local index of the subface
* \param localSubFaceIdx The local index of the subface
* \param selfIsUpstream bool describing upstream face.
* \param selfIsUpstream bool describing upstream face.
*/
*/
template
<
bool
enable
=
useHigherOrder
,
std
::
enable_if_t
<
enable
,
int
>
=
0
>
static
std
::
array
<
Scalar
,
3
>
getLateralDistances_
(
const
SubControlVolumeFace
&
ownScvf
,
static
std
::
array
<
Scalar
,
3
>
getLateralDistances_
(
const
SubControlVolumeFace
&
ownScvf
,
const
int
localSubFaceIdx
,
const
int
localSubFaceIdx
,
const
bool
selfIsUpstream
)
const
bool
selfIsUpstream
)
{
{
static_assert
(
useHigherOrder
,
"Should only be reached if higher order methods are enabled"
);
// distances {upstream to downstream distance, up-upstream to upstream distance, downstream staggered cell size}
// distances {upstream to downstream distance, up-upstream to upstream distance, downstream staggered cell size}
std
::
array
<
Scalar
,
3
>
distances
;
std
::
array
<
Scalar
,
3
>
distances
;
...
...
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