From e9bb540feba01f286fb73ea9007139e523e460c6 Mon Sep 17 00:00:00 2001
From: Martin Utz <martin.utz@baw.de>
Date: Fri, 28 Apr 2023 12:06:21 +0200
Subject: [PATCH] [discretisations] Remove deprecated interfaces in scv/scvfs
and elementsolution
---
dumux/discretization/box/elementsolution.hh | 18 ------------------
.../cellcentered/mpfa/subcontrolvolumeface.hh | 8 --------
.../cellcentered/subcontrolvolume.hh | 15 ---------------
.../cellcentered/tpfa/subcontrolvolumeface.hh | 15 ---------------
.../facecentered/diamond/elementsolution.hh | 17 -----------------
.../staggered/fvelementgeometry.hh | 1 +
.../facecentered/staggered/subcontrolvolume.hh | 7 -------
.../staggered/subcontrolvolumeface.hh | 7 -------
.../porenetwork/subcontrolvolume.hh | 15 ---------------
.../pq1bubble/elementsolution.hh | 18 ------------------
.../staggered/freeflow/subcontrolvolumeface.hh | 8 --------
.../staggered/subcontrolvolumeface.hh | 8 --------
.../facet/box/subcontrolvolumeface.hh | 8 --------
.../porousmediumflow/boxdfm/geometryhelper.hh | 9 ---------
.../boxdfm/subcontrolvolume.hh | 8 --------
.../boxdfm/subcontrolvolumeface.hh | 8 --------
16 files changed, 1 insertion(+), 169 deletions(-)
delete mode 100644 dumux/discretization/box/elementsolution.hh
delete mode 100644 dumux/discretization/facecentered/diamond/elementsolution.hh
delete mode 100644 dumux/discretization/pq1bubble/elementsolution.hh
diff --git a/dumux/discretization/box/elementsolution.hh b/dumux/discretization/box/elementsolution.hh
deleted file mode 100644
index d3e572eb2b..0000000000
--- a/dumux/discretization/box/elementsolution.hh
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup BoxDiscretization
- * \brief The local element solution class for the box method
- */
-#ifndef DUMUX_BOX_ELEMENT_SOLUTION_HH
-#define DUMUX_BOX_ELEMENT_SOLUTION_HH
-
-#include <dumux/discretization/cvfe/elementsolution.hh>
-#warning "This header is deprecated and will be removed after release 3.7. Include dumux/discretization/cvfe/elementsolution.hh"
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
index dcc2a419c0..d677c55da6 100644
--- a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
+++ b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
@@ -185,14 +185,6 @@ public:
std::size_t corners() const
{ return corners_.size(); }
- //! Returns the corner for a given local index
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
//! Returns the global position of the vertex the scvf is connected to
const GlobalPosition& vertexCorner() const
{ return corners_.back(); }
diff --git a/dumux/discretization/cellcentered/subcontrolvolume.hh b/dumux/discretization/cellcentered/subcontrolvolume.hh
index ee61d5ecea..34b2def3ad 100644
--- a/dumux/discretization/cellcentered/subcontrolvolume.hh
+++ b/dumux/discretization/cellcentered/subcontrolvolume.hh
@@ -114,14 +114,6 @@ public:
return geometry_->volume();
}
- //! The geometry of the sub control volume
- // e.g. for integration
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).")]]
- const Geometry& geometry() const
- {
- return *geometry_;
- }
-
//! The index of the dof this scv is embedded in (the global index of this scv)
GridIndexType dofIndex() const
{
@@ -153,13 +145,6 @@ public:
return elementIndex_;
}
- //! Return the corner for the given local index
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).corner(i).")]]
- GlobalPosition corner(LocalIndexType localIdx) const
- {
- return geometry_->corner(localIdx);
- }
-
private:
void deepCopy_(const CCSubControlVolume& other)
{
diff --git a/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh
index 8cd28a1a8c..dd99833a79 100644
--- a/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh
+++ b/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh
@@ -180,21 +180,6 @@ public:
return scvfIndex_;
}
- //! return the i-th corner of this sub control volume face
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(int i) const
- {
- assert(i < corners_.size() && "provided index exceeds the number of corners");
- return corners_[i];
- }
-
- //! The geometry of the sub control volume face
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).")]]
- Geometry geometry() const
- {
- return Geometry(geomType_, corners_);
- }
-
//! Return the boundary flag
typename BoundaryFlag::value_type boundaryFlag() const
{
diff --git a/dumux/discretization/facecentered/diamond/elementsolution.hh b/dumux/discretization/facecentered/diamond/elementsolution.hh
deleted file mode 100644
index 1d74cc771b..0000000000
--- a/dumux/discretization/facecentered/diamond/elementsolution.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup DiamondDiscretization
- */
-#ifndef DUMUX_DISCRETIZATION_FACECENTERED_DIAMOND_ELEMENT_SOLUTION_HH
-#define DUMUX_DISCRETIZATION_FACECENTERED_DIAMOND_ELEMENT_SOLUTION_HH
-
-#include <dumux/discretization/cvfe/elementsolution.hh>
-#warning "This header is deprecated and will be removed after release 3.7. Include dumux/discretization/cvfe/elementsolution.hh"
-
-#endif
diff --git a/dumux/discretization/facecentered/staggered/fvelementgeometry.hh b/dumux/discretization/facecentered/staggered/fvelementgeometry.hh
index efc1e907e8..5d4bc1024f 100644
--- a/dumux/discretization/facecentered/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/facecentered/staggered/fvelementgeometry.hh
@@ -223,6 +223,7 @@ public:
{ return scvf.geometry(); }
#pragma GCC diagnostic pop
+
private:
const auto& scvfIndices_() const
diff --git a/dumux/discretization/facecentered/staggered/subcontrolvolume.hh b/dumux/discretization/facecentered/staggered/subcontrolvolume.hh
index 33ba0c3ad7..a33bc9656b 100644
--- a/dumux/discretization/facecentered/staggered/subcontrolvolume.hh
+++ b/dumux/discretization/facecentered/staggered/subcontrolvolume.hh
@@ -139,13 +139,6 @@ public:
bool boundary() const
{ return boundary_; }
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
//! The geometry of the sub control volume face
[[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).")]]
Geometry geometry() const
diff --git a/dumux/discretization/facecentered/staggered/subcontrolvolumeface.hh b/dumux/discretization/facecentered/staggered/subcontrolvolumeface.hh
index 86f71d9d5d..9adb53bb86 100644
--- a/dumux/discretization/facecentered/staggered/subcontrolvolumeface.hh
+++ b/dumux/discretization/facecentered/staggered/subcontrolvolumeface.hh
@@ -203,13 +203,6 @@ public:
std::int_least8_t directionSign() const
{ return outerNormalSign_; }
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
//! The geometry of the sub control volume face
[[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).")]]
Geometry geometry() const
diff --git a/dumux/discretization/porenetwork/subcontrolvolume.hh b/dumux/discretization/porenetwork/subcontrolvolume.hh
index 5a5ecd6826..f4f48aab8f 100644
--- a/dumux/discretization/porenetwork/subcontrolvolume.hh
+++ b/dumux/discretization/porenetwork/subcontrolvolume.hh
@@ -112,21 +112,6 @@ public:
GridIndexType elementIndex() const
{ return elementIndex_; }
- //! Return the corner for the given local index
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).corner(i).")]]
- const GlobalPosition& corner(LocalIndexType localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
- //! The geometry of the sub control volume e.g. for integration
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).")]]
- Geometry geometry() const
- {
- return Geometry(Dune::GeometryTypes::simplex(1), corners_);
- }
-
private:
GlobalPosition center_;
CornerStorage corners_;
diff --git a/dumux/discretization/pq1bubble/elementsolution.hh b/dumux/discretization/pq1bubble/elementsolution.hh
deleted file mode 100644
index 1b3dba9f99..0000000000
--- a/dumux/discretization/pq1bubble/elementsolution.hh
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-//
-// SPDX-FileCopyrightInfo: Copyright © DuMux Project contributors, see AUTHORS.md in root folder
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-/*!
- * \file
- * \ingroup PQ1BubbleDiscretization
- * \brief The local element solution class for the pq1bubble method
- */
-#ifndef DUMUX_PQ1BUBBLE_ELEMENT_SOLUTION_HH
-#define DUMUX_PQ1BUBBLE_ELEMENT_SOLUTION_HH
-
-#include <dumux/discretization/cvfe/elementsolution.hh>
-#warning "This header is deprecated and will be removed after release 3.7. Include dumux/discretization/cvfe/elementsolution.hh"
-
-#endif
diff --git a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
index c0cb4154cc..54d558a9f2 100644
--- a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
@@ -222,14 +222,6 @@ public:
return scvfIndex_;
}
- //! The positions of the corners
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
//! The geometry of the sub control volume face
[[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).")]]
const Geometry geometry() const
diff --git a/dumux/discretization/staggered/subcontrolvolumeface.hh b/dumux/discretization/staggered/subcontrolvolumeface.hh
index e8bb50960d..6adf5ef480 100644
--- a/dumux/discretization/staggered/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/subcontrolvolumeface.hh
@@ -200,14 +200,6 @@ public:
return scvfIndex_;
}
- //! The positions of the corners
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
//! The geometry of the sub control volume face
[[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).")]]
const Geometry geometry() const
diff --git a/dumux/multidomain/facet/box/subcontrolvolumeface.hh b/dumux/multidomain/facet/box/subcontrolvolumeface.hh
index 919e399a83..6f33bb60f3 100644
--- a/dumux/multidomain/facet/box/subcontrolvolumeface.hh
+++ b/dumux/multidomain/facet/box/subcontrolvolumeface.hh
@@ -184,14 +184,6 @@ public:
typename BoundaryFlag::value_type boundaryFlag() const
{ return boundaryFlag_.get(); }
- //! returns the position of a corner of the face
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
private:
// geometrical information
CornerStorage corners_;
diff --git a/dumux/porousmediumflow/boxdfm/geometryhelper.hh b/dumux/porousmediumflow/boxdfm/geometryhelper.hh
index 6f4464c403..fdad1d0df4 100644
--- a/dumux/porousmediumflow/boxdfm/geometryhelper.hh
+++ b/dumux/porousmediumflow/boxdfm/geometryhelper.hh
@@ -135,15 +135,6 @@ public:
<< " type=" << type);
}
- //! Create the sub control volume face geometries on an intersection marked as fracture
- [[deprecated("Will be removed after release 3.6. Use other signature.")]]
- ScvfCornerStorage getFractureScvfCorners(const Intersection& is,
- const typename Intersection::Geometry& isGeom,
- unsigned int edgeIndexInIntersection) const
- {
- return getFractureScvfCorners(is.indexInInside(), edgeIndexInIntersection);
- }
-
//! get fracture scvf normal vector
typename ScvfType::Traits::GlobalPosition
fractureNormal(const ScvfCornerStorage& scvfCorners,
diff --git a/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh b/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh
index e33d28065b..cf8504ea5a 100644
--- a/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh
+++ b/dumux/porousmediumflow/boxdfm/subcontrolvolume.hh
@@ -202,14 +202,6 @@ public:
return Geometry(Dune::GeometryTypes::cube(dim), corners_);
}
- //! Return the corner for the given local index
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scv).corner(i).")]]
- const GlobalPosition& corner(LocalIndexType localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
private:
bool isFractureScv_;
CornerStorage corners_;
diff --git a/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh b/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh
index 71d19e97a9..85fb5af05d 100644
--- a/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh
+++ b/dumux/porousmediumflow/boxdfm/subcontrolvolumeface.hh
@@ -224,14 +224,6 @@ public:
return static_cast<std::size_t>(!boundary());
}
- //! Returns a corner of the sub control volume face
- [[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).corner(i).")]]
- const GlobalPosition& corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
//! The geometry of the sub control volume face
[[deprecated("Will be removed after 3.7. Use fvGeometry.geometry(scvf).")]]
Geometry geometry() const
--
GitLab