diff --git a/dumux/decoupled/2p/2pproperties.hh b/dumux/decoupled/2p/2pproperties.hh index 2cbaeab7693284a2f3bd3d9b1a3e28d10b5e1a29..ae72ba22a2286888336b0390bf08e35085f17a0b 100644 --- a/dumux/decoupled/2p/2pproperties.hh +++ b/dumux/decoupled/2p/2pproperties.hh @@ -193,7 +193,17 @@ public: typedef Dune::BiCGSTABSolver<Vector> type; // typedef Dune::CGSolver<Vector> type; }; +SET_PROP_DEFAULT(LocalStiffness) +{ +private: + typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView; + typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; + typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) Variables; + typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem; +public: + typedef MimeticGroundwaterEquationLocalStiffness<GridView,Scalar,Variables, Problem> type; +}; //SET_INT_PROP(DecoupledTwoP, PressurePreconditioner, SolverIndices::seqILU0); //SET_INT_PROP(DecoupledTwoP, PressureSolver, SolverIndices::biCGSTAB); SET_SCALAR_PROP(DecoupledTwoP, ReductionSolver, 1E-12); diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh index 6ced5b3adad5a3182abd1cd82de0d2f8c9fcd38d..293d0e5c01f42c031cbdd30408aab49a44169d0b 100644 --- a/dumux/decoupled/common/decoupledproperties.hh +++ b/dumux/decoupled/common/decoupledproperties.hh @@ -98,19 +98,6 @@ public: //! Use the parent VariableClass SET_TYPE_PROP(DecoupledModel, Variables, VariableClass<TypeTag>); -//! TODO: could this be moved (with includes) to /2p/2pproperties.hh ?? -SET_PROP_DEFAULT(LocalStiffness) -{ -private: - typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView; - typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; - typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) Variables; - typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem; - -public: - typedef MimeticGroundwaterEquationLocalStiffness<GridView,Scalar,Variables, Problem> type; -}; - /*! * \brief Specifies the types which are assoicated with a solution. *