diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 7c42f722100e9da09a8675d4eafd369d7cdff80c..61edb45a3afd65bb818588b13856ea8026a3a74e 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -46,8 +46,7 @@
#include <dumux/discretization/staggered/globalfacevariables.hh>
#include <dumux/discretization/staggered/facesolution.hh>
#include <dumux/discretization/staggered/elementfacevariables.hh>
-#include <dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
-#include <dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh>
+#include <dumux/discretization/staggered/subcontrolvolumeface.hh>
#include <dumux/common/intersectionmapper.hh>
#include <dune/istl/multitypeblockvector.hh>
@@ -128,7 +127,7 @@ SET_PROP(StaggeredModel, StaggeredGeometryHelper)
private:
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
public:
- using type = StaggeredGeometryHelper<GridView>;
+ using type = BaseStaggeredGeometryHelper<GridView>;
};
SET_TYPE_PROP(StaggeredModel, GlobalFaceVars, StaggeredGlobalFaceVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFaceVariablesCache)>);
diff --git a/dumux/discretization/staggered/subcontrolvolumeface.hh b/dumux/discretization/staggered/subcontrolvolumeface.hh
new file mode 100644
index 0000000000000000000000000000000000000000..834555d726a723e6c3107f0c3c54db6d3c736ec5
--- /dev/null
+++ b/dumux/discretization/staggered/subcontrolvolumeface.hh
@@ -0,0 +1,232 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Base class for a sub control volume face
+ */
+#ifndef DUMUX_DISCRETIZATION_STAGGERED_SUBCONTROLVOLUMEFACE_HH
+#define DUMUX_DISCRETIZATION_STAGGERED_SUBCONTROLVOLUMEFACE_HH
+
+#include <utility>
+#include <dune/common/fvector.hh>
+
+#include <dumux/discretization/subcontrolvolumefacebase.hh>
+#include <dumux/common/properties.hh>
+#include <dumux/common/optional.hh>
+
+#include <typeinfo>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup Discretization
+ * \brief Base class for a staggered grid geometry helper
+ */
+template<class GridView>
+class BaseStaggeredGeometryHelper
+{
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Intersection = typename GridView::Intersection;
+ static constexpr int codimIntersection = 1;
+
+public:
+
+ BaseStaggeredGeometryHelper(const Element& element, const GridView& gridView) : element_(element), gridView_(gridView)
+ { }
+
+ template<class IntersectionMapper>
+ void updateLocalFace(const IntersectionMapper& intersectionMapper, const Intersection& intersection)
+ {
+ intersection_ = intersection;
+ }
+
+ /*!
+ * \brief Returns the global dofIdx of the intersection itself
+ */
+ int dofIndex() const
+ {
+ //TODO: use proper intersection mapper!
+ const auto inIdx = intersection_.indexInInside();
+ return gridView_.indexSet().subIndex(intersection_.inside(), inIdx, codimIntersection);
+ }
+
+ /*!
+ * \brief Returns the local index of the face (i.e. the intersection)
+ */
+ int localFaceIndex() const
+ {
+ return intersection_.indexInInside();
+ }
+
+private:
+ Intersection intersection_; //! The intersection of interest
+ const Element element_; //! The respective element
+ const GridView gridView_;
+};
+
+/*!
+ * \ingroup Discretization
+ * \brief Class for a sub control volume face in the staggered method, i.e a part of the boundary
+ * of a sub control volume we compute fluxes on.
+ */
+template<class ScvfGeometryTraits>
+class StaggeredSubControlVolumeFace : public SubControlVolumeFaceBase<StaggeredSubControlVolumeFace<ScvfGeometryTraits>, ScvfGeometryTraits>
+{
+ using ParentType = SubControlVolumeFaceBase<StaggeredSubControlVolumeFace<ScvfGeometryTraits>,ScvfGeometryTraits>;
+ using Geometry = typename ScvfGeometryTraits::Geometry;
+ using GridIndexType = typename ScvfGeometryTraits::GridIndexType;
+
+ using Scalar = typename ScvfGeometryTraits::Scalar;
+ static const int dim = Geometry::mydimension;
+ static const int dimworld = Geometry::coorddimension;
+
+ using GlobalPosition = typename ScvfGeometryTraits::GlobalPosition;
+
+
+public:
+ //! state the traits public and thus export all types
+ using Traits = ScvfGeometryTraits;
+
+ // the default constructor
+ StaggeredSubControlVolumeFace() = default;
+
+ //! Constructor with intersection
+ template <class Intersection, class GeometryHelper>
+ StaggeredSubControlVolumeFace(const Intersection& is,
+ const typename Intersection::Geometry& isGeometry,
+ GridIndexType scvfIndex,
+ const std::vector<GridIndexType>& scvIndices,
+ const GeometryHelper& geometryHelper
+ )
+ : ParentType(),
+ geomType_(isGeometry.type()),
+ area_(isGeometry.volume()),
+ center_(isGeometry.center()),
+ unitOuterNormal_(is.centerUnitOuterNormal()),
+ scvfIndex_(scvfIndex),
+ scvIndices_(scvIndices),
+ boundary_(is.boundary())
+ {
+ corners_.resize(isGeometry.corners());
+ for (int i = 0; i < isGeometry.corners(); ++i)
+ corners_[i] = isGeometry.corner(i);
+
+ dofIdx_ = geometryHelper.dofIndex();
+ localFaceIdx_ = geometryHelper.localFaceIndex();
+ }
+
+ //! The center of the sub control volume face
+ const GlobalPosition& center() const
+ {
+ return center_;
+ }
+
+ //! The center of the sub control volume face
+ const GlobalPosition& dofPosition() const
+ {
+ return center_;
+ }
+
+ //! The integration point for flux evaluations in global coordinates
+ const GlobalPosition& ipGlobal() const
+ {
+ // Return center for now
+ return center_;
+ }
+
+ //! The area of the sub control volume face
+ Scalar area() const
+ {
+ return area_;
+ }
+
+ //! returns bolean if the sub control volume face is on the boundary
+ bool boundary() const
+ {
+ return boundary_;
+ }
+
+ const GlobalPosition& unitOuterNormal() const
+ {
+ return unitOuterNormal_;
+ }
+
+ //! index of the inside sub control volume for spatial param evaluation
+ GridIndexType insideScvIdx() const
+ {
+ return scvIndices_[0];
+ }
+
+ //! index of the outside sub control volume for spatial param evaluation
+ // This results in undefined behaviour if boundary is true
+ GridIndexType outsideScvIdx() const
+ {
+ return scvIndices_[1];
+ }
+
+ //! The global index of this sub control volume face
+ GridIndexType index() const
+ {
+ return scvfIndex_;
+ }
+
+ const GlobalPosition& corner(unsigned int localIdx) const
+ {
+ assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
+ return corners_[localIdx];
+ }
+
+ //! The geometry of the sub control volume face
+ const Geometry geometry() const
+ {
+ return Geometry(geomType_, corners_);
+ }
+
+ //! The global index of the dof living on this face
+ GridIndexType dofIndex() const
+ {
+ return dofIdx_;
+ }
+
+ //! The local index of this sub control volume face
+ GridIndexType localFaceIdx() const
+ {
+ return localFaceIdx_;
+ }
+
+private:
+ Dune::GeometryType geomType_;
+ std::vector<GlobalPosition> corners_;
+ Scalar area_;
+ GlobalPosition center_;
+ GlobalPosition unitOuterNormal_;
+ GridIndexType scvfIndex_;
+ std::vector<GridIndexType> scvIndices_;
+ bool boundary_;
+
+ int dofIdx_;
+ int localFaceIdx_;
+};
+
+
+
+} // end namespace
+
+#endif