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
38f93608
Commit
38f93608
authored
5 years ago
by
Ned Coltman
Browse files
Options
Downloads
Patches
Plain Diff
[deprecated] Add constexpr for effective laws deprecation
parent
7e687785
No related branches found
No related tags found
1 merge request
!1684
Improve effective laws
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/common/deprecated.hh
+5
-1
5 additions, 1 deletion
dumux/common/deprecated.hh
with
5 additions
and
1 deletion
dumux/common/deprecated.hh
+
5
−
1
View file @
38f93608
...
@@ -46,7 +46,6 @@ namespace Deprecated {
...
@@ -46,7 +46,6 @@ namespace Deprecated {
///// REMOVE THIS AFTER RELEASE 3.1
///// REMOVE THIS AFTER RELEASE 3.1
////////////////////////////////////////////////////////
////////////////////////////////////////////////////////
// support old interface of the effective thermal conductivity laws
// support old interface of the effective thermal conductivity laws
template
<
class
VV
>
template
<
class
VV
>
struct
HasNewEffThermCondIF
struct
HasNewEffThermCondIF
...
@@ -118,6 +117,11 @@ auto neumann(const P& problem,
...
@@ -118,6 +117,11 @@ auto neumann(const P& problem,
return
problem
.
neumann
(
element
,
fvGeometry
,
elemVolVars
,
elemFluxVarsCache
,
scvf
);
return
problem
.
neumann
(
element
,
fvGeometry
,
elemVolVars
,
elemFluxVarsCache
,
scvf
);
}
}
constexpr
auto
hasEffTherCondImpl
=
Dumux
::
isValid
([](
auto
&&
v
)
->
decltype
(
v
.
effectiveThermalConductivity
()){
return
0
;});
template
<
class
VolumeVariables
>
constexpr
bool
hasEffTherCond
=
decltype
(
hasEffTherCondImpl
(
std
::
declval
<
VolumeVariables
>
())){};
constexpr
auto
hasEffDiffCoeffImpl
=
Dumux
::
isValid
([](
auto
&&
v
)
->
decltype
(
v
.
effectiveDiffusionCoefficient
(
0
,
0
,
0
)){
return
0
;});
template
<
class
VolumeVariables
>
constexpr
bool
hasEffDiffCoeff
=
decltype
(
hasEffDiffCoeffImpl
(
std
::
declval
<
VolumeVariables
>
())){};
////////////////////////////////////////////////////////
////////////////////////////////////////////////////////
////////////////////////////////////////////////////////
////////////////////////////////////////////////////////
...
...
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