Skip to content
GitLab
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
8d771acd
Commit
8d771acd
authored
Oct 31, 2018
by
Melanie Lipp
Browse files
Remove TypeTag from Problem-specific TypeTag definitions.
parent
32ac97e0
Changes
151
Hide whitespace changes
Inline
Side-by-side
dumux/porousmediumflow/sequential/gridadaptproperties.hh
View file @
8d771acd
...
...
@@ -43,7 +43,7 @@ class GridAdapt;
namespace
Properties
{
//! Grid adaption type tag for all sequential models.
NEW_TYPE_TAG
(
GridAdapt
TypeTag
);
NEW_TYPE_TAG
(
GridAdapt
);
//! Defines if the grid is h-adaptive
NEW_PROP_TAG
(
AdaptiveGrid
);
...
...
@@ -64,17 +64,17 @@ NEW_PROP_TAG(GridAdaptRefineThreshold);
NEW_PROP_TAG
(
GridAdaptCoarsenThreshold
);
//no adaptive grid
SET_BOOL_PROP
(
GridAdapt
TypeTag
,
AdaptiveGrid
,
false
);
SET_BOOL_PROP
(
GridAdapt
,
AdaptiveGrid
,
false
);
//Set default class for adaptation initialization indicator
SET_TYPE_PROP
(
GridAdapt
TypeTag
,
AdaptionInitializationIndicator
,
GridAdaptInitializationIndicatorDefault
<
TypeTag
>
);
SET_TYPE_PROP
(
GridAdapt
,
AdaptionInitializationIndicator
,
GridAdaptInitializationIndicatorDefault
<
TypeTag
>
);
//Set default class for adaptation
SET_TYPE_PROP
(
GridAdapt
TypeTag
,
GridAdaptModel
,
GridAdapt
<
TypeTag
,
GET_PROP_VALUE
(
TypeTag
,
AdaptiveGrid
)
>
);
SET_TYPE_PROP
(
GridAdapt
,
GridAdaptModel
,
GridAdapt
<
TypeTag
,
GET_PROP_VALUE
(
TypeTag
,
AdaptiveGrid
)
>
);
//standard setting
SET_SCALAR_PROP
(
GridAdapt
TypeTag
,
GridAdaptRefineThreshold
,
0.0
);
SET_SCALAR_PROP
(
GridAdapt
TypeTag
,
GridAdaptCoarsenThreshold
,
0.0
);
SET_SCALAR_PROP
(
GridAdapt
,
GridAdaptRefineThreshold
,
0.0
);
SET_SCALAR_PROP
(
GridAdapt
,
GridAdaptCoarsenThreshold
,
0.0
);
}
// namespace Properties
}
// namespace Dumux
...
...
dumux/porousmediumflow/sequential/properties.hh
View file @
8d771acd
...
...
@@ -46,7 +46,7 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! Create a type tag for all sequential models
NEW_TYPE_TAG
(
SequentialModel
,
INHERITS_FROM
(
ModelProperties
,
GridAdapt
TypeTag
,
GridProperties
));
NEW_TYPE_TAG
(
SequentialModel
,
INHERITS_FROM
(
ModelProperties
,
GridAdapt
,
GridProperties
));
//////////////////////////////////////////////////////////////////
// Property tags
...
...
test/common/propertysystem/test_propertysystem.cc
View file @
8d771acd
...
...
@@ -54,7 +54,7 @@ struct Grid { };
struct
CCTpfaDisc
{
using
InheritsFrom
=
std
::
tuple
<
Grid
,
Base
>
;
};
struct
BoxDisc
{
using
InheritsFrom
=
std
::
tuple
<
Grid
,
Base
>
;
};
struct
OnePModel
{
using
InheritsFrom
=
std
::
tuple
<
Base
>
;
};
struct
OnePTest
TypeTag
{
using
InheritsFrom
=
std
::
tuple
<
OnePModel
,
BoxDisc
>
;
};
struct
OnePTest
{
using
InheritsFrom
=
std
::
tuple
<
OnePModel
,
BoxDisc
>
;
};
}
// end namespace TTag
...
...
@@ -66,7 +66,7 @@ template<class TypeTag>
struct
Scalar
<
TypeTag
,
TTag
::
OnePModel
>
{
using
type
=
double
;
};
template
<
class
TypeTag
>
struct
Scalar
<
TypeTag
,
TTag
::
OnePTest
TypeTag
>
{
using
type
=
int
;
};
struct
Scalar
<
TypeTag
,
TTag
::
OnePTest
>
{
using
type
=
int
;
};
template
<
class
TypeTag
>
struct
CoordinateType
<
TypeTag
,
TTag
::
Grid
>
{
using
type
=
GetPropType
<
TypeTag
,
Scalar
>
;
};
...
...
@@ -86,9 +86,9 @@ int main(int argc, char* argv[]) try
DUNE_THROW
(
Dune
::
InvalidStateException
,
"Property Scalar in TTag::Base should be float but is "
<<
Dune
::
className
<
Scalar
>
());
}
{
using
Scalar
=
GetPropType
<
TTag
::
OnePTest
TypeTag
,
Scalar
>
;
using
Scalar
=
GetPropType
<
TTag
::
OnePTest
,
Scalar
>
;
if
(
!
std
::
is_same
<
Scalar
,
int
>::
value
)
DUNE_THROW
(
Dune
::
InvalidStateException
,
"Property Scalar in TTag::OnePTest
TypeTag
should be int but is "
<<
Dune
::
className
<
Scalar
>
());
DUNE_THROW
(
Dune
::
InvalidStateException
,
"Property Scalar in TTag::OnePTest should be int but is "
<<
Dune
::
className
<
Scalar
>
());
}
{
using
Scalar
=
GetPropType
<
TTag
::
OnePModel
,
Scalar
>
;
...
...
@@ -96,9 +96,9 @@ int main(int argc, char* argv[]) try
DUNE_THROW
(
Dune
::
InvalidStateException
,
"Property Scalar in TTag::OnePModel should be double but is "
<<
Dune
::
className
<
Scalar
>
());
}
{
using
CoordinateType
=
GetPropType
<
TTag
::
OnePTest
TypeTag
,
CoordinateType
>
;
using
CoordinateType
=
GetPropType
<
TTag
::
OnePTest
,
CoordinateType
>
;
if
(
!
std
::
is_same
<
CoordinateType
,
int
>::
value
)
DUNE_THROW
(
Dune
::
InvalidStateException
,
"Property CoordinateType in TTag::OnePTest
TypeTag
should be int but is "
<<
Dune
::
className
<
CoordinateType
>
());
DUNE_THROW
(
Dune
::
InvalidStateException
,
"Property CoordinateType in TTag::OnePTest should be int but is "
<<
Dune
::
className
<
CoordinateType
>
());
}
{
using
CoordinateType
=
GetPropType
<
TTag
::
CCTpfaDisc
,
CoordinateType
>
;
...
...
test/freeflow/navierstokes/angelitestproblem.hh
View file @
8d771acd
...
...
@@ -41,10 +41,10 @@ class AngeliTestProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
AngeliTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
AngeliTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
// the fluid system
SET_PROP
(
AngeliTest
TypeTag
,
FluidSystem
)
SET_PROP
(
AngeliTest
,
FluidSystem
)
{
private:
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
...
...
@@ -53,15 +53,15 @@ public:
};
// Set the grid type
SET_TYPE_PROP
(
AngeliTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
,
Dune
::
EquidistantOffsetCoordinates
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
2
>
>
);
SET_TYPE_PROP
(
AngeliTest
,
Grid
,
Dune
::
YaspGrid
<
2
,
Dune
::
EquidistantOffsetCoordinates
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
2
>
>
);
// Set the problem property
SET_TYPE_PROP
(
AngeliTest
TypeTag
,
Problem
,
Dumux
::
AngeliTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
AngeliTest
,
Problem
,
Dumux
::
AngeliTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
AngeliTest
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
AngeliTest
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
AngeliTest
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
AngeliTest
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
AngeliTest
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
AngeliTest
,
EnableGridVolumeVariablesCache
,
true
);
}
...
...
test/freeflow/navierstokes/channeltestproblem.hh
View file @
8d771acd
...
...
@@ -42,13 +42,13 @@ class ChannelTestProblem;
namespace
Properties
{
#if !NONISOTHERMAL
NEW_TYPE_TAG
(
ChannelTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
ChannelTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
#else
NEW_TYPE_TAG
(
ChannelTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNI
));
NEW_TYPE_TAG
(
ChannelTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNI
));
#endif
// the fluid system
SET_PROP
(
ChannelTest
TypeTag
,
FluidSystem
)
SET_PROP
(
ChannelTest
,
FluidSystem
)
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
#if NONISOTHERMAL
...
...
@@ -59,15 +59,15 @@ SET_PROP(ChannelTestTypeTag, FluidSystem)
};
// Set the grid type
SET_TYPE_PROP
(
ChannelTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
ChannelTest
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
// Set the problem property
SET_TYPE_PROP
(
ChannelTest
TypeTag
,
Problem
,
Dumux
::
ChannelTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
ChannelTest
,
Problem
,
Dumux
::
ChannelTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
ChannelTest
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
ChannelTest
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
ChannelTest
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
ChannelTest
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
ChannelTest
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
ChannelTest
,
EnableGridVolumeVariablesCache
,
true
);
}
/*!
...
...
test/freeflow/navierstokes/closedsystemtestproblem.hh
View file @
8d771acd
...
...
@@ -40,25 +40,25 @@ class ClosedSystemTestProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
ClosedSystemTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
ClosedSystemTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
// the fluid system
SET_PROP
(
ClosedSystemTest
TypeTag
,
FluidSystem
)
SET_PROP
(
ClosedSystemTest
,
FluidSystem
)
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
type
=
FluidSystems
::
OnePLiquid
<
Scalar
,
Components
::
Constant
<
1
,
Scalar
>
>
;
};
// Set the grid type
SET_TYPE_PROP
(
ClosedSystemTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
ClosedSystemTest
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
// Set the problem property
SET_TYPE_PROP
(
ClosedSystemTest
TypeTag
,
Problem
,
Dumux
::
ClosedSystemTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
ClosedSystemTest
,
Problem
,
Dumux
::
ClosedSystemTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
ClosedSystemTest
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
ClosedSystemTest
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
ClosedSystemTest
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
ClosedSystemTest
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
ClosedSystemTest
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
ClosedSystemTest
,
EnableGridVolumeVariablesCache
,
true
);
}
...
...
test/freeflow/navierstokes/doneatestproblem.hh
View file @
8d771acd
...
...
@@ -46,25 +46,25 @@ class DoneaTestProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
DoneaTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
DoneaTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
// the fluid system
SET_PROP
(
DoneaTest
TypeTag
,
FluidSystem
)
SET_PROP
(
DoneaTest
,
FluidSystem
)
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
type
=
FluidSystems
::
OnePLiquid
<
Scalar
,
Components
::
Constant
<
1
,
Scalar
>
>
;
};
// Set the grid type
SET_TYPE_PROP
(
DoneaTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
DoneaTest
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
// Set the problem property
SET_TYPE_PROP
(
DoneaTest
TypeTag
,
Problem
,
Dumux
::
DoneaTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
DoneaTest
,
Problem
,
Dumux
::
DoneaTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
DoneaTest
TypeTag
,
EnableFVGridGeometryCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
TypeTag
,
EnableGridFluxVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
TypeTag
,
EnableGridVolumeVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
TypeTag
,
EnableGridFaceVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
,
EnableFVGridGeometryCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
,
EnableGridFluxVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
,
EnableGridVolumeVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
DoneaTest
,
EnableGridFaceVariablesCache
,
ENABLECACHING
);
}
/*!
...
...
test/freeflow/navierstokes/kovasznaytestproblem.hh
View file @
8d771acd
...
...
@@ -41,25 +41,25 @@ class KovasznayTestProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
KovasznayTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
KovasznayTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
// the fluid system
SET_PROP
(
KovasznayTest
TypeTag
,
FluidSystem
)
SET_PROP
(
KovasznayTest
,
FluidSystem
)
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
type
=
FluidSystems
::
OnePLiquid
<
Scalar
,
Components
::
Constant
<
1
,
Scalar
>
>
;
};
// Set the grid type
SET_TYPE_PROP
(
KovasznayTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
,
Dune
::
EquidistantOffsetCoordinates
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
2
>
>
);
SET_TYPE_PROP
(
KovasznayTest
,
Grid
,
Dune
::
YaspGrid
<
2
,
Dune
::
EquidistantOffsetCoordinates
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
2
>
>
);
// Set the problem property
SET_TYPE_PROP
(
KovasznayTest
TypeTag
,
Problem
,
Dumux
::
KovasznayTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
KovasznayTest
,
Problem
,
Dumux
::
KovasznayTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
KovasznayTest
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
KovasznayTest
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
KovasznayTest
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
KovasznayTest
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
KovasznayTest
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
KovasznayTest
,
EnableGridVolumeVariablesCache
,
true
);
}
/*!
...
...
test/freeflow/navierstokes/navierstokesanalyticproblem.hh
View file @
8d771acd
...
...
@@ -44,27 +44,27 @@ class NavierStokesAnalyticProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
NavierStokesAnalytic
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
NavierStokesAnalytic
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
// the fluid system
SET_PROP
(
NavierStokesAnalytic
TypeTag
,
FluidSystem
)
SET_PROP
(
NavierStokesAnalytic
,
FluidSystem
)
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
type
=
FluidSystems
::
OnePLiquid
<
Scalar
,
Components
::
Constant
<
1
,
Scalar
>
>
;
};
// Set the grid type
SET_TYPE_PROP
(
NavierStokesAnalytic
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
1
>
);
SET_TYPE_PROP
(
NavierStokesAnalytic
,
Grid
,
Dune
::
YaspGrid
<
1
>
);
// Set the problem property
SET_TYPE_PROP
(
NavierStokesAnalytic
TypeTag
,
Problem
,
Dumux
::
NavierStokesAnalyticProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
NavierStokesAnalytic
,
Problem
,
Dumux
::
NavierStokesAnalyticProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
NavierStokesAnalytic
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
NavierStokesAnalytic
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
NavierStokesAnalytic
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
NavierStokesAnalytic
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
NavierStokesAnalytic
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
NavierStokesAnalytic
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
NavierStokesAnalytic
TypeTag
,
NormalizePressure
,
false
);
SET_BOOL_PROP
(
NavierStokesAnalytic
,
NormalizePressure
,
false
);
}
/*!
...
...
test/freeflow/navierstokes/stokeschannel3dproblem.hh
View file @
8d771acd
...
...
@@ -51,10 +51,10 @@ class ThreeDChannelTestProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
ThreeDChannelTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
NEW_TYPE_TAG
(
ThreeDChannelTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokes
));
// the fluid system
SET_PROP
(
ThreeDChannelTest
TypeTag
,
FluidSystem
)
SET_PROP
(
ThreeDChannelTest
,
FluidSystem
)
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
type
=
FluidSystems
::
OnePLiquid
<
Scalar
,
Components
::
Constant
<
1
,
Scalar
>
>
;
...
...
@@ -62,17 +62,17 @@ SET_PROP(ThreeDChannelTestTypeTag, FluidSystem)
// Set the grid type
#if DIM_3D
SET_TYPE_PROP
(
ThreeDChannelTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
3
>
);
SET_TYPE_PROP
(
ThreeDChannelTest
,
Grid
,
Dune
::
YaspGrid
<
3
>
);
#else
SET_TYPE_PROP
(
ThreeDChannelTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
ThreeDChannelTest
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
#endif
// Set the problem property
SET_TYPE_PROP
(
ThreeDChannelTest
TypeTag
,
Problem
,
ThreeDChannelTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
ThreeDChannelTest
,
Problem
,
ThreeDChannelTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
ThreeDChannelTest
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
ThreeDChannelTest
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
ThreeDChannelTest
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
ThreeDChannelTest
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
ThreeDChannelTest
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
ThreeDChannelTest
,
EnableGridVolumeVariablesCache
,
true
);
}
/*!
...
...
test/freeflow/navierstokes/test_angeli.cc
View file @
8d771acd
...
...
@@ -89,7 +89,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
AngeliTest
TypeTag
);
using
TypeTag
=
TTAG
(
AngeliTest
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokes/test_channel.cc
View file @
8d771acd
...
...
@@ -91,7 +91,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
ChannelTest
TypeTag
);
using
TypeTag
=
TTAG
(
ChannelTest
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokes/test_closedsystem.cc
View file @
8d771acd
...
...
@@ -88,7 +88,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
ClosedSystemTest
TypeTag
);
using
TypeTag
=
TTAG
(
ClosedSystemTest
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokes/test_donea.cc
View file @
8d771acd
...
...
@@ -90,7 +90,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
DoneaTest
TypeTag
);
using
TypeTag
=
TTAG
(
DoneaTest
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokes/test_kovasznay.cc
View file @
8d771acd
...
...
@@ -88,7 +88,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
KovasznayTest
TypeTag
);
using
TypeTag
=
TTAG
(
KovasznayTest
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokes/test_navierstokes_1d.cc
View file @
8d771acd
...
...
@@ -77,7 +77,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
NavierStokesAnalytic
TypeTag
);
using
TypeTag
=
TTAG
(
NavierStokesAnalytic
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokes/test_stokes_channel_3d.cc
View file @
8d771acd
...
...
@@ -83,7 +83,7 @@ int main(int argc, char** argv) try
using
namespace
Dumux
;
// define the type tag for this problem
using
TypeTag
=
TTAG
(
ThreeDChannelTest
TypeTag
);
using
TypeTag
=
TTAG
(
ThreeDChannelTest
);
// initialize MPI, finalize is done automatically on exit
const
auto
&
mpiHelper
=
Dune
::
MPIHelper
::
instance
(
argc
,
argv
);
...
...
test/freeflow/navierstokesnc/channeltestproblem.hh
View file @
8d771acd
...
...
@@ -47,37 +47,37 @@ class ChannelNCTestProblem;
namespace
Properties
{
#if !NONISOTHERMAL
NEW_TYPE_TAG
(
ChannelNCTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
NEW_TYPE_TAG
(
ChannelNCTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
#else
NEW_TYPE_TAG
(
ChannelNCTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNCNI
));
NEW_TYPE_TAG
(
ChannelNCTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNCNI
));
#endif
// Select the fluid system
SET_PROP
(
ChannelNCTest
TypeTag
,
FluidSystem
)
SET_PROP
(
ChannelNCTest
,
FluidSystem
)
{
using
H2OAir
=
FluidSystems
::
H2OAir
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
;
static
constexpr
int
phaseIdx
=
H2OAir
::
liquidPhaseIdx
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2OAir
,
phaseIdx
>
;
};
SET_INT_PROP
(
ChannelNCTest
TypeTag
,
ReplaceCompEqIdx
,
0
);
SET_INT_PROP
(
ChannelNCTest
,
ReplaceCompEqIdx
,
0
);
// Set the grid type
SET_TYPE_PROP
(
ChannelNCTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
ChannelNCTest
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
// Set the problem property
SET_TYPE_PROP
(
ChannelNCTest
TypeTag
,
Problem
,
Dumux
::
ChannelNCTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
ChannelNCTest
,
Problem
,
Dumux
::
ChannelNCTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
ChannelNCTest
TypeTag
,
EnableFVGridGeometryCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
TypeTag
,
EnableGridFluxVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
TypeTag
,
EnableGridVolumeVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
TypeTag
,
EnableGridFaceVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
,
EnableFVGridGeometryCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
,
EnableGridFluxVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
,
EnableGridVolumeVariablesCache
,
ENABLECACHING
);
SET_BOOL_PROP
(
ChannelNCTest
,
EnableGridFaceVariablesCache
,
ENABLECACHING
);
// Use mole fraction formulation
#if USE_MASS
SET_BOOL_PROP
(
ChannelNCTest
TypeTag
,
UseMoles
,
false
);
SET_BOOL_PROP
(
ChannelNCTest
,
UseMoles
,
false
);
#else
SET_BOOL_PROP
(
ChannelNCTest
TypeTag
,
UseMoles
,
true
);
SET_BOOL_PROP
(
ChannelNCTest
,
UseMoles
,
true
);
#endif
}
...
...
test/freeflow/navierstokesnc/densityflowproblem.hh
View file @
8d771acd
...
...
@@ -42,30 +42,30 @@ class DensityDrivenFlowProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
DensityDrivenFlow
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
NEW_TYPE_TAG
(
DensityDrivenFlow
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
// Select the fluid system
SET_PROP
(
DensityDrivenFlow
TypeTag
,
FluidSystem
)
SET_PROP
(
DensityDrivenFlow
,
FluidSystem
)
{
using
H2OAir
=
FluidSystems
::
H2OAir
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
;
static
constexpr
int
phaseIdx
=
H2OAir
::
liquidPhaseIdx
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2OAir
,
phaseIdx
>
;
};
SET_INT_PROP
(
DensityDrivenFlow
TypeTag
,
ReplaceCompEqIdx
,
0
);
SET_INT_PROP
(
DensityDrivenFlow
,
ReplaceCompEqIdx
,
0
);
// Set the grid type
SET_TYPE_PROP
(
DensityDrivenFlow
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
DensityDrivenFlow
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
// Set the problem property
SET_TYPE_PROP
(
DensityDrivenFlow
TypeTag
,
Problem
,
Dumux
::
DensityDrivenFlowProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
DensityDrivenFlow
,
Problem
,
Dumux
::
DensityDrivenFlowProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
DensityDrivenFlow
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
TypeTag
,
UseMoles
,
true
);
SET_BOOL_PROP
(
DensityDrivenFlow
,
UseMoles
,
true
);
}
/*!
...
...
test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
View file @
8d771acd
...
...
@@ -44,26 +44,26 @@ class MaxwellStefanNCTestProblem;
namespace
Properties
{
NEW_TYPE_TAG
(
MaxwellStefanNCTest
TypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
NEW_TYPE_TAG
(
MaxwellStefanNCTest
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
SET_INT_PROP
(
MaxwellStefanNCTest
TypeTag
,
ReplaceCompEqIdx
,
0
);
SET_INT_PROP
(
MaxwellStefanNCTest
,
ReplaceCompEqIdx
,
0
);
// Set the grid type
SET_TYPE_PROP
(
MaxwellStefanNCTest
TypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
SET_TYPE_PROP
(
MaxwellStefanNCTest
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
// Set the problem property
SET_TYPE_PROP
(
MaxwellStefanNCTest
TypeTag
,
Problem
,
Dumux
::
MaxwellStefanNCTestProblem
<
TypeTag
>
);
SET_TYPE_PROP
(
MaxwellStefanNCTest
,
Problem
,
Dumux
::
MaxwellStefanNCTestProblem
<
TypeTag
>
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
TypeTag
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
,
EnableFVGridGeometryCache
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
TypeTag
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
TypeTag
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
,
EnableGridFluxVariablesCache
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
,
EnableGridVolumeVariablesCache
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
TypeTag
,
UseMoles
,
true
);
SET_BOOL_PROP
(
MaxwellStefanNCTest
,
UseMoles
,
true
);
//! Here we set FicksLaw or MaxwellStefansLaw
SET_TYPE_PROP
(
MaxwellStefanNCTest
TypeTag
,
MolecularDiffusionType
,
MaxwellStefansLaw
<
TypeTag
>
);
SET_TYPE_PROP
(
MaxwellStefanNCTest
,
MolecularDiffusionType
,
MaxwellStefansLaw
<
TypeTag
>
);
/*!
...
...
@@ -181,7 +181,7 @@ public:
}
};
SET_TYPE_PROP
(
MaxwellStefanNCTest
TypeTag
,
FluidSystem
,
MaxwellStefanFluidSystem
<
TypeTag
>
);
SET_TYPE_PROP
(
MaxwellStefanNCTest
,
FluidSystem
,
MaxwellStefanFluidSystem
<
TypeTag
>
);
}
//end namespace Property
/*!
...
...
Prev
1
2
3
4
5
…
8
Next
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment