From 94ad63e11a491ea9fab23b94fddaf32dc7187270 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 25 Jun 2020 17:07:37 +0200
Subject: [PATCH] [disc] Deprecate RotationSCV/SCVF, traits and policies
---
dumux/discretization/rotationpolicy.hh | 4 +++-
.../rotationsymmetricgridgeometrytraits.hh | 3 ++-
dumux/discretization/rotationsymmetricscv.hh | 9 +++++----
dumux/discretization/rotationsymmetricscvf.hh | 9 +++++----
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/dumux/discretization/rotationpolicy.hh b/dumux/discretization/rotationpolicy.hh
index 9e762ef6ed..8ee683e12d 100644
--- a/dumux/discretization/rotationpolicy.hh
+++ b/dumux/discretization/rotationpolicy.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_DISCRETIZATION_ROTATION_POLICY_HH
#define DUMUX_DISCRETIZATION_ROTATION_POLICY_HH
+#warning "This header is deprecated and will be removed after release 3.3"
+
namespace Dumux {
/*!
@@ -33,7 +35,7 @@ namespace Dumux {
* - ball (or shell): rotate a segment around a point on the line through the segment
* - toroid: rotate a polygon around one of its axis (we rotate about the second axis)
*/
-enum class RotationPolicy
+enum class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationPolicy
{ disc, ball, toroid };
} // end namespace Dumux
diff --git a/dumux/discretization/rotationsymmetricgridgeometrytraits.hh b/dumux/discretization/rotationsymmetricgridgeometrytraits.hh
index c70ebd382c..e0fbbe6d78 100644
--- a/dumux/discretization/rotationsymmetricgridgeometrytraits.hh
+++ b/dumux/discretization/rotationsymmetricgridgeometrytraits.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_ROTATION_SYMMETRIC_GG_TRAITS_HH
#define DUMUX_DISCRETIZATION_ROTATION_SYMMETRIC_GG_TRAITS_HH
+#warning "This header is deprecated and will be removed after release 3.3"
#include <dumux/discretization/rotationpolicy.hh>
#include <dumux/discretization/rotationsymmetricscv.hh>
#include <dumux/discretization/rotationsymmetricscvf.hh>
@@ -37,7 +38,7 @@ namespace Dumux {
* \tparam rotPolicy The rotation policy (see RotationPolicy enum class)
*/
template<class BaseTraits, RotationPolicy rotPolicy>
-struct RotationSymmetricGridGeometryTraits : public BaseTraits
+struct [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricGridGeometryTraits : public BaseTraits
{
using SubControlVolume = RotationSymmetricSubControlVolume<typename BaseTraits::SubControlVolume, rotPolicy>;
using SubControlVolumeFace = RotationSymmetricSubControlVolumeFace<typename BaseTraits::SubControlVolumeFace, rotPolicy>;
diff --git a/dumux/discretization/rotationsymmetricscv.hh b/dumux/discretization/rotationsymmetricscv.hh
index 4bb912b8e3..88c3a569d7 100644
--- a/dumux/discretization/rotationsymmetricscv.hh
+++ b/dumux/discretization/rotationsymmetricscv.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_ROTATION_SYMMETRIC_SUBCONTROLVOLUME_HH
#define DUMUX_DISCRETIZATION_ROTATION_SYMMETRIC_SUBCONTROLVOLUME_HH
+#warning "This header is deprecated and will be removed after release 3.3"
#include <cmath>
#include <dumux/discretization/rotationpolicy.hh>
@@ -36,7 +37,7 @@ namespace Dumux {
* \tparam rotationPolicy the rotation policy (see enum RotationPolicy)
*/
template<class SubControlVolume, RotationPolicy rotationPolicy>
-class RotationSymmetricSubControlVolume;
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolume;
/*!
* \ingroup Discretization
@@ -45,7 +46,7 @@ class RotationSymmetricSubControlVolume;
* \note Specialization for the 'disc' policy (1d grid --> 2d disc)
*/
template<class SubControlVolume>
-class RotationSymmetricSubControlVolume<SubControlVolume, RotationPolicy::disc>
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolume<SubControlVolume, RotationPolicy::disc>
: public SubControlVolume
{
using Scalar = typename SubControlVolume::Traits::Scalar;
@@ -72,7 +73,7 @@ public:
* \note Specialization for the 'ball' policy (1d grid --> 3d ball)
*/
template<class SubControlVolume>
-class RotationSymmetricSubControlVolume<SubControlVolume, RotationPolicy::ball>
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolume<SubControlVolume, RotationPolicy::ball>
: public SubControlVolume
{
using Scalar = typename SubControlVolume::Traits::Scalar;
@@ -100,7 +101,7 @@ public:
* \note We rotate about the second axis
*/
template<class SubControlVolume>
-class RotationSymmetricSubControlVolume<SubControlVolume, RotationPolicy::toroid>
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolume<SubControlVolume, RotationPolicy::toroid>
: public SubControlVolume
{
using Scalar = typename SubControlVolume::Traits::Scalar;
diff --git a/dumux/discretization/rotationsymmetricscvf.hh b/dumux/discretization/rotationsymmetricscvf.hh
index 97e9840840..b1dc9e032b 100644
--- a/dumux/discretization/rotationsymmetricscvf.hh
+++ b/dumux/discretization/rotationsymmetricscvf.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_ROTATION_SYMMETRIC_SUBCONTROLVOLUMEFACE_HH
#define DUMUX_DISCRETIZATION_ROTATION_SYMMETRIC_SUBCONTROLVOLUMEFACE_HH
+#warning "This header is deprecated and will be removed after release 3.3"
#include <cmath>
#include <dumux/discretization/rotationpolicy.hh>
@@ -36,7 +37,7 @@ namespace Dumux {
* \tparam rotationPolicy the rotation policy (see enum RotationPolicy)
*/
template<class SubControlVolumeFace, RotationPolicy rotationPolicy>
-class RotationSymmetricSubControlVolumeFace;
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolumeFace;
/*!
* \ingroup Discretization
@@ -45,7 +46,7 @@ class RotationSymmetricSubControlVolumeFace;
* \note Specialization for the 'disc' policy (1d grid --> 2d disc)
*/
template<class SubControlVolumeFace>
-class RotationSymmetricSubControlVolumeFace<SubControlVolumeFace, RotationPolicy::disc>
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolumeFace<SubControlVolumeFace, RotationPolicy::disc>
: public SubControlVolumeFace
{
using Scalar = typename SubControlVolumeFace::Traits::Scalar;
@@ -70,7 +71,7 @@ public:
* \note Specialization for the 'ball' policy (1d grid --> 3d ball)
*/
template<class SubControlVolumeFace>
-class RotationSymmetricSubControlVolumeFace<SubControlVolumeFace, RotationPolicy::ball>
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolumeFace<SubControlVolumeFace, RotationPolicy::ball>
: public SubControlVolumeFace
{
using Scalar = typename SubControlVolumeFace::Traits::Scalar;
@@ -96,7 +97,7 @@ public:
* \note We rotate about the second axis
*/
template<class SubControlVolumeFace>
-class RotationSymmetricSubControlVolumeFace<SubControlVolumeFace, RotationPolicy::toroid>
+class [[deprecated("Will be removed after release 3.3. Use Extrusion from extrusion.hh")]] RotationSymmetricSubControlVolumeFace<SubControlVolumeFace, RotationPolicy::toroid>
: public SubControlVolumeFace
{
using Scalar = typename SubControlVolumeFace::Traits::Scalar;
--
GitLab