Commit 5f4a5182 authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

Merge branch 'cherry-pick-15ea79b6' into 'releases/3.4'

Merge branch 'cleanup/remove-deprecated-warnings-for-releases-3.4' into 'master'

See merge request !2727
parents c0251163 12faa767
Pipeline #6327 passed with stages
in 0 seconds
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_FV_GRID_GEOMETRY #ifndef DUMUX_DISCRETIZATION_STAGGERED_FV_GRID_GEOMETRY
#define DUMUX_DISCRETIZATION_STAGGERED_FV_GRID_GEOMETRY #define DUMUX_DISCRETIZATION_STAGGERED_FV_GRID_GEOMETRY
#include <dumux/common/deprecated.hh>
#include <dumux/common/indextraits.hh> #include <dumux/common/indextraits.hh>
#include <dumux/discretization/basegridgeometry.hh> #include <dumux/discretization/basegridgeometry.hh>
#include <dumux/discretization/checkoverlapsize.hh> #include <dumux/discretization/checkoverlapsize.hh>
...@@ -282,8 +283,10 @@ public: ...@@ -282,8 +283,10 @@ public:
scvs_.clear(); scvs_.clear();
scvfs_.clear(); scvfs_.clear();
scvfIndicesOfScv_.clear(); scvfIndicesOfScv_.clear();
intersectionMapper_.update(); if constexpr (Deprecated::hasUpdateGridView<IntersectionMapper, GridView>())
intersectionMapper_.update(this->gridView());
else
Deprecated::update(intersectionMapper_);
// determine size of containers // determine size of containers
std::size_t numScvs = this->gridView().size(0); std::size_t numScvs = this->gridView().size(0);
std::size_t numScvf = 0; std::size_t numScvf = 0;
...@@ -510,7 +513,10 @@ public: ...@@ -510,7 +513,10 @@ public:
{ {
// clear containers (necessary after grid refinement) // clear containers (necessary after grid refinement)
scvfIndicesOfScv_.clear(); scvfIndicesOfScv_.clear();
intersectionMapper_.update(); if constexpr (Deprecated::hasUpdateGridView<IntersectionMapper, GridView>())
intersectionMapper_.update(this->gridView());
else
Deprecated::update(intersectionMapper_);
neighborVolVarIndices_.clear(); neighborVolVarIndices_.clear();
numScvs_ = numCellCenterDofs(); numScvs_ = numCellCenterDofs();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment