[discretization] improve deprecation messages for fv(FV)GridGeometry

dumux/assembly/fvassembler.hh

@@ -67,7 +67,7 @@ public:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
     using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
 
@@ -100,7 +100,7 @@ public:
                 std::shared_ptr<GridVariables> gridVariables,
                 std::shared_ptr<const TimeLoop> timeLoop)
     : problem_(problem)
-    , fvGridGeometry_(fvGridGeometry)
+    , gridGeometry_(fvGridGeometry)
     , gridVariables_(gridVariables)
     , timeLoop_(timeLoop)
     , isStationaryProblem_(!timeLoop)
@@ -271,7 +271,7 @@ public:
     { return *problem_; }
 
     //! The global finite volume geometry
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const GridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
 

dumux/assembly/staggeredfvassembler.hh

@@ -66,7 +66,7 @@ class StaggeredFVAssembler: public MultiDomainFVAssembler<StaggeredMultiDomainTr
 
 public:
     using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using CouplingManager = typename ParentType::CouplingManager;
 
@@ -124,7 +124,7 @@ public:
     { return ParentType::gridVariables(Dune::index_constant<0>()); }
 
     //! The global finite volume geometry
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const GridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
 

dumux/common/fvproblem.hh

@@ -580,7 +580,7 @@ public:
     // \}
 
     //! The finite volume grid geometry
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
 

dumux/discretization/box/fvelementgeometry.hh

@@ -67,7 +67,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated ("Use more general GridGeometry instead. Will be removed after 3.1!")]]= GridGeometry;
+    using FVGridGeometry [[deprecated ("Use GridGeometry instead. Will be removed after 3.1!")]]= GridGeometry;
     //! the maximum number of scvs per element (2^dim for cubes)
     static constexpr std::size_t maxNumElementScvs = (1<<dim);
 
@@ -149,7 +149,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated ("Use more general GridGeometry instead. Will be removed after 3.1!")]]
+    [[deprecated ("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
     const GridGeometry& gridGeometry() const
@@ -190,7 +190,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated ("Use more general GridGeometry instead. Will be removed after 3.1!")]]= GridGeometry;
+    using FVGridGeometry [[deprecated ("Use GridGeometry instead. Will be removed after 3.1!")]]= GridGeometry;
     //! the maximum number of scvs per element (2^dim for cubes)
     static constexpr std::size_t maxNumElementScvs = (1<<dim);
 
@@ -270,7 +270,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated ("Use more general GridGeometry instead. Will be removed after 3.1!")]]
+    [[deprecated ("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
     const GridGeometry& gridGeometry() const

dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh

@@ -71,7 +71,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. Will be removed after 3.1!" )]] = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!" )]] = GridGeometry;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
     //! the maximum number of scvfs per element (use cubes for maximum)
@@ -153,7 +153,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated( "Use more general GridGeometry instead. Will be removed after 3.1!" )]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
     const GridGeometry& gridGeometry() const
@@ -194,7 +194,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometrys
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. Will be removed after 3.1!")]] = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!")]] = GridGeometry;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
     //! the maximum number of scvfs per element (use cubes for maximum)
@@ -315,7 +315,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated( "Use more general GridGeometry instead. Will be removed after 3.1!" )]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
     const GridGeometry& gridGeometry() const

dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh

@@ -70,7 +70,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. Will be removed after 3.1!")]]  = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!")]]  = GridGeometry;
 
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
@@ -158,7 +158,7 @@ public:
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
-    [[deprecated( "Use more general GridGeometry instead. Will be removed after 3.1!" )]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
 
@@ -197,7 +197,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. Will be removed after 3.1!")]]  = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. Will be removed after 3.1!")]]  = GridGeometry;
     //! the maximum number of scvs per element
     static constexpr std::size_t maxNumElementScvs = 1;
     //! the maximum number of scvfs per element (use cubes for maximum)
@@ -362,7 +362,7 @@ public:
     //! The global finite volume geometry we are a restriction of
     const GridGeometry& gridGeometry() const
     { return *gridGeometryPtr_; }
