[staggeredGrid] Remove obsolete class subControlVolume

* Use ccSubContolVolume instead

dumux/discretization/staggered/fvelementgeometry.hh

@@ -29,7 +29,6 @@
 
 #include <dumux/discretization/scvandscvfiterators.hh>
 #include <dumux/implicit/staggered/properties.hh>
-#include <dumux/discretization/staggered/subcontrolvolume.hh>
 
 namespace Dumux
 {

dumux/discretization/staggered/subcontrolvolume.hh

-// -*- 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
- */
-#ifndef DUMUX_DISCRETIZATION_STAGGERED_SUBCONTROLVOLUME_HH
-#define DUMUX_DISCRETIZATION_STAGGERED_SUBCONTROLVOLUME_HH
-
-#include <dune/common/fvector.hh>
-#include <dumux/discretization/subcontrolvolumebase.hh>
-#include <dumux/common/optional.hh>
-
-namespace Dumux
-{
-template<class G, typename I>
-class StaggeredSubControlVolume : public SubControlVolumeBase<StaggeredSubControlVolume<G, I>, G, I>
-{
-    using ParentType = SubControlVolumeBase<StaggeredSubControlVolume<G, I>, G, I>;
-    using Geometry = G;
-    using IndexType = I;
-
-    using Scalar = typename Geometry::ctype;
-    enum { dimworld = Geometry::coorddimension };
-    using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
-
-public:
-    // the default constructor
-    StaggeredSubControlVolume() = default;
-
-    // the contructor in the cc case
-    StaggeredSubControlVolume(Geometry&& geometry,
-                       IndexType elementIndex)
-    : ParentType(), geometry_(std::move(geometry)), elementIndex_(elementIndex) {}
-
-    //! The copy constrcutor
-    StaggeredSubControlVolume(const StaggeredSubControlVolume& other) = default;
-
-    //! The move constrcutor
-    StaggeredSubControlVolume(StaggeredSubControlVolume&& other) = default;
-
-    //! The copy assignment operator
-    StaggeredSubControlVolume& operator=(const StaggeredSubControlVolume& other)
-    {
-        // We want to use the default copy/move assignment.
-        // But since geometry is not copy assignable :( we
-        // have to construct it again
-        geometry_.release();
-        geometry_.emplace(other.geometry_.value());
-        elementIndex_ = other.elementIndex_;
-        return *this;
-    }
-
-    //! The move assignment operator
-    StaggeredSubControlVolume& operator=(StaggeredSubControlVolume&& other)
-    {
-        // We want to use the default copy/move assignment.
-        // But since geometry is not copy assignable :( we
-        // have to construct it again
-        geometry_.release();
-        geometry_.emplace(other.geometry_.value());
-        elementIndex_ = std::move(other.elementIndex_);
-        return *this;
-    }
-
-    //! The center of the sub control volume
-    GlobalPosition center() const
-    {
-        return geometry().center();
-    }
-
-    //! The volume of the sub control volume
-    Scalar volume() const
-    {
-        return geometry().volume();
-    }
-
-    //! The geometry of the sub control volume
-    // e.g. for integration
-    const Geometry& geometry() const
-    {
-        return geometry_.value();
-    }
-
-    //! The global index of this scv
-    IndexType index() const
-    {
-        return elementIndex();
-    }
-
-    //! The index of the dof this scv is embedded in
-    IndexType dofIndex() const
-    {
-        return elementIndex();
-    }
-
-    // The position of the dof this scv is embedded in
-    GlobalPosition dofPosition() const
-    {
-        return geometry().center();
-    }
-
-    //! The global index of the element this scv is embedded in
-    IndexType elementIndex() const
-    {
-        return elementIndex_;
-    }
-
-    //! Return the corner for the given local index
-    GlobalPosition corner(unsigned int localIdx) const
-    {
-        assert(localIdx < geometry().corners().size() && "provided index exceeds the number of corners");
-        return geometry().corners(localIdx);
-    }
-
-private:
-    // Work around the fact that geometry is not default constructible
-    Optional<Geometry> geometry_;
-    IndexType elementIndex_;
-};
-} // end namespace
-
-#endif

dumux/implicit/staggered/propertydefaults.hh

@@ -90,7 +90,7 @@ private:
     using ScvGeometry = typename Grid::template Codim<0>::Geometry;
     using IndexType = typename Grid::LeafGridView::IndexSet::IndexType;
 public:
-    typedef Dumux::StaggeredSubControlVolume<ScvGeometry, IndexType> type;
+    typedef Dumux::CCSubControlVolume<ScvGeometry, IndexType> type;
 };
 
 SET_TYPE_PROP(StaggeredModel, GlobalFaceVars, Dumux::StaggeredGlobalFaceVariables<TypeTag>);