From 79996c40b36cf72f75692b9bcec874f59c80fcc2 Mon Sep 17 00:00:00 2001
From: Timo Koch <timokoch@math.uio.no>
Date: Wed, 27 Apr 2022 10:34:41 +0000
Subject: [PATCH] Merge branch 'fix/deprecated-attribute' into 'master'

[material][pnm] Fix position of deprecated attribute

See merge request dumux-repositories/dumux!3071

(cherry picked from commit ff1dc267196a4a3d5fa5586e19f994dd04028856)

6697fb50 [material][pnm] Fix position of deprecated attribute
---
 dumux/material/spatialparams/porenetwork/porenetwork1p.hh   | 3 ++-
 dumux/material/spatialparams/porenetwork/porenetwork2p.hh   | 6 ++++--
 dumux/material/spatialparams/porenetwork/porenetworkbase.hh | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dumux/material/spatialparams/porenetwork/porenetwork1p.hh b/dumux/material/spatialparams/porenetwork/porenetwork1p.hh
index 032d3f1cc1..b2e37144b4 100644
--- a/dumux/material/spatialparams/porenetwork/porenetwork1p.hh
+++ b/dumux/material/spatialparams/porenetwork/porenetwork1p.hh
@@ -36,8 +36,9 @@ namespace Dumux::PoreNetwork {
 * \brief The default class for spatial parameters for single-phase pore-network models.
 */
 template<class GridGeometry, class Scalar>
+class
 [[deprecated("Use PoreNetwork::OnePDefaultSpatialParams from dumux/porenetwork/1p/spatialparams.hh instead. This class will be removed after 3.5.")]]
-class OnePDefaultSpatialParams : public BaseSpatialParams<GridGeometry, Scalar,
+OnePDefaultSpatialParams : public BaseSpatialParams<GridGeometry, Scalar,
                                                           OnePDefaultSpatialParams<GridGeometry, Scalar>>
 {
     using ParentType = BaseSpatialParams<GridGeometry, Scalar,
diff --git a/dumux/material/spatialparams/porenetwork/porenetwork2p.hh b/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
index 90e00d4310..b5346553ca 100644
--- a/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
+++ b/dumux/material/spatialparams/porenetwork/porenetwork2p.hh
@@ -46,8 +46,9 @@ namespace Dumux::PoreNetwork {
  * \brief The base class for spatial parameters for pore-network models.
  */
 template<class GridGeometry, class Scalar, class LocalRules, class Implementation>
+class
 [[deprecated("Use PoreNetwork::TwoPSpatialParams from dumux/porenetwork/2p/spatialparams.hh instead. This class will be removed after 3.5.")]]
-class TwoPBaseSpatialParams
+TwoPBaseSpatialParams
 : public BaseSpatialParams<GridGeometry, Scalar, TwoPBaseSpatialParams<GridGeometry, Scalar, LocalRules, Implementation>>
 {
     using ParentType = BaseSpatialParams<GridGeometry, Scalar, TwoPBaseSpatialParams<GridGeometry, Scalar, LocalRules, Implementation>>;
@@ -209,8 +210,9 @@ private:
 
 // TODO docme
 template<class GridGeometry, class Scalar, class MaterialLawT>
+class
 [[deprecated("Use PoreNetwork::TwoPDefaultSpatialParams from dumux/porenetwork/2p/spatialparams.hh instead. This class will be removed after 3.5.")]]
-class TwoPDefaultSpatialParams : public TwoPBaseSpatialParams<GridGeometry, Scalar, MaterialLawT,
+TwoPDefaultSpatialParams : public TwoPBaseSpatialParams<GridGeometry, Scalar, MaterialLawT,
                                                               TwoPDefaultSpatialParams<GridGeometry, Scalar, MaterialLawT>>
 {
     using ParentType = TwoPBaseSpatialParams<GridGeometry, Scalar, MaterialLawT,
diff --git a/dumux/material/spatialparams/porenetwork/porenetworkbase.hh b/dumux/material/spatialparams/porenetwork/porenetworkbase.hh
index 8ae91c0402..ab52eda864 100644
--- a/dumux/material/spatialparams/porenetwork/porenetworkbase.hh
+++ b/dumux/material/spatialparams/porenetwork/porenetworkbase.hh
@@ -88,8 +88,9 @@ struct hasPorosityAtPos
  * \brief The base class for spatial parameters for pore-network models.
  */
 template<class GridGeometry, class Scalar, class Implementation>
+class
 [[deprecated("Use PoreNetwork::SpatialParams from dumux/porenetwork/common/spatialparams.hh instead. This class will be removed after 3.5.")]]
-class BaseSpatialParams
+BaseSpatialParams
 {
     using GridView = typename GridGeometry::GridView;
     using SubControlVolume = typename GridGeometry::SubControlVolume;
-- 
GitLab