-    [[deprecated( "Use more general GridGeometry instead. Will be removed after 3.1!" )]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
 

dumux/discretization/fvgridvariables.hh

@@ -162,7 +162,7 @@ public:
     { return prevGridVolVars_; }
 
     //! return the finite volume grid geometry
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const GridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
 

dumux/discretization/staggered/fvelementgeometry.hh

@@ -99,7 +99,7 @@ public:
     using SubControlVolumeFace = typename GG::SubControlVolumeFace;
     //! export type of finite volume grid geometry
     using GridGeometry = GG;
-    using FVGridGeometry [[deprecated ("Use more general GridGeometry instead. Will be removed after 3.1!")]] = GridGeometry;
+    using FVGridGeometry [[deprecated ("Use GridGeometry instead. Will be removed after 3.1!")]] = GridGeometry;
 
     //! Constructor getting a auxiliary cell center of face specific FvGridGeometry type.
     //! Needed for the multi-domain framework.
@@ -210,7 +210,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use more general GridGeometry instead. Will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return gridGeometry(); }
     const GridGeometry& gridGeometry() const

dumux/discretization/staggered/gridvariables.hh

@@ -92,7 +92,7 @@ public:
     { return gridVariables_->prevGridFaceVars(); }
 
     //! return the fv grid geometry
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const FVGridGeometry& fvGridGeometry() const
     { return (*gridVariables_->fvGridGeometry_);    }
     //! return the fv grid geometry

dumux/multidomain/fvassembler.hh

@@ -76,7 +76,7 @@ public:
     using GridGeometry = typename MDTraits::template SubDomain<id>::GridGeometry;
 
     template<std::size_t id>
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry<id>;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry<id>;
 
     template<std::size_t id>
     using Problem = typename MDTraits::template SubDomain<id>::Problem;
@@ -360,7 +360,7 @@ public:
 
     //! the finite volume grid geometry of domain i
     template<std::size_t i>
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const auto& fvGridGeometry(Dune::index_constant<i> domainId) const
     { return gridGeometry(domainId); }
 

dumux/multidomain/staggeredtraits.hh

@@ -195,7 +195,7 @@ public:
         using TypeTag = SubDomainTypeTag<id>;
         using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
         using GridGeometry = typename Detail::Staggered::SubDomainFVGridGeometryImpl<SubDomainTypeTag, id>::type;
-        using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
+        using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
         using GridVariables = typename Detail::Staggered::SubDomainGridVariablesImpl<SubDomainTypeTag, id>::type;
         using SolutionVector = typename Detail::Staggered::SubDomainSolutionVectorImpl<SubDomainTypeTag, id>::type;
         using PrimaryVariables = typename Detail::Staggered::SubDomainPrimaryVariablesImpl<SubDomainTypeTag, id>::type;

dumux/multidomain/traits.hh

@@ -182,7 +182,7 @@ public:
         using TypeTag = SubDomainTypeTag<id>;
         using Grid = GetPropType<SubDomainTypeTag<id>, Properties::Grid>;
         using GridGeometry = GetPropType<SubDomainTypeTag<id>, Properties::GridGeometry>;
-        using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
+        using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
         using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
         using GridVariables =GetPropType<SubDomainTypeTag<id>, Properties::GridVariables>;
         using IOFields = GetPropType<SubDomainTypeTag<id>, Properties::IOFields>;

dumux/porousmediumflow/boxdfm/fvelementgeometry.hh

@@ -71,7 +71,7 @@ public:
     //! Export type of finite volume grid geometry
     using GridGeometry = GG;
     //! Export type of finite volume grid geometry
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
 
     //! The maximum number of scvs per element (2^dim for cubes)
     //! multiplied by 3 for the maximum number of fracture scvs per vertex
@@ -153,7 +153,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const GridGeometry& fvGridGeometry() const
     { return *fvGridGeometryPtr_; }
 
@@ -194,7 +194,7 @@ public:
     //! Export type of finite volume grid geometry
     using GridGeometry = GG;
     //! export type of finite volume grid geometry
-    using FVGridGeometry [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
+    using FVGridGeometry [[deprecated("Use GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] = GridGeometry;
     //! The maximum number of scvs per element (2^dim for cubes)
     //! multiplied by 3 for the maximum number of fracture scvs per vertex
     static constexpr std::size_t maxNumElementScvs = (1<<dim)*3;
@@ -273,7 +273,7 @@ public:
     }
 
     //! The global finite volume geometry we are a restriction of
-    [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]]
+    [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
     const GridGeometry& fvGridGeometry() const
     { return *fvGridGeometryPtr_; }