Commit 60f1a416 authored by Martin Schneider's avatar Martin Schneider
Browse files

[macros] Use script to replace exercise macros

parent 0c8e99e3
...@@ -43,7 +43,7 @@ namespace Properties { ...@@ -43,7 +43,7 @@ namespace Properties {
// Create new type tags // Create new type tags
namespace TTag { namespace TTag {
struct Injection2p2c { using InheritsFrom = std::tuple<TwoPTwoC>; }; struct Injection2p2c { using InheritsFrom = std::tuple<TwoPTwoC>; };
struct Injection2p2cCC { using InheritsFrom = std::tuple<CCTpfaModel, Injection2p2c>; }; struct Injection2p2cCC { using InheritsFrom = std::tuple<Injection2p2c, CCTpfaModel>; };
} // end namespace TTag } // end namespace TTag
// Set the grid type // Set the grid type
......
...@@ -36,7 +36,6 @@ namespace Dumux { ...@@ -36,7 +36,6 @@ namespace Dumux {
template<class FVGridGeometry, class Scalar> template<class FVGridGeometry, class Scalar>
class OnePTestSpatialParams class OnePTestSpatialParams
: public FVSpatialParamsOneP<FVGridGeometry, Scalar, OnePTestSpatialParams<FVGridGeometry, Scalar>> : public FVSpatialParamsOneP<FVGridGeometry, Scalar, OnePTestSpatialParams<FVGridGeometry, Scalar>>
{
using GridView = typename FVGridGeometry::GridView; using GridView = typename FVGridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename FVGridGeometry::LocalView; using FVElementGeometry = typename FVGridGeometry::LocalView;
......
...@@ -35,24 +35,24 @@ namespace Dumux ...@@ -35,24 +35,24 @@ namespace Dumux
* using the n-phase immiscible fully implicit models. * using the n-phase immiscible fully implicit models.
*/ */
template<class TypeTag> template<class TypeTag>
class MyLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual) class MyLocalResidual : public GetPropType<TypeTag, Properties::BaseLocalResidual>
{ {
using ParentType = typename GET_PROP_TYPE(TypeTag, BaseLocalResidual); using ParentType = GetPropType<TypeTag, Properties::BaseLocalResidual>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem); using Problem = GetPropType<TypeTag, Properties::Problem>;
using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector); using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables)::LocalView; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables); using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GridFluxVariablesCache)::LocalView; using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView; using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView); using GridView = GetPropType<TypeTag, Properties::GridView>;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual); using EnergyLocalResidual = GetPropType<TypeTag, Properties::EnergyLocalResidual>;
using ModelTraits = typename GET_PROP_TYPE(TypeTag, ModelTraits); using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
static constexpr int numPhases = ModelTraits::numPhases(); static constexpr int numPhases = ModelTraits::numPhases();
static constexpr int conti0EqIdx = ModelTraits::Indices::conti0EqIdx; //!< first index for the mass balance static constexpr int conti0EqIdx = ModelTraits::Indices::conti0EqIdx; //!< first index for the mass balance
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment