From d6c378e6a972062616dec9b39271a0e335aaadbf Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 2 Aug 2022 10:40:48 +0200 Subject: [PATCH] remove use of Unused.hpp --- examples/problems/co2injectionproblem.hh | 13 +++--- examples/problems/cuvetteproblem.hh | 19 ++++---- examples/problems/diffusionproblem.hh | 37 ++++++++-------- examples/problems/groundwaterproblem.hh | 25 ++++++----- examples/problems/infiltrationproblem.hh | 25 ++++++----- examples/problems/lensproblem.hh | 19 ++++---- examples/problems/obstacleproblem.hh | 19 ++++---- examples/problems/outflowproblem.hh | 25 ++++++----- examples/problems/powerinjectionproblem.hh | 43 +++++++++---------- examples/problems/reservoirproblem.hh | 25 ++++++----- examples/problems/richardslensproblem.hh | 21 +++++---- examples/problems/waterairproblem.hh | 13 +++--- opm/models/blackoil/blackoilbrinemodules.hh | 1 - .../blackoil/blackoildiffusionmodule.hh | 1 - opm/models/blackoil/blackoilenergymodules.hh | 9 ++-- opm/models/blackoil/blackoilextbomodules.hh | 9 ++-- opm/models/blackoil/blackoilfoammodules.hh | 9 ++-- opm/models/blackoil/blackoilmodel.hh | 1 - opm/models/blackoil/blackoilnewtonmethod.hh | 2 - opm/models/blackoil/blackoilpolymermodules.hh | 5 +-- opm/models/blackoil/blackoilproblem.hh | 2 - opm/models/blackoil/blackoilsolventmodules.hh | 9 ++-- opm/models/common/darcyfluxmodule.hh | 1 - opm/models/common/diffusionmodule.hh | 1 - opm/models/common/energymodule.hh | 1 - opm/models/common/forchheimerfluxmodule.hh | 1 - .../multiphasebaseextensivequantities.hh | 1 - opm/models/common/multiphasebasemodel.hh | 1 - opm/models/common/multiphasebaseproblem.hh | 1 - .../common/fvbaseadlocallinearizer.hh | 1 - .../common/fvbaseboundarycontext.hh | 2 - .../common/fvbasediscretization.hh | 4 +- .../common/fvbaseelementcontext.hh | 2 - .../common/fvbaseextensivequantities.hh | 1 - .../common/fvbasegradientcalculator.hh | 2 - .../common/fvbaseintensivequantities.hh | 1 - .../common/fvbaselocalresidual.hh | 1 - .../common/fvbaseprimaryvariables.hh | 1 - .../discretization/common/fvbaseproblem.hh | 1 - .../discretization/common/restrictprolong.hh | 2 - opm/models/discretization/vcfv/vcfvstencil.hh | 1 - opm/models/flash/flashprimaryvariables.hh | 1 - opm/models/io/vtkmultiwriter.hh | 1 - opm/models/io/vtkscalarfunction.hh | 2 - opm/models/ncp/ncpnewtonmethod.hh | 1 - opm/models/nonlinear/newtonmethod.hh | 1 - opm/models/nonlinear/nullconvergencewriter.hh | 2 - opm/models/parallel/gridcommhandles.hh | 2 - opm/models/richards/richardsmodel.hh | 1 - opm/models/richards/richardsnewtonmethod.hh | 1 - .../richards/richardsprimaryvariables.hh | 1 - opm/models/utils/parametersystem.hh | 8 ++-- opm/simulators/linalg/convergencecriterion.hh | 2 - .../linalg/elementborderlistfromgrid.hh | 2 - .../linalg/foreignoverlapfrombcrsmatrix.hh | 2 - .../linalg/nullborderlistmanager.hh | 2 - .../linalg/residreductioncriterion.hh | 2 - .../linalg/vertexborderlistfromgrid.hh | 2 - tests/models/test_quadrature.cpp | 12 +----- 59 files changed, 161 insertions(+), 242 deletions(-) diff --git a/examples/problems/co2injectionproblem.hh b/examples/problems/co2injectionproblem.hh index b69a1c26a..f9728aa5d 100644 --- a/examples/problems/co2injectionproblem.hh +++ b/examples/problems/co2injectionproblem.hh @@ -44,7 +44,6 @@ #include #include #include -#include #include #include @@ -505,9 +504,9 @@ public: */ template const SolidEnergyLawParams& - solidEnergyLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + solidEnergyLawParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return solidEnergyLawParams_; } /*! @@ -604,9 +603,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/cuvetteproblem.hh b/examples/problems/cuvetteproblem.hh index 36c94caf2..cdc3eb22a 100644 --- a/examples/problems/cuvetteproblem.hh +++ b/examples/problems/cuvetteproblem.hh @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -353,9 +352,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 293.15; /* [K] */ } /*! @@ -403,9 +402,9 @@ public: */ template const ThermalConductionLawParams & - thermalConductionParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + thermalConductionParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return thermalCondParams_; } //! \} @@ -487,9 +486,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/diffusionproblem.hh b/examples/problems/diffusionproblem.hh index daab44228..5701a1ec8 100644 --- a/examples/problems/diffusionproblem.hh +++ b/examples/problems/diffusionproblem.hh @@ -37,7 +37,6 @@ #include #include #include -#include #include #include @@ -275,18 +274,18 @@ public: * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability */ template - const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const DimMatrix& intrinsicPermeability(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return K_; } /*! * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 0.35; } /*! @@ -294,18 +293,18 @@ public: */ template const MaterialLawParams& - materialLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + materialLawParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return materialParams_; } /*! * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } //! \} @@ -322,9 +321,9 @@ public: */ template void boundary(BoundaryRateVector& values, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { values.setNoFlow(); } //! \} @@ -358,9 +357,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/groundwaterproblem.hh b/examples/problems/groundwaterproblem.hh index 350829ca4..b4214d638 100644 --- a/examples/problems/groundwaterproblem.hh +++ b/examples/problems/groundwaterproblem.hh @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -334,18 +333,18 @@ public: * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 273.15 + 10; } // 10C /*! * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 0.4; } /*! @@ -419,9 +418,9 @@ public: */ template void initial(PrimaryVariables& values, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { // const GlobalPosition& globalPos = context.pos(spaceIdx, timeIdx); values[pressure0Idx] = 1.0e+5; // + 9.81*1.23*(20-globalPos[dim-1]); @@ -432,9 +431,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/infiltrationproblem.hh b/examples/problems/infiltrationproblem.hh index edf68cfa8..933313ae0 100644 --- a/examples/problems/infiltrationproblem.hh +++ b/examples/problems/infiltrationproblem.hh @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -284,9 +283,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } /*! @@ -308,9 +307,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return porosity_; } /*! @@ -318,9 +317,9 @@ public: */ template const MaterialLawParams& - materialLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + materialLawParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return materialParams_; } //! \} @@ -392,9 +391,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/lensproblem.hh b/examples/problems/lensproblem.hh index 697326224..61f66e696 100644 --- a/examples/problems/lensproblem.hh +++ b/examples/problems/lensproblem.hh @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -438,9 +437,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 0.4; } /*! @@ -461,9 +460,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } //! \} @@ -660,9 +659,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/obstacleproblem.hh b/examples/problems/obstacleproblem.hh index e918c8faf..bcb1f0eda 100644 --- a/examples/problems/obstacleproblem.hh +++ b/examples/problems/obstacleproblem.hh @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -328,9 +327,9 @@ public: * This problem simply assumes a constant temperature. */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } /*! @@ -385,9 +384,9 @@ public: */ template const SolidEnergyLawParams& - solidEnergyLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + solidEnergyLawParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return solidEnergyLawParams_; } /*! @@ -459,9 +458,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = 0.0; } //! \} diff --git a/examples/problems/outflowproblem.hh b/examples/problems/outflowproblem.hh index 67bfcc1b3..e4b988fc8 100644 --- a/examples/problems/outflowproblem.hh +++ b/examples/problems/outflowproblem.hh @@ -31,7 +31,6 @@ #include #include -#include #include #include @@ -217,9 +216,9 @@ public: * This problem assumes a temperature. */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } // in [K] /*! @@ -228,9 +227,9 @@ public: * This problem uses a constant intrinsic permeability. */ template - const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const DimMatrix& intrinsicPermeability(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return perm_; } /*! @@ -239,9 +238,9 @@ public: * This problem uses a constant porosity. */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return porosity_; } #if 0 @@ -342,9 +341,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/powerinjectionproblem.hh b/examples/problems/powerinjectionproblem.hh index 284f85dfe..2a77c4079 100644 --- a/examples/problems/powerinjectionproblem.hh +++ b/examples/problems/powerinjectionproblem.hh @@ -39,7 +39,6 @@ #include #include #include -#include #include @@ -314,27 +313,27 @@ public: * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability */ template - const DimMatrix& intrinsicPermeability(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const DimMatrix& intrinsicPermeability(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return K_; } /*! * \copydoc ForchheimerBaseProblem::ergunCoefficient */ template - Scalar ergunCoefficient(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar ergunCoefficient(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 0.3866; } /*! * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 0.558; } /*! @@ -342,18 +341,18 @@ public: */ template const MaterialLawParams& - materialLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + materialLawParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return materialParams_; } /*! * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } //! \} @@ -404,9 +403,9 @@ public: */ template void initial(PrimaryVariables& values, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { // assign the primary variables values.assignNaive(initialFluidState_); @@ -420,9 +419,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/reservoirproblem.hh b/examples/problems/reservoirproblem.hh index 58616db76..879af1fdb 100644 --- a/examples/problems/reservoirproblem.hh +++ b/examples/problems/reservoirproblem.hh @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -532,9 +531,9 @@ public: * will need it one day? */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return temperature_; } // \} @@ -552,9 +551,9 @@ public: */ template void boundary(BoundaryRateVector& values, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { // no flow on top and bottom values.setNoFlow(); @@ -575,9 +574,9 @@ public: */ template void initial(PrimaryVariables& values, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { values.assignNaive(initialFluidState_); @@ -622,9 +621,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/richardslensproblem.hh b/examples/problems/richardslensproblem.hh index 16358af87..a36f30e6b 100644 --- a/examples/problems/richardslensproblem.hh +++ b/examples/problems/richardslensproblem.hh @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -302,7 +301,7 @@ public: Scalar temperature(const Context& context, unsigned spaceIdx, unsigned timeIdx) const { return temperature(context.globalSpaceIndex(spaceIdx, timeIdx), timeIdx); } - Scalar temperature(unsigned globalSpaceIdx OPM_UNUSED, unsigned timeIdx OPM_UNUSED) const + Scalar temperature(unsigned /*globalSpaceIdx*/, unsigned /*timeIdx*/) const { return 273.15 + 10; } // -> 10°C /*! @@ -323,9 +322,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return 0.4; } /*! @@ -341,7 +340,7 @@ public: } const MaterialLawParams& materialLawParams(unsigned globalSpaceIdx, - unsigned timeIdx OPM_UNUSED) const + unsigned /*timeIdx*/) const { if (dofIsInLens_[globalSpaceIdx]) return lensMaterialParams_; @@ -361,8 +360,8 @@ public: // the Richards model does not have an element context available at all places // where the reference pressure is required... - Scalar referencePressure(unsigned globalSpaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar referencePressure(unsigned /*globalSpaceIdx*/, + unsigned /*timeIdx*/) const { return pnRef_; } //! \} @@ -454,9 +453,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = Scalar(0.0); } //! \} diff --git a/examples/problems/waterairproblem.hh b/examples/problems/waterairproblem.hh index 34012ea17..51f8fedfc 100644 --- a/examples/problems/waterairproblem.hh +++ b/examples/problems/waterairproblem.hh @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -399,9 +398,9 @@ public: */ template const SolidEnergyLawParams& - solidEnergyLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + solidEnergyLawParams(const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { return solidEnergyLawParams_; } /*! @@ -508,9 +507,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const Context& /*context*/, + unsigned /*spaceIdx*/, + unsigned /*timeIdx*/) const { rate = 0; } //! \} diff --git a/opm/models/blackoil/blackoilbrinemodules.hh b/opm/models/blackoil/blackoilbrinemodules.hh index 8e8a37181..7d7e225cd 100644 --- a/opm/models/blackoil/blackoilbrinemodules.hh +++ b/opm/models/blackoil/blackoilbrinemodules.hh @@ -44,7 +44,6 @@ #endif #include -#include #include diff --git a/opm/models/blackoil/blackoildiffusionmodule.hh b/opm/models/blackoil/blackoildiffusionmodule.hh index 1b4988e97..faf362efa 100644 --- a/opm/models/blackoil/blackoildiffusionmodule.hh +++ b/opm/models/blackoil/blackoildiffusionmodule.hh @@ -31,7 +31,6 @@ #include #include -#include #include diff --git a/opm/models/blackoil/blackoilenergymodules.hh b/opm/models/blackoil/blackoilenergymodules.hh index 252b59041..ebeab4f77 100644 --- a/opm/models/blackoil/blackoilenergymodules.hh +++ b/opm/models/blackoil/blackoilenergymodules.hh @@ -35,7 +35,6 @@ #include #include -#include #include @@ -105,14 +104,14 @@ public: return pvIdx == temperatureIdx; } - static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED) + static std::string primaryVarName([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); return "temperature"; } - static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED) + static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); @@ -128,14 +127,14 @@ public: return eqIdx == contiEnergyEqIdx; } - static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED) + static std::string eqName([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); return "conti^energy"; } - static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED) + static Scalar eqWeight([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); diff --git a/opm/models/blackoil/blackoilextbomodules.hh b/opm/models/blackoil/blackoilextbomodules.hh index 2acb07ed6..25a1a6a27 100644 --- a/opm/models/blackoil/blackoilextbomodules.hh +++ b/opm/models/blackoil/blackoilextbomodules.hh @@ -54,7 +54,6 @@ #endif #include -#include #include #include @@ -292,14 +291,14 @@ public: return pvIdx == zFractionIdx; } - static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED) + static std::string primaryVarName([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); return "z_fraction"; } - static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED) + static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); @@ -315,14 +314,14 @@ public: return eqIdx == contiZfracEqIdx; } - static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED) + static std::string eqName([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); return "conti^solvent"; } - static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED) + static Scalar eqWeight([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); diff --git a/opm/models/blackoil/blackoilfoammodules.hh b/opm/models/blackoil/blackoilfoammodules.hh index bd9d10293..5fea392e1 100644 --- a/opm/models/blackoil/blackoilfoammodules.hh +++ b/opm/models/blackoil/blackoilfoammodules.hh @@ -42,7 +42,6 @@ #endif #include -#include #include @@ -258,13 +257,13 @@ public: } } - static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED) + static std::string primaryVarName([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); return "foam_concentration"; } - static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED) + static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); @@ -281,14 +280,14 @@ public: } - static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED) + static std::string eqName([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); return "conti^foam"; } - static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED) + static Scalar eqWeight([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh index 4dafda127..1c7ebd258 100644 --- a/opm/models/blackoil/blackoilmodel.hh +++ b/opm/models/blackoil/blackoilmodel.hh @@ -56,7 +56,6 @@ #include #include -#include #include #include diff --git a/opm/models/blackoil/blackoilnewtonmethod.hh b/opm/models/blackoil/blackoilnewtonmethod.hh index 9fc958537..aa0a07774 100644 --- a/opm/models/blackoil/blackoilnewtonmethod.hh +++ b/opm/models/blackoil/blackoilnewtonmethod.hh @@ -34,8 +34,6 @@ #include #include "blackoilmicpmodules.hh" -#include - namespace Opm::Properties { template diff --git a/opm/models/blackoil/blackoilpolymermodules.hh b/opm/models/blackoil/blackoilpolymermodules.hh index 8cf5544a6..9e312dba2 100644 --- a/opm/models/blackoil/blackoilpolymermodules.hh +++ b/opm/models/blackoil/blackoilpolymermodules.hh @@ -47,7 +47,6 @@ #endif #include -#include #include @@ -548,7 +547,7 @@ public: } } - static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED) + static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); @@ -578,7 +577,7 @@ public: return "conti^polymer_molecularweight"; } - static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED) + static Scalar eqWeight([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); diff --git a/opm/models/blackoil/blackoilproblem.hh b/opm/models/blackoil/blackoilproblem.hh index 6d22fd7f1..4866020a5 100644 --- a/opm/models/blackoil/blackoilproblem.hh +++ b/opm/models/blackoil/blackoilproblem.hh @@ -32,8 +32,6 @@ #include -#include - namespace Opm { /*! diff --git a/opm/models/blackoil/blackoilsolventmodules.hh b/opm/models/blackoil/blackoilsolventmodules.hh index 04531ba19..526aa5fd6 100644 --- a/opm/models/blackoil/blackoilsolventmodules.hh +++ b/opm/models/blackoil/blackoilsolventmodules.hh @@ -48,7 +48,6 @@ #endif #include -#include #include #include @@ -499,14 +498,14 @@ public: return pvIdx == solventSaturationIdx; } - static std::string primaryVarName(unsigned pvIdx OPM_OPTIM_UNUSED) + static std::string primaryVarName([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); return "saturation_solvent"; } - static Scalar primaryVarWeight(unsigned pvIdx OPM_OPTIM_UNUSED) + static Scalar primaryVarWeight([[maybe_unused]] unsigned pvIdx) { assert(primaryVarApplies(pvIdx)); @@ -522,14 +521,14 @@ public: return eqIdx == contiSolventEqIdx; } - static std::string eqName(unsigned eqIdx OPM_OPTIM_UNUSED) + static std::string eqName([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); return "conti^solvent"; } - static Scalar eqWeight(unsigned eqIdx OPM_OPTIM_UNUSED) + static Scalar eqWeight([[maybe_unused]] unsigned eqIdx) { assert(eqApplies(eqIdx)); diff --git a/opm/models/common/darcyfluxmodule.hh b/opm/models/common/darcyfluxmodule.hh index ffcaa036d..c4788ecf2 100644 --- a/opm/models/common/darcyfluxmodule.hh +++ b/opm/models/common/darcyfluxmodule.hh @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/opm/models/common/diffusionmodule.hh b/opm/models/common/diffusionmodule.hh index 1f514f064..f04bf55ba 100644 --- a/opm/models/common/diffusionmodule.hh +++ b/opm/models/common/diffusionmodule.hh @@ -32,7 +32,6 @@ #include #include -#include #include diff --git a/opm/models/common/energymodule.hh b/opm/models/common/energymodule.hh index b08ce0605..b781e77ae 100644 --- a/opm/models/common/energymodule.hh +++ b/opm/models/common/energymodule.hh @@ -33,7 +33,6 @@ #include #include -#include #include diff --git a/opm/models/common/forchheimerfluxmodule.hh b/opm/models/common/forchheimerfluxmodule.hh index 3d0b7c6b2..3d141caf7 100644 --- a/opm/models/common/forchheimerfluxmodule.hh +++ b/opm/models/common/forchheimerfluxmodule.hh @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/opm/models/common/multiphasebaseextensivequantities.hh b/opm/models/common/multiphasebaseextensivequantities.hh index 35c97e1e1..fde81bb93 100644 --- a/opm/models/common/multiphasebaseextensivequantities.hh +++ b/opm/models/common/multiphasebaseextensivequantities.hh @@ -35,7 +35,6 @@ #include #include -#include #include diff --git a/opm/models/common/multiphasebasemodel.hh b/opm/models/common/multiphasebasemodel.hh index 60b4bbad5..df09635ac 100644 --- a/opm/models/common/multiphasebasemodel.hh +++ b/opm/models/common/multiphasebasemodel.hh @@ -43,7 +43,6 @@ #include #include #include -#include namespace Opm { template diff --git a/opm/models/common/multiphasebaseproblem.hh b/opm/models/common/multiphasebaseproblem.hh index 8818969d1..85964a5c4 100644 --- a/opm/models/common/multiphasebaseproblem.hh +++ b/opm/models/common/multiphasebaseproblem.hh @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/opm/models/discretization/common/fvbaseadlocallinearizer.hh b/opm/models/discretization/common/fvbaseadlocallinearizer.hh index 7e809937c..69fb9dfd3 100644 --- a/opm/models/discretization/common/fvbaseadlocallinearizer.hh +++ b/opm/models/discretization/common/fvbaseadlocallinearizer.hh @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/opm/models/discretization/common/fvbaseboundarycontext.hh b/opm/models/discretization/common/fvbaseboundarycontext.hh index 1bc9964f5..418443116 100644 --- a/opm/models/discretization/common/fvbaseboundarycontext.hh +++ b/opm/models/discretization/common/fvbaseboundarycontext.hh @@ -30,8 +30,6 @@ #include "fvbaseproperties.hh" -#include - #include namespace Opm { diff --git a/opm/models/discretization/common/fvbasediscretization.hh b/opm/models/discretization/common/fvbasediscretization.hh index 93ee827a1..195020b5d 100644 --- a/opm/models/discretization/common/fvbasediscretization.hh +++ b/opm/models/discretization/common/fvbasediscretization.hh @@ -59,7 +59,6 @@ #include #include -#include #include #include @@ -1004,7 +1003,8 @@ public: * This method is purely intented for debugging purposes. If the program is compiled * with optimizations enabled, it becomes a no-op. */ - void checkConservativeness(Scalar OPM_OPTIM_UNUSED tolerance = -1, bool OPM_OPTIM_UNUSED verbose=false) const + void checkConservativeness([[maybe_unused]] Scalar tolerance = -1, + [[maybe_unused]] bool verbose=false) const { #ifndef NDEBUG Scalar totalBoundaryArea(0.0); diff --git a/opm/models/discretization/common/fvbaseelementcontext.hh b/opm/models/discretization/common/fvbaseelementcontext.hh index ea95d61de..36bfada03 100644 --- a/opm/models/discretization/common/fvbaseelementcontext.hh +++ b/opm/models/discretization/common/fvbaseelementcontext.hh @@ -33,8 +33,6 @@ #include #include -#include - #include #include diff --git a/opm/models/discretization/common/fvbaseextensivequantities.hh b/opm/models/discretization/common/fvbaseextensivequantities.hh index 621f5e17a..35c97cbb6 100644 --- a/opm/models/discretization/common/fvbaseextensivequantities.hh +++ b/opm/models/discretization/common/fvbaseextensivequantities.hh @@ -33,7 +33,6 @@ #include #include -#include namespace Opm { /*! diff --git a/opm/models/discretization/common/fvbasegradientcalculator.hh b/opm/models/discretization/common/fvbasegradientcalculator.hh index 35c0d1711..2f1ccd547 100644 --- a/opm/models/discretization/common/fvbasegradientcalculator.hh +++ b/opm/models/discretization/common/fvbasegradientcalculator.hh @@ -30,8 +30,6 @@ #include "fvbaseproperties.hh" -#include - #include namespace Opm { diff --git a/opm/models/discretization/common/fvbaseintensivequantities.hh b/opm/models/discretization/common/fvbaseintensivequantities.hh index 96df82604..d8f432376 100644 --- a/opm/models/discretization/common/fvbaseintensivequantities.hh +++ b/opm/models/discretization/common/fvbaseintensivequantities.hh @@ -31,7 +31,6 @@ #include "fvbaseproperties.hh" #include -#include namespace Opm { diff --git a/opm/models/discretization/common/fvbaselocalresidual.hh b/opm/models/discretization/common/fvbaselocalresidual.hh index 4572fa964..e8c4d0716 100644 --- a/opm/models/discretization/common/fvbaselocalresidual.hh +++ b/opm/models/discretization/common/fvbaselocalresidual.hh @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/opm/models/discretization/common/fvbaseprimaryvariables.hh b/opm/models/discretization/common/fvbaseprimaryvariables.hh index cca571909..e6b66744a 100644 --- a/opm/models/discretization/common/fvbaseprimaryvariables.hh +++ b/opm/models/discretization/common/fvbaseprimaryvariables.hh @@ -33,7 +33,6 @@ #include "fvbaseproperties.hh" #include "linearizationtype.hh" #include -#include #include #include diff --git a/opm/models/discretization/common/fvbaseproblem.hh b/opm/models/discretization/common/fvbaseproblem.hh index 396377408..73035a9e5 100644 --- a/opm/models/discretization/common/fvbaseproblem.hh +++ b/opm/models/discretization/common/fvbaseproblem.hh @@ -34,7 +34,6 @@ #include #include -#include #include #include diff --git a/opm/models/discretization/common/restrictprolong.hh b/opm/models/discretization/common/restrictprolong.hh index aa8072d87..441d04b28 100644 --- a/opm/models/discretization/common/restrictprolong.hh +++ b/opm/models/discretization/common/restrictprolong.hh @@ -23,8 +23,6 @@ #ifndef EWOMS_COPYRESTRICTPROLONG_HH #define EWOMS_COPYRESTRICTPROLONG_HH -#include - #if HAVE_DUNE_FEM #include #endif diff --git a/opm/models/discretization/vcfv/vcfvstencil.hh b/opm/models/discretization/vcfv/vcfvstencil.hh index 84e216e3f..83017e189 100644 --- a/opm/models/discretization/vcfv/vcfvstencil.hh +++ b/opm/models/discretization/vcfv/vcfvstencil.hh @@ -30,7 +30,6 @@ #include -#include #include #include diff --git a/opm/models/flash/flashprimaryvariables.hh b/opm/models/flash/flashprimaryvariables.hh index 357204570..98b980818 100644 --- a/opm/models/flash/flashprimaryvariables.hh +++ b/opm/models/flash/flashprimaryvariables.hh @@ -37,7 +37,6 @@ #include #include #include -#include #include diff --git a/opm/models/io/vtkmultiwriter.hh b/opm/models/io/vtkmultiwriter.hh index b0dd819b1..d966161d8 100644 --- a/opm/models/io/vtkmultiwriter.hh +++ b/opm/models/io/vtkmultiwriter.hh @@ -36,7 +36,6 @@ #include #include -#include #include #include diff --git a/opm/models/io/vtkscalarfunction.hh b/opm/models/io/vtkscalarfunction.hh index 6c62a0f05..8efe825f9 100644 --- a/opm/models/io/vtkscalarfunction.hh +++ b/opm/models/io/vtkscalarfunction.hh @@ -34,8 +34,6 @@ #include #include -#include - #include #include diff --git a/opm/models/ncp/ncpnewtonmethod.hh b/opm/models/ncp/ncpnewtonmethod.hh index c2bc9583a..d7e5d60c3 100644 --- a/opm/models/ncp/ncpnewtonmethod.hh +++ b/opm/models/ncp/ncpnewtonmethod.hh @@ -32,7 +32,6 @@ #include -#include #include #include diff --git a/opm/models/nonlinear/newtonmethod.hh b/opm/models/nonlinear/newtonmethod.hh index aff2b710a..68a051b9e 100644 --- a/opm/models/nonlinear/newtonmethod.hh +++ b/opm/models/nonlinear/newtonmethod.hh @@ -36,7 +36,6 @@ #include #include -#include #include diff --git a/opm/models/nonlinear/nullconvergencewriter.hh b/opm/models/nonlinear/nullconvergencewriter.hh index 1ee9bdcf5..201bb4480 100644 --- a/opm/models/nonlinear/nullconvergencewriter.hh +++ b/opm/models/nonlinear/nullconvergencewriter.hh @@ -30,8 +30,6 @@ #include -#include - namespace Opm::Properties { template diff --git a/opm/models/parallel/gridcommhandles.hh b/opm/models/parallel/gridcommhandles.hh index 16ba0cc36..559632256 100644 --- a/opm/models/parallel/gridcommhandles.hh +++ b/opm/models/parallel/gridcommhandles.hh @@ -29,8 +29,6 @@ #ifndef EWOMS_GRID_COMM_HANDLES_HH #define EWOMS_GRID_COMM_HANDLES_HH -#include - #include #include diff --git a/opm/models/richards/richardsmodel.hh b/opm/models/richards/richardsmodel.hh index a09409393..633a63acd 100644 --- a/opm/models/richards/richardsmodel.hh +++ b/opm/models/richards/richardsmodel.hh @@ -46,7 +46,6 @@ #include #include #include -#include #include #include diff --git a/opm/models/richards/richardsnewtonmethod.hh b/opm/models/richards/richardsnewtonmethod.hh index f11d50e23..e6c9b98a1 100644 --- a/opm/models/richards/richardsnewtonmethod.hh +++ b/opm/models/richards/richardsnewtonmethod.hh @@ -31,7 +31,6 @@ #include "richardsproperties.hh" #include -#include #include diff --git a/opm/models/richards/richardsprimaryvariables.hh b/opm/models/richards/richardsprimaryvariables.hh index 0614ae61a..8fecd2708 100644 --- a/opm/models/richards/richardsprimaryvariables.hh +++ b/opm/models/richards/richardsprimaryvariables.hh @@ -35,7 +35,6 @@ #include #include #include -#include #include diff --git a/opm/models/utils/parametersystem.hh b/opm/models/utils/parametersystem.hh index 00f6a0b74..5f0a9313c 100644 --- a/opm/models/utils/parametersystem.hh +++ b/opm/models/utils/parametersystem.hh @@ -34,8 +34,6 @@ #include -#include - #if HAVE_QUAD #include #endif // HAVE_QUAD @@ -985,8 +983,8 @@ public: } template - static bool isSet(const char *propTagName OPM_OPTIM_UNUSED, - const char *paramName OPM_OPTIM_UNUSED, + static bool isSet([[maybe_unused]] const char* propTagName, + [[maybe_unused]] const char* paramName, bool errorIfNotRegistered = true) { @@ -1063,7 +1061,7 @@ private: } template - static ParamType retrieve_(const char OPM_OPTIM_UNUSED *propTagName, + static ParamType retrieve_([[maybe_unused]] const char* propTagName, const char *paramName, const ParamType& defaultValue, bool errorIfNotRegistered = true) diff --git a/opm/simulators/linalg/convergencecriterion.hh b/opm/simulators/linalg/convergencecriterion.hh index bd1de5c66..c755ca6a8 100644 --- a/opm/simulators/linalg/convergencecriterion.hh +++ b/opm/simulators/linalg/convergencecriterion.hh @@ -27,8 +27,6 @@ #ifndef EWOMS_ISTL_CONVERGENCE_CRITERION_HH #define EWOMS_ISTL_CONVERGENCE_CRITERION_HH -#include - #include #include diff --git a/opm/simulators/linalg/elementborderlistfromgrid.hh b/opm/simulators/linalg/elementborderlistfromgrid.hh index dabe6b200..f0399099c 100644 --- a/opm/simulators/linalg/elementborderlistfromgrid.hh +++ b/opm/simulators/linalg/elementborderlistfromgrid.hh @@ -30,8 +30,6 @@ #include "overlaptypes.hh" #include "blacklist.hh" -#include - #include #include #include diff --git a/opm/simulators/linalg/foreignoverlapfrombcrsmatrix.hh b/opm/simulators/linalg/foreignoverlapfrombcrsmatrix.hh index 1e5c7a21a..14e0c608c 100644 --- a/opm/simulators/linalg/foreignoverlapfrombcrsmatrix.hh +++ b/opm/simulators/linalg/foreignoverlapfrombcrsmatrix.hh @@ -32,8 +32,6 @@ #include -#include - #include #include #include diff --git a/opm/simulators/linalg/nullborderlistmanager.hh b/opm/simulators/linalg/nullborderlistmanager.hh index 7b4bbc05a..2564eb9c1 100644 --- a/opm/simulators/linalg/nullborderlistmanager.hh +++ b/opm/simulators/linalg/nullborderlistmanager.hh @@ -29,8 +29,6 @@ #include "overlaptypes.hh" -#include - #include #include #include diff --git a/opm/simulators/linalg/residreductioncriterion.hh b/opm/simulators/linalg/residreductioncriterion.hh index 8d9af527c..6d1875abc 100644 --- a/opm/simulators/linalg/residreductioncriterion.hh +++ b/opm/simulators/linalg/residreductioncriterion.hh @@ -29,8 +29,6 @@ #include "convergencecriterion.hh" -#include - #include namespace Opm { diff --git a/opm/simulators/linalg/vertexborderlistfromgrid.hh b/opm/simulators/linalg/vertexborderlistfromgrid.hh index 8413d1cc8..ab7d56348 100644 --- a/opm/simulators/linalg/vertexborderlistfromgrid.hh +++ b/opm/simulators/linalg/vertexborderlistfromgrid.hh @@ -30,8 +30,6 @@ #include "overlaptypes.hh" #include "blacklist.hh" -#include - #include #include #include diff --git a/tests/models/test_quadrature.cpp b/tests/models/test_quadrature.cpp index 93113e245..9e885752f 100644 --- a/tests/models/test_quadrature.cpp +++ b/tests/models/test_quadrature.cpp @@ -41,14 +41,6 @@ #include -#include - -#if HAVE_DUNE_ALUGRID -#define EWOMS_NO_ALUGRID_UNUSED -#else -#define EWOMS_NO_ALUGRID_UNUSED OPM_UNUSED -#endif - const unsigned dim = 3; using Scalar = double; using QuadratureGeom = Opm::QuadrialteralQuadratureGeometry; @@ -110,7 +102,7 @@ void testIdenityMapping() } template -void writeTetrahedronSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid) +void writeTetrahedronSubControlVolumes([[maybe_unused]] const Grid& grid) { #if HAVE_DUNE_ALUGRID using GridView = typename Grid::LeafGridView; @@ -196,7 +188,7 @@ void testTetrahedron() } template -void writeCubeSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid) +void writeCubeSubControlVolumes([[maybe_unused]] const Grid& grid) { #if HAVE_DUNE_ALUGRID using GridView = typename Grid::LeafGridView;