Commit b4b81dd1 authored by Farid Mohammadi's avatar Farid Mohammadi Committed by Timo Koch
Browse files

DUNE_DEPRECATED_MSG is replaced by [[deprecated(msg)]] and deprecated.hh removed from the header.

parent 7313f04d
......@@ -23,7 +23,6 @@
#ifndef DUMUX_GEOMETRY_INTERSECTION_HH
#define DUMUX_GEOMETRY_INTERSECTION_HH
#include <dune/common/deprecated.hh>
#include <dune/common/exceptions.hh>
#include <dune/common/promotiontraits.hh>
#include <dune/geometry/referenceelements.hh>
......@@ -204,7 +203,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
//! Determine if the two geometries intersect and compute the intersection geometry
static bool intersection(const Geometry1& geo1, const Geometry2& geo2, Intersection& intersection)
......@@ -235,7 +234,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
/*!
* \brief Colliding two segments
......@@ -352,7 +351,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
private:
static constexpr ctype eps_ = 1.5e-7; // base epsilon for floating point comparisons
......@@ -501,7 +500,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
private:
static constexpr ctype eps_ = 1.5e-7; // base epsilon for floating point comparisons
......@@ -650,7 +649,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
private:
static constexpr ctype eps_ = 1.5e-7; // base epsilon for floating point comparisons
......@@ -802,7 +801,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
private:
static constexpr ctype eps_ = 1.5e-7; // base epsilon for floating point comparisons
......@@ -997,7 +996,7 @@ public:
using Intersection = typename Policy::Intersection;
//! Deprecated alias, will be removed after 3.1
using IntersectionType DUNE_DEPRECATED_MSG("Please use Intersection instead") = Intersection;
using IntersectionType [[deprecated("Please use Intersection instead")]] = Intersection;
private:
static constexpr ctype eps_ = 1.5e-7; // base epsilon for floating point comparisons
......@@ -1087,7 +1086,7 @@ public:
* \note This overload is used when point-like intersections are seeked
*/
template<class P = Policy, std::enable_if_t<P::dimIntersection == 0, int> = 0>
DUNE_DEPRECATED_MSG("Please use intersection(triangle, segment, ...) instead")
[[deprecated("Please use intersection(triangle, segment, ...) instead")]]
static bool intersection(const Point& a, const Point& b, const Point& c,
const Point& p, const Point& q,
Intersection& is)
......
......@@ -28,7 +28,6 @@
#include <algorithm>
#include <iterator>
#include <dune/common/deprecated.hh>
#include <dune/common/exceptions.hh>
#include <dune/common/fvector.hh>
......@@ -206,8 +205,8 @@ grahamConvexHull(const std::vector<Dune::FieldVector<ctype, 2>>& points)
// deprecated interfaces
#ifndef DOXYGEN
template<class ctype>
[[deprecated("Use grahamConvexHull<dim> with dim as template argument. Will be removed after 3.1")]]
std::vector<Dune::FieldVector<ctype, 3>>
DUNE_DEPRECATED_MSG("Use grahamConvexHull<dim> with dim as template argument. Will be removed after 3.1")
grahamConvexHull2d3d(const std::vector<Dune::FieldVector<ctype, 3>>& points)
{
auto copyPoints = points;
......@@ -215,8 +214,8 @@ grahamConvexHull2d3d(const std::vector<Dune::FieldVector<ctype, 3>>& points)
}
template<class ctype>
[[deprecated("Use grahamConvexHull<dim> with dim as template argument. Will be removed after 3.1")]]
std::vector<Dune::FieldVector<ctype, 3>>
DUNE_DEPRECATED_MSG("Use grahamConvexHull<dim> with dim as template argument. Will be removed after 3.1")
grahamConvexHull2d3d(std::vector<Dune::FieldVector<ctype, 3>>& points)
{ return grahamConvexHull<2>(points); }
......@@ -227,8 +226,8 @@ grahamConvexHull2d3d(std::vector<Dune::FieldVector<ctype, 3>>& points)
* \note This inserts a mid point and connects all corners with that point to triangles
*/
template<class ctype>
[[deprecated("Please use triangulate. Will be removed after 3.1")]]
std::vector<std::array<Dune::FieldVector<ctype, 3>, 3> >
DUNE_DEPRECATED_MSG("Please use triangulate. Will be removed after 3.1")
triangulateConvexHull(const std::vector<Dune::FieldVector<ctype, 3>>& convexHull)
{ return triangulate<2, 3>(convexHull); }
#endif
......
......@@ -30,7 +30,6 @@
#include <unordered_map>
#include <fstream>
#include <dune/common/deprecated.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
#include <dune/common/parallel/mpihelper.hh>
......@@ -262,7 +261,7 @@ public:
return commandLineArgs;
}
DUNE_DEPRECATED_MSG("parseCommandLineArguments is deprecated and will be removed after 3.1")
[[deprecated("parseCommandLineArguments is deprecated and will be removed after 3.1")]]
static std::string parseCommandLineArguments(int argc, char **argv,
std::string parameterFileName = "")
{
......@@ -407,7 +406,7 @@ private:
* \ingroup Common
* \brief a free function to set model- or problem-specific default parameters
*/
DUNE_DEPRECATED_MSG("Setting parameters is deprecated and will be removed after 3.1")
[[deprecated("Setting parameters is deprecated and will be removed after 3.1")]]
void setParam(Dune::ParameterTree& params,
const std::string& group,
const std::string& key,
......
......@@ -25,7 +25,6 @@
#define DUMUX_MODEL_PROPERTIES_HH
#include <dune/common/fvector.hh>
#include <dune/common/deprecated.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/balanceequationopts.hh>
......@@ -64,7 +63,7 @@ struct ModelDefaultParameters<TypeTag, TTag::ModelProperties>
//! \todo this property is deprecated use IOFields instead!
template<class TypeTag>
struct VtkOutputFields<TypeTag, TTag::ModelProperties> {
using type DUNE_DEPRECATED_MSG("This property is deprecated use property IOFields instead") = GetPropType<TypeTag, Properties::IOFields>;
using type [[deprecated("This property is deprecated use property IOFields instead")]] = GetPropType<TypeTag, Properties::IOFields>;
};
//! Set the default to an implementation throwing a NotImplemented error
......
......@@ -38,7 +38,7 @@ namespace Dumux {
* agnostic implementation in Dumux::BaseGridGeometry.
*/
template<class Impl, class GV, class Traits>
class DUNE_DEPRECATED_MSG("Use BaseGridGeometry instead. Will be removed after 3.1!")
class [[deprecated("Use BaseGridGeometry instead. Will be removed after 3.1!")]]
BaseFVGridGeometry : public BaseGridGeometry<GV, Traits>
{
using ParentType = BaseGridGeometry<GV, Traits>;
......
......@@ -162,7 +162,7 @@ public:
* \note This interface is deprecated
*/
template<class Scv, std::enable_if_t<!std::is_arithmetic<Scv>::value, int> = 0 >
Element DUNE_DEPRECATED_MSG("Use element(elementIndex) instead. Will be removed after 3.1!")
[[deprecated("Use element(elementIndex) instead. Will be removed after 3.1!")]] Element
element(const Scv& scv) const
{ return elementMap()[scv.elementIndex()]; }
......
......@@ -24,7 +24,6 @@
#ifndef DUMUX_DISCRETIZATION_CCMPFA_FLUXVARSCACHE_FILLER_HH
#define DUMUX_DISCRETIZATION_CCMPFA_FLUXVARSCACHE_FILLER_HH
#include <dune/common/deprecated.hh>
#include <dumux/porousmediumflow/fluxvariablescachefiller.hh>
#warning "This header is deprecated and will be removed after 3.1, use dumux/porousmediumflow/fluxvariablescachefiller.hh"
......@@ -36,7 +35,7 @@ namespace Dumux {
* the interaction volume around a given sub-control volume face.
*/
template<class TypeTag>
using CCMpfaFluxVariablesCacheFiller DUNE_DEPRECATED_MSG("This class has been renamed to PorousMediumFluxVariablesCacheFiller and will be removed after 3.1")
using CCMpfaFluxVariablesCacheFiller [[deprecated("This class has been renamed to PorousMediumFluxVariablesCacheFiller and will be removed after 3.1")]]
= PorousMediumFluxVariablesCacheFiller<TypeTag>;
} // end namespace Dumux
......
......@@ -35,7 +35,7 @@ namespace Dumux {
* \brief A helper class to fill the flux variable caches used in the flux constitutive laws
*/
template<class TypeTag>
using CCTpfaFluxVariablesCacheFiller DUNE_DEPRECATED_MSG("This class has been renamed to PorousMediumFluxVariablesCacheFiller and will be removed after 3.1")
using CCTpfaFluxVariablesCacheFiller [[deprecated("This class has been renamed to PorousMediumFluxVariablesCacheFiller and will be removed after 3.1")]]
= PorousMediumFluxVariablesCacheFiller<TypeTag>;
} // end namespace Dumux
......
......@@ -28,8 +28,6 @@
#include <memory>
#include <cassert>
#include <dune/common/deprecated.hh>
namespace Dumux {
/*!
......@@ -89,7 +87,7 @@ public:
//! initialize all variables (instationary case)
template<class SolutionVector>
DUNE_DEPRECATED_MSG("Use init(sol) instead. The class now works without modification for stationary and instationary cases.")
[[deprecated("Use init(sol) instead. The class now works without modification for stationary and instationary cases.")]]
void init(const SolutionVector& curSol, const SolutionVector& initSol)
{
// initialize current volvars and the flux var cache
......
......@@ -24,7 +24,6 @@
#ifndef DUMUX_STAGGERED_FF_VELOCITYOUTPUT_HH
#define DUMUX_STAGGERED_FF_VELOCITYOUTPUT_HH
#include <dune/common/deprecated.hh>
#include <dumux/io/velocityoutput.hh>
#include <dumux/common/parameters.hh>
......@@ -82,7 +81,7 @@ public:
//! Calculate the velocities for the scvs in the element
//! We assume the local containers to be bound to the complete stencil
DUNE_DEPRECATED_MSG("Use the new interface signature with elemFluxVarsCache")
[[deprecated("Use the new interface signature with elemFluxVarsCache")]]
void calculateVelocity(VelocityVector& velocity,
const ElementVolumeVariables& elemVolVars,
const FVElementGeometry& fvGeometry,
......
......@@ -24,7 +24,6 @@
#ifndef DUMUX_STAGGERED_GRID_VARIABLES_HH
#define DUMUX_STAGGERED_GRID_VARIABLES_HH
#include <dune/common/deprecated.hh>
#include <dumux/discretization/fvgridvariables.hh>
namespace Dumux {
......@@ -131,7 +130,7 @@ public:
//! initialize all variables (instationary case)
template<class SolVector>
DUNE_DEPRECATED_MSG("Use init with one argument")
[[deprecated("Use init with one argument")]]
void init(const SolVector& curSol, const SolVector& initSol)
{
init(initSol);
......@@ -176,7 +175,7 @@ public:
//! initialize all variables (instationary case)
template<class SolVector>
DUNE_DEPRECATED_MSG("Use init with one argument")
[[deprecated("Use init with one argument")]]
void init(const SolVector& curSol, const SolVector& initSol)
{
init(initSol);
......@@ -258,7 +257,7 @@ public:
//! initialize all variables (instationary case)
template<class SolutionVector>
DUNE_DEPRECATED_MSG("Use init with one argument")
[[deprecated("Use init with one argument")]]
void init(const SolutionVector& curSol, const SolutionVector& initSol)
{
init(initSol);
......
......@@ -26,7 +26,6 @@
#warning "This header is deprecated. Use the new cakegridmanager."
#include <dune/common/deprecated.hh>
#include "cakegridmanager.hh"
namespace Dumux {
......@@ -38,7 +37,7 @@ namespace Dumux {
* these polar coordinates.
*/
template<class Grid>
using CakeGridCreator DUNE_DEPRECATED_MSG("Use CakeGridManager instead!") = CakeGridManager<Grid>;
using CakeGridCreator [[deprecated("Use CakeGridManager instead!")]] = CakeGridManager<Grid>;
} // end namespace Dumux
#endif
......@@ -109,7 +109,7 @@ public:
* \brief Make the subgrid.
*/
template<class ElementSelector>
DUNE_DEPRECATED_MSG("Create an instance of this class and use subgridManager.init(hostGrid, selector, paramGroup)")
[[deprecated("Create an instance of this class and use subgridManager.init(hostGrid, selector, paramGroup)")]]
static std::unique_ptr<Grid> makeGrid(HostGrid& hostGrid,
const ElementSelector& selector,
const std::string& paramGroup = "")
......
......@@ -28,7 +28,6 @@
#warning "This header is deprecated. Use the new subgridmanager."
#include <dune/common/deprecated.hh>
#include "subgridmanager.hh"
namespace Dumux {
......@@ -38,7 +37,7 @@ namespace Dumux {
* \brief A grid creator for dune-subgrid.
*/
template <class HostGrid>
using SubgridGridCreator DUNE_DEPRECATED_MSG("Use SubgridManager instead!") = SubgridManager<HostGrid>;
using SubgridGridCreator [[deprecated("Use SubgridManager instead!")]] = SubgridManager<HostGrid>;
} // end namespace Dumux
......
......@@ -28,7 +28,6 @@
#warning "This header is deprecated and will be removed after release 3.1. Use gridmanager_sub.hh"
#include <dumux/io/grid/gridmanager_sub.hh>
#include <dune/common/deprecated.hh>
namespace Dumux {
......@@ -38,7 +37,7 @@ namespace Dumux {
* \brief A grid manager for dune-subgrid
*/
template<class HostGrid, class HostGridManager = GridManager<HostGrid>>
using SubgridManager DUNE_DEPRECATED_MSG("Use GridManager<SubGrid> instead. Will be removed after release 3.1")
using SubgridManager [[deprecated("Use GridManager<SubGrid> instead. Will be removed after release 3.1")]]
= GridManager<Dune::SubGrid<HostGrid::dimension, HostGrid>>;
} // end namespace Dumux
......
......@@ -28,7 +28,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/exceptions.hh>
#include <dune/common/deprecated.hh>
#include <dumux/common/parameters.hh>
namespace Dumux {
......@@ -79,7 +78,7 @@ public:
//! Calculate the velocities for the scvs in the element
//! We assume the local containers to be bound to the complete stencil
DUNE_DEPRECATED_MSG("Use the new interface signature with elemFluxVarsCache")
[[deprecated("Use the new interface signature with elemFluxVarsCache")]]
virtual void calculateVelocity(VelocityVector& velocity,
const ElementVolumeVariables& elemVolVars,
const FVElementGeometry& fvGeometry,
......
......@@ -41,7 +41,6 @@
#include <dumux/common/valgrind.hh>
#include <dune/common/deprecated.hh>
#if HAVE_MPI
#include <mpi.h>
......@@ -58,7 +57,7 @@ namespace Dumux {
* \todo This class can most likely be replaced by Dune::VTKSequenceWriter
*/
template<class GridView, Dune::VTK::OutputType OutputValue = Dune::VTK::ascii >
class DUNE_DEPRECATED_MSG("Use VtkOutputModule instead!") VtkMultiWriter
class [[deprecated("Use VtkOutputModule instead!")]] VtkMultiWriter
{
enum { dim = GridView::dimension };
using VertexMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
......
......@@ -42,7 +42,6 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/typetraits/typetraits.hh>
#include <dumux/discretization/method.hh>
#include <dune/common/deprecated.hh>
#include "vtkfunction.hh"
#include "velocityoutput.hh"
......
......@@ -26,8 +26,6 @@
#include <algorithm>
#include <dune/common/deprecated.hh>
namespace Dumux {
/*!
......@@ -42,7 +40,7 @@ public:
* \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$
*/
template<class VolumeVariables, class SpatialParams, class Element, class FVGeometry>
DUNE_DEPRECATED_MSG("Signature deprecated. Use signature with volume variables only!")
[[deprecated("Signature deprecated. Use signature with volume variables only!")]]
static Scalar effectiveThermalConductivity(const VolumeVariables& volVars,
const SpatialParams& spatialParams,
const Element& element,
......
......@@ -27,8 +27,6 @@
#include <cmath>
#include <algorithm>
#include <dune/common/deprecated.hh>
namespace Dumux {
struct JohansenIndices
......@@ -71,7 +69,7 @@ public:
* \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975) \cite johansen1977 <BR>
*/
template<class VolumeVariables, class SpatialParams, class Element, class FVGeometry>
DUNE_DEPRECATED_MSG("Signature deprecated. Use signature with volume variables only!")
[[deprecated("Signature deprecated. Use signature with volume variables only!")]]
static Scalar effectiveThermalConductivity(const VolumeVariables& volVars,
const SpatialParams& spatialParams,
const Element& element,
......
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