diff --git a/dumux/implicit/box/boxfvelementgeometry.hh b/dumux/implicit/box/boxfvelementgeometry.hh index fd0b5c89e2042c345529f0d9c7534e608d98aedf..db674645941f728837bc572cdca3b2b9fca771ff 100644 --- a/dumux/implicit/box/boxfvelementgeometry.hh +++ b/dumux/implicit/box/boxfvelementgeometry.hh @@ -321,6 +321,7 @@ class BoxFVElementGeometry typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GridView::ctype CoordScalar; typedef typename GridView::Traits::template Codim<0>::Entity Element; + typedef typename GridView::Traits::template Codim<0>::EntityPointer ElementPointer; typedef typename Element::Geometry Geometry; typedef Dune::FieldVector<Scalar,dimWorld> Vector; typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition; @@ -587,7 +588,8 @@ public: int numFaces; //!< number of faces (0 in < 3D) int numSCV; //!< number of subcontrol volumes int numFAP; //!< number of flux approximation points - + std::vector<ElementPointer> neighbors; //!< needed for compatibility with cc models + const LocalFiniteElementCache feCache_; void update(const GridView& gridView, const Element& element) diff --git a/dumux/implicit/box/boxproperties.hh b/dumux/implicit/box/boxproperties.hh index 9fd7fffa05baccd592c719d7b8a1b22552dbda67..f0d72d6be19417e72f9b3727c75026ef39465e8d 100644 --- a/dumux/implicit/box/boxproperties.hh +++ b/dumux/implicit/box/boxproperties.hh @@ -127,13 +127,16 @@ NEW_PROP_TAG(ImplicitUseTwoPointFlux); // mappers from local to global indices -//! maper for vertices +//! mapper for vertices NEW_PROP_TAG(VertexMapper); -//! maper for elements +//! mapper for elements NEW_PROP_TAG(ElementMapper); -//! maper for degrees of freedom +//! mapper for degrees of freedom NEW_PROP_TAG(DofMapper); +//! indicate whether discretization is box or not +NEW_PROP_TAG(ImplicitIsBox); + } } diff --git a/dumux/implicit/box/boxpropertydefaults.hh b/dumux/implicit/box/boxpropertydefaults.hh index 50ec31e2c739645f2125237261153b82f95a6dfd..e2c01bf226b95bbf55c2321c627f6481bcf1b9fb 100644 --- a/dumux/implicit/box/boxpropertydefaults.hh +++ b/dumux/implicit/box/boxpropertydefaults.hh @@ -201,6 +201,9 @@ SET_INT_PROP(BoxModel, LinearSolverMaxIterations, 250); //! set number of equations of the mathematical model as default SET_INT_PROP(BoxModel, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, NumEq)); +//! indicate that this is a box discretization +SET_BOOL_PROP(BoxModel, ImplicitIsBox, true); + } // namespace Properties } // namespace Dumux diff --git a/dumux/implicit/cellcentered/ccproperties.hh b/dumux/implicit/cellcentered/ccproperties.hh index 7666f5d4c8a50339dbf6acf82f6caff311fd2f87..061ad3551e54bfada5f08c968ed9f9628fa55efe 100644 --- a/dumux/implicit/cellcentered/ccproperties.hh +++ b/dumux/implicit/cellcentered/ccproperties.hh @@ -128,12 +128,16 @@ NEW_PROP_TAG(ImplicitEnableHints); // mappers from local to global indices -//! maper for vertices +//! mapper for vertices NEW_PROP_TAG(VertexMapper); -//! maper for elements +//! mapper for elements NEW_PROP_TAG(ElementMapper); -//! maper for degrees of freedom +//! mapper for degrees of freedom NEW_PROP_TAG(DofMapper); + +//! indicate whether discretization is box or not +NEW_PROP_TAG(ImplicitIsBox); + } } diff --git a/dumux/implicit/cellcentered/ccpropertydefaults.hh b/dumux/implicit/cellcentered/ccpropertydefaults.hh index d36ae8a9d4ca1f877d4771265d906d4161f87aa9..8ede91add483cbe1eaad2d5e15b170b314584e7d 100644 --- a/dumux/implicit/cellcentered/ccpropertydefaults.hh +++ b/dumux/implicit/cellcentered/ccpropertydefaults.hh @@ -203,6 +203,8 @@ SET_INT_PROP(CCModel, LinearSolverMaxIterations, 250); //! set number of equations of the mathematical model as default SET_INT_PROP(CCModel, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, NumEq)); +//! indicate that this is no box discretization +SET_BOOL_PROP(CCModel, ImplicitIsBox, false); } // namespace Properties } // namespace Dumux