Merge branch 'cleanup/delete-r3.4-deprecations' into 'master'

[cleanup] Remove code deprecated before release 3.4

Closes #1094

See merge request !2908

dumux/common/boundarytypes.hh

@@ -114,16 +114,6 @@ public:
             setDirichlet(eqIdx);
     }
 
-    /*!
-     * \brief Set all boundary conditions to Neumann.
-     */
-    [[deprecated("Will be removed after release 3.4")]]
-    void setAllOutflow()
-    {
-        for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
-            setOutflow(eqIdx);
-    }
-
     /*!
      * \brief Set all boundary conditions to Dirichlet-like coupling
      */
@@ -174,20 +164,6 @@ public:
         pv2eqIdx_[pvIdx] = eqIdx;
     }
 
-    /*!
-     * \brief Set a Neumann boundary condition for a single equation.
-     *
-     * \param eqIdx The index of the equation on which the outflow
-     *              condition applies.
-     */
-    [[deprecated("Will be removed after release 3.4")]]
-    void setOutflow(int eqIdx)
-    {
-        resetEq(eqIdx);
-        boundaryInfo_[eqIdx].visited = true;
-        boundaryInfo_[eqIdx].isOutflow = true;
-    }
-
     /*!
      * \brief Set a boundary condition for a single equation to
      *        a Dirichlet-like coupling condition.
@@ -302,29 +278,6 @@ public:
                            );
     }
 
-    /*!
-     * \brief Returns true if an equation is used to specify an
-     *        outflow condition.
-     *
-     * \param eqIdx The index of the equation
-     */
-    [[deprecated("Will be removed after release 3.4")]]
-    bool isOutflow(unsigned eqIdx) const
-    { return boundaryInfo_[eqIdx].isOutflow; }
-
-    /*!
-     * \brief Returns true if some equation is used to specify an
-     *        outflow condition.
-     */
-    [[deprecated("Will be removed after release 3.4")]]
-    bool hasOutflow() const
-    {
-        return std::any_of(boundaryInfo_.begin(),
-                           boundaryInfo_.end(),
-                           [](const BoundaryInfo& b){ return b.isOutflow; }
-                           );
-    }
-
     /*!
      * \brief Returns true if an equation is used to specify an
      *        Dirichlet coupling condition.

dumux/common/intersectionmapper.hh

@@ -29,8 +29,6 @@
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/common/rangegenerators.hh>
 
-#include <dumux/common/deprecated.hh>
-
 namespace Dumux {
 
 /*!
@@ -64,10 +62,6 @@ public:
         indexSet_ = &gridView_.indexSet();
     }
 
-    [[deprecated("Use update(gridView) instead! Will be removed after release 3.4.")]]
-    void update()
-    {}
-
     //! The total number of intersections
     std::size_t numIntersections() const
     {
@@ -146,12 +140,6 @@ public:
         update_();
     }
 
-    [[deprecated("Use update(gridView) instead! Will be removed after release 3.4.")]]
-    void update()
-    {
-        update_();
-    }
-
 private:
     GridIndexType index(const Element& element) const
     {
@@ -355,19 +343,10 @@ public:
         update_();
     }
 
-    [[deprecated("Use update(gridView) instead! Will be removed after release 3.4.")]]
-    void update()
-    {
-        update_();
-    }
-
 protected:
     void update_()
     {
-        if constexpr (Deprecated::hasUpdateGridView<ElementMapper, GridView>())
-            elementMapper_.update(gridView_);
-        else
-            Deprecated::update(elementMapper_);
+        elementMapper_.update(gridView_);
 
         intersectionMapGlobal_.clear();
         intersectionMapGlobal_.resize(elementMapper_.size());

dumux/common/properties/model.hh

@@ -25,7 +25,6 @@
 #define DUMUX_MODEL_PROPERTIES_HH
 
 #include <dune/common/fvector.hh>
-#include <dune/common/deprecated.hh>
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/balanceequationopts.hh>
@@ -46,18 +45,10 @@ struct ModelProperties {};
 template<class TypeTag>
 struct Scalar<TypeTag, TTag::ModelProperties> { using type = double; };
 
-DUNE_NO_DEPRECATED_BEGIN
-//! Set the default vector with size number of equations to a field vector
-template<class TypeTag>
-struct NumEqVector<TypeTag, TTag::ModelProperties> { using type = Dune::FieldVector<GetPropType<TypeTag, Properties::Scalar>, GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; };
-DUNE_NO_DEPRECATED_END
-
-DUNE_NO_DEPRECATED_BEGIN
 //! Set the default primary variable vector to a vector of size of number of equations
-//! TODO: this needs to be adapted after release 3.4 when Properties::NumEqVector is removed.
 template<class TypeTag>
-struct PrimaryVariables<TypeTag, TTag::ModelProperties> { using type = GetPropType<TypeTag, Properties::NumEqVector>; };
-DUNE_NO_DEPRECATED_END
+struct PrimaryVariables<TypeTag, TTag::ModelProperties> { using type = Dune::FieldVector<GetPropType<TypeTag, Properties::Scalar>,
+                                                                                         GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; };
 
 //! do not specific any model-specific default parameters here
 template<class TypeTag>

dumux/common/reorderingdofmapper.hh

@@ -146,15 +146,6 @@ public:
         update_();
     }
 
-    /*!
-     * \brief Recalculates map after mesh adaptation
-     */
-    [[deprecated("Use update(gridView) instead! Will be removed after release 3.4.")]]
-    void update ()
-    {
-        update_();
-    }
-
 private:
     void update_()
     {

dumux/discretization/box/elementboundarytypes.hh

@@ -26,7 +26,6 @@
 
 #include <cassert>
 #include <vector>
-#include <dune/common/deprecated.hh>
 
 namespace Dumux {
 
@@ -73,9 +72,6 @@ public:
 
                 hasDirichlet_ = hasDirichlet_ || vertexBCTypes_[scvIdxLocal].hasDirichlet();
                 hasNeumann_ = hasNeumann_ || vertexBCTypes_[scvIdxLocal].hasNeumann();
-DUNE_NO_DEPRECATED_BEGIN
-                hasOutflow_ = hasOutflow_ || vertexBCTypes_[scvIdxLocal].hasOutflow();
-DUNE_NO_DEPRECATED_END
             }
         }
     }
@@ -94,14 +90,6 @@ DUNE_NO_DEPRECATED_END
     bool hasNeumann() const
     { return hasNeumann_; }
 
-    /*!
-     * \brief Returns whether the element potentially features an
-     *        outflow boundary segment.
-     */
-    [[deprecated("Will be removed after release 3.4")]]
-    bool hasOutflow() const
-    { return hasOutflow_; }
-
     /*
      * \brief Access operator
      * \return BoundaryTypes

dumux/material/fluidmatrixinteractions/porenetwork/pore/2p/multishapelocalrules.hh

@@ -101,16 +101,6 @@ public:
     static constexpr int numFluidPhases()
     { return 2; }
 
-    template<class SpatialParams, class Element, class SubControlVolume, class ElemSol>
-    [[deprecated("Use constructor of BasicParams directly. Will be removed before release 3.4")]]
-    static BasicParams makeParams(const SpatialParams& spatialParams,
-                                  const Element& element,
-                                  const SubControlVolume& scv,
-                                  const ElemSol& elemSol)
-    {
-        return BasicParams(spatialParams, element, scv, elemSol);
-    }
-
     MultiShapeTwoPLocalRules(const BasicParams& baseParams,
                              //const RegularizationParams& regParams = {}, TODO
                              const std::string& paramGroup = "")