Commit f8e05a41 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cleanup/remove-deprecations' into 'master'

[cleanup] Remove deprecated code.

See merge request !189
parents f8a17a54 4f4cb4a2
Pipeline #21629 failed with stage
......@@ -38,8 +38,6 @@
#include <dune/grid/io/file/vtk/vtkwriter.hh>
#include <dune/grid/io/file/vtk/function.hh>
#include <dumux/common/deprecated.hh>
#if HAVE_MPI
#include <mpi.h>
#endif
......@@ -198,15 +196,8 @@ public:
*/
void gridChanged()
{
if constexpr (Deprecated::hasUpdateGridView<ElementMapper, GridView>())
elementMapper_.update(gridView_);
else
Deprecated::update(elementMapper_);
if constexpr (Deprecated::hasUpdateGridView<VertexMapper, GridView>())
vertexMapper_.update(gridView_);
else
Deprecated::update(vertexMapper_);
elementMapper_.update(gridView_);
vertexMapper_.update(gridView_);
}
/*!
......
......@@ -25,7 +25,6 @@
#include <unordered_map>
#include <dune/grid/common/partitionset.hh>
#include <dumux/common/deprecated.hh>
#include "properties.hh"
#include "gridadaptproperties.hh"
......@@ -189,10 +188,8 @@ public:
// update mapper to new cell indices
using ElementMapper = std::decay_t<decltype(problem_.variables().elementMapper())>;
if constexpr (Deprecated::hasUpdateGridView<ElementMapper, GridView>())
problem_.variables().elementMapper().update(problem_.gridView());
else
Deprecated::update(problem_.variables().elementMapper());
problem_.variables().elementMapper().update(problem_.gridView());
// adapt size of vectors
problem_.variables().adaptVariableSize(problem_.variables().elementMapper().size());
......
......@@ -20,8 +20,6 @@
#define DUMUX_VARIABLECLASS_HH
#include "properties.hh"
#include <dumux/common/deprecated.hh>
// for parallelization
//#include <dumux/parallel/elementhandles.hh>
......@@ -89,15 +87,8 @@ public:
*/
void initialize()
{
if constexpr (Deprecated::hasUpdateGridView<ElementMapper, GridView>())
elementMapper_.update(gridView_);
else
Deprecated::update(elementMapper_);
if constexpr (Deprecated::hasUpdateGridView<VertexMapper, GridView>())
vertexMapper_.update(gridView_);
else
Deprecated::update(vertexMapper_);
elementMapper_.update(gridView_);
vertexMapper_.update(gridView_);
cellDataVector_.resize(gridView_.size(0));
}
......
Supports Markdown
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