From 326449fe0b161d6e15eb56c7ed52b9c3b0fc73e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Thu, 4 Aug 2022 15:09:11 +0200 Subject: [PATCH] Fix Build After "Unused.hpp" Removal Needed for configurations that don't have Dune-localfunctions or which *do* have ALUGrid. --- examples/problems/fractureproblem.hh | 74 +++++++++---------- .../vcfv/p1fegradientcalculator.hh | 32 +++----- 2 files changed, 49 insertions(+), 57 deletions(-) diff --git a/examples/problems/fractureproblem.hh b/examples/problems/fractureproblem.hh index 65a0eca47..ac7e10aed 100644 --- a/examples/problems/fractureproblem.hh +++ b/examples/problems/fractureproblem.hh @@ -345,9 +345,9 @@ public: * \copydoc FvBaseMultiPhaseProblem::temperature */ template - Scalar temperature(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar temperature([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return temperature_; } // \} @@ -361,9 +361,9 @@ 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([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return matrixK_; } /*! @@ -372,18 +372,18 @@ public: * \copydoc Doxygen::contextParams */ template - const DimMatrix& fractureIntrinsicPermeability(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const DimMatrix& fractureIntrinsicPermeability([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return fractureK_; } /*! * \copydoc FvBaseMultiPhaseProblem::porosity */ template - Scalar porosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar porosity([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return matrixPorosity_; } /*! @@ -392,18 +392,18 @@ public: * \copydoc Doxygen::contextParams */ template - Scalar fracturePorosity(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar fracturePorosity([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return fracturePorosity_; } /*! * \copydoc FvBaseMultiPhaseProblem::materialLawParams */ template - const MaterialLawParams& materialLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const MaterialLawParams& materialLawParams([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return matrixMaterialParams_; } /*! @@ -412,9 +412,9 @@ public: * \copydoc Doxygen::contextParams */ template - const MaterialLawParams& fractureMaterialLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + const MaterialLawParams& fractureMaterialLawParams([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return fractureMaterialParams_; } /*! @@ -436,10 +436,10 @@ public: * \param timeIdx The index used by the time discretization. */ template - Scalar fractureWidth(const Context& context OPM_UNUSED, - unsigned spaceIdx1 OPM_UNUSED, - unsigned spaceIdx2 OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + Scalar fractureWidth([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx1, + [[maybe_unused]] unsigned spaceIdx2, + [[maybe_unused]] unsigned timeIdx) const { return fractureWidth_; } /*! @@ -447,9 +447,9 @@ public: */ template const ThermalConductionLawParams& - thermalConductionLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + thermalConductionLawParams([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return thermalConductionParams_; } /*! @@ -459,9 +459,9 @@ public: */ template const SolidEnergyLawParams& - solidEnergyLawParams(const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + solidEnergyLawParams([[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { return solidEnergyParams_; } // \} @@ -569,9 +569,9 @@ public: */ template void initial(PrimaryVariables& values, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + [[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { FluidState fluidState; fluidState.setTemperature(temperature_); @@ -593,9 +593,9 @@ public: */ template void source(RateVector& rate, - const Context& context OPM_UNUSED, - unsigned spaceIdx OPM_UNUSED, - unsigned timeIdx OPM_UNUSED) const + [[maybe_unused]] const Context& context, + [[maybe_unused]] unsigned spaceIdx, + [[maybe_unused]] unsigned timeIdx) const { rate = Scalar(0.0); } // \} diff --git a/opm/models/discretization/vcfv/p1fegradientcalculator.hh b/opm/models/discretization/vcfv/p1fegradientcalculator.hh index 483cff805..4149fef08 100644 --- a/opm/models/discretization/vcfv/p1fegradientcalculator.hh +++ b/opm/models/discretization/vcfv/p1fegradientcalculator.hh @@ -45,12 +45,6 @@ #include -#ifdef HAVE_DUNE_LOCALFUNCTIONS -#define EWOMS_NO_LOCALFUNCTIONS_UNUSED -#else -#define EWOMS_NO_LOCALFUNCTIONS_UNUSED OPM_UNUSED -#endif - namespace Opm { /*! * \ingroup FiniteElementDiscretizations @@ -96,8 +90,8 @@ public: * \param elemCtx The current execution context */ template - void prepare(const ElementContext& elemCtx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - unsigned timeIdx EWOMS_NO_LOCALFUNCTIONS_UNUSED) + void prepare([[maybe_unused]] const ElementContext& elemCtx, + [[maybe_unused]] unsigned timeIdx) { if (getPropValue()) { #if !HAVE_DUNE_LOCALFUNCTIONS @@ -156,9 +150,9 @@ public: * freedom */ template - auto calculateScalarValue(const ElementContext& elemCtx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - unsigned fapIdx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - const QuantityCallback& quantityCallback EWOMS_NO_LOCALFUNCTIONS_UNUSED) const + auto calculateScalarValue([[maybe_unused]] const ElementContext& elemCtx, + [[maybe_unused]] unsigned fapIdx, + [[maybe_unused]] const QuantityCallback& quantityCallback) const -> typename std::remove_reference::type { if (getPropValue()) { @@ -201,9 +195,9 @@ public: * freedom */ template - auto calculateVectorValue(const ElementContext& elemCtx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - unsigned fapIdx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - const QuantityCallback& quantityCallback EWOMS_NO_LOCALFUNCTIONS_UNUSED) const + auto calculateVectorValue([[maybe_unused]] const ElementContext& elemCtx, + [[maybe_unused]] unsigned fapIdx, + [[maybe_unused]] const QuantityCallback& quantityCallback) const -> typename std::remove_reference::type { if (getPropValue()) { @@ -257,10 +251,10 @@ public: * freedom */ template - void calculateGradient(EvalDimVector& quantityGrad EWOMS_NO_LOCALFUNCTIONS_UNUSED, - const ElementContext& elemCtx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - unsigned fapIdx EWOMS_NO_LOCALFUNCTIONS_UNUSED, - const QuantityCallback& quantityCallback EWOMS_NO_LOCALFUNCTIONS_UNUSED) const + void calculateGradient([[maybe_unused]] EvalDimVector& quantityGrad, + [[maybe_unused]] const ElementContext& elemCtx, + [[maybe_unused]] unsigned fapIdx, + [[maybe_unused]] const QuantityCallback& quantityCallback) const { if (getPropValue()) { #if !HAVE_DUNE_LOCALFUNCTIONS @@ -360,6 +354,4 @@ P1FeGradientCalculator::feCache_; #endif } // namespace Opm -#undef EWOMS_NO_LOCALFUNCTIONS_UNUSED - #endif