Commit 15ea79b6 authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

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

Resolve "Remove deprecated warnings"

Closes #1055

See merge request !2725
parents 65300260 5265a4de
Pipeline #6257 passed with stage
in 21 seconds
......@@ -24,6 +24,7 @@
#ifndef 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/discretization/basegridgeometry.hh>
#include <dumux/discretization/checkoverlapsize.hh>
......@@ -282,8 +283,10 @@ public:
scvs_.clear();
scvfs_.clear();
scvfIndicesOfScv_.clear();
intersectionMapper_.update();
if constexpr (Deprecated::hasUpdateGridView<IntersectionMapper, GridView>())
intersectionMapper_.update(this->gridView());
else
Deprecated::update(intersectionMapper_);
// determine size of containers
std::size_t numScvs = this->gridView().size(0);
std::size_t numScvf = 0;
......@@ -510,7 +513,10 @@ public:
{
// clear containers (necessary after grid refinement)
scvfIndicesOfScv_.clear();
intersectionMapper_.update();
if constexpr (Deprecated::hasUpdateGridView<IntersectionMapper, GridView>())
intersectionMapper_.update(this->gridView());
else
Deprecated::update(intersectionMapper_);
neighborVolVarIndices_.clear();
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