diff --git a/dumux/implicit/2pminc/2pmincproperties.hh b/dumux/implicit/2pminc/2pmincproperties.hh index 00b3a2c9ed26d48c7cc27bd5379feab4d389edb1..9e231fb9f4fcb55f38004cedfb5c870d0bf73958 100644 --- a/dumux/implicit/2pminc/2pmincproperties.hh +++ b/dumux/implicit/2pminc/2pmincproperties.hh @@ -36,7 +36,8 @@ namespace Properties ////////////////////////////////////////////////////////////////// //! The type tag for the two-phase minc model with BOX discretization -NEW_TYPE_TAG(BoxTwoPMinc, INHERITS_FROM(BoxTwoP)); +NEW_TYPE_TAG(TwoPMinc); +NEW_TYPE_TAG(BoxTwoPMinc, INHERITS_FROM(BoxTwoP, TwoPMinc)); ////////////////////////////////////////////////////////////////// // Property tags diff --git a/dumux/implicit/2pminc/2pmincpropertydefaults.hh b/dumux/implicit/2pminc/2pmincpropertydefaults.hh index 9e3c0beae063be60c3a71e1df3212e6a21001366..8d186b51a65f68766588b3ce792b2948dbaabd72 100644 --- a/dumux/implicit/2pminc/2pmincpropertydefaults.hh +++ b/dumux/implicit/2pminc/2pmincpropertydefaults.hh @@ -44,29 +44,29 @@ namespace Properties // Property values ////////////////////////////////////////////////////////////////// //! Use the 2pminc local jacobian operator for the 2pminc model -SET_TYPE_PROP(BoxTwoPMinc, +SET_TYPE_PROP(TwoPMinc, LocalResidual, TwoPMincLocalResidual<TypeTag>); //! the Model property -SET_TYPE_PROP(BoxTwoPMinc, Model, TwoPMincModel<TypeTag>); +SET_TYPE_PROP(TwoPMinc, Model, TwoPMincModel<TypeTag>); //! the VolumeVariables property -SET_TYPE_PROP(BoxTwoPMinc, VolumeVariables, TwoPMincVolumeVariables<TypeTag>); +SET_TYPE_PROP(TwoPMinc, VolumeVariables, TwoPMincVolumeVariables<TypeTag>); //! the FluxVariables property -SET_TYPE_PROP(BoxTwoPMinc, FluxVariables, TwoPMincFluxVariables<TypeTag>); +SET_TYPE_PROP(TwoPMinc, FluxVariables, TwoPMincFluxVariables<TypeTag>); //! The Indices property -SET_TYPE_PROP(BoxTwoPMinc, +SET_TYPE_PROP(TwoPMinc, Indices, TwoPMincIndices<TypeTag, GET_PROP_VALUE(TypeTag, Formulation), 0>); //! Set the number of continua to 2 -SET_INT_PROP(BoxTwoPMinc, NumContinua, 2); +SET_INT_PROP(TwoPMinc, NumContinua, 2); //! Set the default inteaction type to constant volume fractions -SET_INT_PROP(BoxTwoPMinc, ProblemInteractingContinuaType, 0); +SET_INT_PROP(TwoPMinc, ProblemInteractingContinuaType, 0); } } #endif