boxproperties: introduce property BaseModel

boxpropertydefaults: set default of BaseModel to BoxModel
2p box model: derive from BaseModel instead of explicitly deriving from
BoxModel. Enable output of element data in addition to vertex data.

Reviewed by Christoph.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8068 2fb0f335-1f38-0410-981e-8018bf24f1b0

dumux/boxmodels/common/boxproperties.hh

@@ -64,7 +64,8 @@ NEW_PROP_TAG(GridView); //!< The type of the grid view
 NEW_PROP_TAG(FVElementGeometry); //! The type of the finite-volume geometry in the box scheme
 
 NEW_PROP_TAG(Problem); //!< The type of the problem
-NEW_PROP_TAG(Model); //!< The type of the discretization
+NEW_PROP_TAG(BaseModel); //!< The type of the base class of the model
+NEW_PROP_TAG(Model); //!< The type of the model
 NEW_PROP_TAG(NumEq); //!< Number of equations in the system of PDEs
 NEW_PROP_TAG(BaseLocalResidual); //!< The type of the base class of the local residual
 NEW_PROP_TAG(LocalResidual); //!< The type of the local residual function

dumux/boxmodels/common/boxpropertydefaults.hh

@@ -35,6 +35,7 @@
 #include <dumux/nonlinear/newtoncontroller.hh>
 
 #include "boxassembler.hh"
+#include "boxmodel.hh"
 #include "boxfvelementgeometry.hh"
 #include "boxelementboundarytypes.hh"
 #include "boxlocaljacobian.hh"
@@ -51,6 +52,10 @@
 
 namespace Dumux {
 
+// forward declaration
+template<class TypeTag>
+class BoxModel;
+
 namespace Properties {
 //////////////////////////////////////////////////////////////////
 // Some defaults for very fundamental properties
@@ -98,6 +103,9 @@ SET_TYPE_PROP(BoxModel, DofMapper, typename GET_PROP_TYPE(TypeTag, VertexMapper)
 //! Set the BaseLocalResidual to BoxLocalResidual
 SET_TYPE_PROP(BoxModel, BaseLocalResidual, Dumux::BoxLocalResidual<TypeTag>);
 
+//! Set the BaseModel to BoxModel
+SET_TYPE_PROP(BoxModel, BaseModel, Dumux::BoxModel<TypeTag>);
+
 //! The local jacobian operator for the box scheme
 SET_TYPE_PROP(BoxModel, LocalJacobian, Dumux::BoxLocalJacobian<TypeTag>);