Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
4171f665
Commit
4171f665
authored
Jul 30, 2019
by
Timo Koch
Committed by
Kilian Weishaupt
Jul 30, 2019
Browse files
[cleanup] Replace depr prop macros by GetPropType traits
parent
4cdfd163
Changes
4
Show whitespace changes
Inline
Side-by-side
dumux/discretization/ccmpfa.hh
View file @
4171f665
...
...
@@ -73,8 +73,8 @@ template<class TypeTag>
struct
PrimaryInteractionVolume
<
TypeTag
,
TTag
::
CCMpfaModel
>
{
private:
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
NodalIndexSet
=
typename
GET_PROP_TYPE
(
TypeTag
,
DualGridNodalIndexSet
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
NodalIndexSet
=
GetPropType
<
TypeTag
,
Properties
::
DualGridNodalIndexSet
>
;
// use the default traits
using
Traits
=
CCMpfaODefaultInteractionVolumeTraits
<
NodalIndexSet
,
Scalar
>
;
...
...
dumux/freeflow/rans/problem.hh
View file @
4171f665
...
...
@@ -42,7 +42,7 @@ class RANSProblemImpl;
//! the turbulence-model-specfic RANS problem
template
<
class
TypeTag
>
using
RANSProblem
=
RANSProblemImpl
<
TypeTag
,
G
ET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
turbulenceModel
()
>
;
using
RANSProblem
=
RANSProblemImpl
<
TypeTag
,
G
etPropType
<
TypeTag
,
Properties
::
ModelTraits
>
::
turbulenceModel
()
>
;
/*!
* \ingroup RANSModel
...
...
dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
View file @
4171f665
...
...
@@ -706,8 +706,8 @@ class StokesDarcyCouplingDataImplementation<MDTraits, CouplingManager, enableEne
using
DiffusionCoefficientAveragingType
=
typename
StokesDarcyCouplingOptions
::
DiffusionCoefficientAveragingType
;
static
constexpr
bool
isFicksLaw
=
IsFicksLaw
<
typename
GET_PROP_TYPE
(
SubDomainTypeTag
<
stokesIdx
>
,
MolecularDiffusionType
)
>
();
static_assert
(
isFicksLaw
==
IsFicksLaw
<
typename
GET_PROP_TYPE
(
SubDomainTypeTag
<
darcyIdx
>
,
MolecularDiffusionType
)
>
(),
static
constexpr
bool
isFicksLaw
=
IsFicksLaw
<
GetPropType
<
SubDomainTypeTag
<
stokesIdx
>
,
Properties
::
MolecularDiffusionType
>
>
();
static_assert
(
isFicksLaw
==
IsFicksLaw
<
GetPropType
<
SubDomainTypeTag
<
darcyIdx
>
,
Properties
::
MolecularDiffusionType
>
>
(),
"Both submodels must use the same diffusion law."
);
using
ReducedComponentVector
=
Dune
::
FieldVector
<
Scalar
,
numComponents
-
1
>
;
...
...
@@ -906,7 +906,7 @@ protected:
*/
Scalar
diffusionCoefficientMS_
(
const
VolumeVariables
<
darcyIdx
>&
volVars
,
int
phaseIdx
,
int
compIIdx
,
int
compJIdx
)
const
{
using
EffDiffModel
=
typename
GET_PROP_TYPE
(
SubDomainTypeTag
<
darcyIdx
>
,
EffectiveDiffusivityModel
)
;
using
EffDiffModel
=
GetPropType
<
SubDomainTypeTag
<
darcyIdx
>
,
Properties
::
EffectiveDiffusivityModel
>
;
auto
fluidState
=
volVars
.
fluidState
();
typename
FluidSystem
<
darcyIdx
>::
ParameterCache
paramCache
;
paramCache
.
updateAll
(
fluidState
);
...
...
test/porousmediumflow/tracer/2ptracer/main.cc
View file @
4171f665
...
...
@@ -220,7 +220,7 @@ int main(int argc, char** argv) try
// loop over elements to compute fluxes, saturations, densities for tracer
using
FluxVariables
=
typename
GET_PROP_TYPE
(
TwoPTypeTag
,
FluxVariables
)
;
using
FluxVariables
=
GetPropType
<
TwoPTypeTag
,
Properties
::
FluxVariables
>
;
auto
upwindTerm
=
[](
const
auto
&
volVars
)
{
return
volVars
.
mobility
(
0
);
};
for
(
const
auto
&
element
:
elements
(
leafGridView
))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment