Commit d9166f1e authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

Remove superfluous semicolons.

parent 066b67aa
......@@ -384,7 +384,7 @@ public:
struct hasVertexColor
{
template<class Engine>
auto operator()(Engine&& e) -> decltype(e.vertexColor(0)) {};
auto operator()(Engine&& e) -> decltype(e.vertexColor(0)) {}
};
/*!
......
......@@ -83,7 +83,7 @@ public:
setSolidTemperature_(problem, elemSol);
// update the density of the solid phase
solidState_.setDensity(SolidSystem::density(solidState_));
};
}
//! Return the average porosity \f$\mathrm{[-]}\f$ within the control volume.
Scalar solidDensity() const
......
......@@ -38,7 +38,7 @@ struct hasEffFluidDensityAtPos
template<class Problem>
auto operator()(const Problem& a)
-> decltype(a.effectiveFluidDensityAtPos(std::declval<GlobalPosition>()))
{};
{}
};
// helper struct detecting if the user-defined problem class has an effectivePorePressureAtPos function
......@@ -49,7 +49,7 @@ struct hasEffPorePressureAtPos
template<class Problem>
auto operator()(const Problem& a)
-> decltype(a.effectivePorePressureAtPos(std::declval<GlobalPosition>()))
{};
{}
};
} // end namespace Detail
......
......@@ -84,7 +84,7 @@ public:
const auto gradU = evalGradients(element, element.geometry(), problem.fvGridGeometry(), elemSol, scv.center());
for (int dir = 0; dir < Element::Geometry::mydimension; ++dir)
divU_ += gradU[Indices::u(dir)][dir];
};
}
//! Return the average porosity \f$\mathrm{[-]}\f$ within the scv.
Scalar solidDensity() const
......
......@@ -41,7 +41,7 @@ struct hasMaterialLawParamsAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.materialLawParamsAtPos(std::declval<GlobalPosition>()))
{};
{}
};
} // end namespace Detail
#endif
......
......@@ -44,7 +44,7 @@ struct hasPermeabilityAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.permeabilityAtPos(std::declval<GlobalPosition>()))
{};
{}
};
template<class GlobalPosition, class SolidSystem>
......@@ -53,7 +53,7 @@ struct hasInertVolumeFractionAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.template inertVolumeFractionAtPos<SolidSystem>(std::declval<GlobalPosition>(), 0))
{};
{}
};
template<class GlobalPosition>
......@@ -62,7 +62,7 @@ struct hasPorosityAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.porosityAtPos(std::declval<GlobalPosition>()))
{};
{}
};
} // end namespace Detail
#endif
......
......@@ -41,7 +41,7 @@ struct hasLameParamsAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.lameParamsAtPos(std::declval<GlobalPosition>()))
{};
{}
};
} // end namespace Detail
......
......@@ -39,7 +39,7 @@ struct hasLameParamsAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.lameParamsAtPos(std::declval<GlobalPosition>()))
{};
{}
};
// helper struct detecting if the user-defined spatial params class has a inertVolumeFractionAtPos function
......@@ -50,7 +50,7 @@ struct hasInertVolumeFractionAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.template inertVolumeFractionAtPos<SolidSystem>(std::declval<GlobalPosition>(), 0))
{};
{}
};
// helper struct detecting if the user-defined spatial params class has a reactiveVolumeFractionAtPos function
......@@ -61,7 +61,7 @@ struct hasReactiveVolumeFractionAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.template reactiveVolumeFractionAtPos<SolidSystem>(std::declval<GlobalPosition>(), 0))
{};
{}
};
// helper struct detecting if the user-defined spatial params class has a porosityAtPos function
......@@ -72,7 +72,7 @@ struct hasPorosityAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.porosityAtPos(std::declval<GlobalPosition>()))
{};
{}
};
// helper struct detecting if the user-defined spatial params class has a biotCoefficientAtPos function
......@@ -83,7 +83,7 @@ struct hasBiotCoeffAtPos
template<class SpatialParams>
auto operator()(const SpatialParams& a)
-> decltype(a.biotCoefficientAtPos(std::declval<GlobalPosition>()))
{};
{}
};
} // end namespace Detail
......
......@@ -56,7 +56,7 @@ struct supportsPartialReassembly
auto operator()(Assembler&& a)
-> decltype(a.assembleJacobianAndResidual(std::declval<const typename Assembler::ResidualType&>(),
std::declval<const PartialReassembler<Assembler>*>()))
{};
{}
};
/*!
......
......@@ -85,7 +85,7 @@ public:
updateSolidVolumeFractions(elemSol, problem, element, scv, solidState_, numFluidComps);
EnergyVolVars::updateSolidEnergyParams(elemSol, problem, element, scv, solidState_);
permeability_ = problem.spatialParams().permeability(element, scv, elemSol);
};
}
/*!
* \brief Set complete fluid state
......
......@@ -67,16 +67,16 @@ struct AlwaysFalse<DisableStaticAssert> : public std::true_type {};
}
//! helper structs for detecting if a component has certain functions overloaded
struct checkLiqDen { template<class C> auto operator()(C&& c) -> decltype(C::template liquidDensity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkLiqEnth { template<class C> auto operator()(C&& c) -> decltype(C::template liquidEnthalpy<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkLiqHeatCap { template<class C> auto operator()(C&& c) -> decltype(C::template liquidHeatCapacity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkLiqVisc { template<class C> auto operator()(C&& c) -> decltype(C::template liquidViscosity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkLiqThermCond { template<class C> auto operator()(C&& c) -> decltype(C::template liquidThermalConductivity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkGasDen { template<class C> auto operator()(C&& c) -> decltype(C::template gasDensity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkGasEnth { template<class C> auto operator()(C&& c) -> decltype(C::template gasEnthalpy<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkGasHeatCap { template<class C> auto operator()(C&& c) -> decltype(C::template gasHeatCapacity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkGasVisc { template<class C> auto operator()(C&& c) -> decltype(C::template gasViscosity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkGasThermCond { template<class C> auto operator()(C&& c) -> decltype(C::template gasThermalConductivity<DisableStaticAssert>(0.0, 0.0)) {}; };
struct checkLiqDen { template<class C> auto operator()(C&& c) -> decltype(C::template liquidDensity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkLiqEnth { template<class C> auto operator()(C&& c) -> decltype(C::template liquidEnthalpy<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkLiqHeatCap { template<class C> auto operator()(C&& c) -> decltype(C::template liquidHeatCapacity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkLiqVisc { template<class C> auto operator()(C&& c) -> decltype(C::template liquidViscosity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkLiqThermCond { template<class C> auto operator()(C&& c) -> decltype(C::template liquidThermalConductivity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkGasDen { template<class C> auto operator()(C&& c) -> decltype(C::template gasDensity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkGasEnth { template<class C> auto operator()(C&& c) -> decltype(C::template gasEnthalpy<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkGasHeatCap { template<class C> auto operator()(C&& c) -> decltype(C::template gasHeatCapacity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkGasVisc { template<class C> auto operator()(C&& c) -> decltype(C::template gasViscosity<DisableStaticAssert>(0.0, 0.0)) {} };
struct checkGasThermCond { template<class C> auto operator()(C&& c) -> decltype(C::template gasThermalConductivity<DisableStaticAssert>(0.0, 0.0)) {} };
//! plot given values
template<class Functor>
......
......@@ -359,7 +359,7 @@ int checkFluidState(const BaseFluidState &fs)
try
{
val = fs.enthalpy(/*phaseIdx=*/0);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: fluidState.enthalpy() is not implemented\n";
} catch (...)
......@@ -369,7 +369,7 @@ int checkFluidState(const BaseFluidState &fs)
try
{
val = fs.internalEnergy(/*phaseIdx=*/0);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: fluidState.internalEnergy() is not implemented\n";
} catch (...)
......@@ -555,7 +555,7 @@ int checkFluidSystem()
try
{
val = FluidSystem::heatCapacity(fs, paramCache, phaseIdx);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: FluidSystem::heatCapacity() is not implemented\n";
} catch (...)
......@@ -565,7 +565,7 @@ int checkFluidSystem()
try
{
val = FluidSystem::thermalConductivity(fs, paramCache, phaseIdx);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: FluidSystem::thermalConductivity() is not implemented\n";
} catch (...)
......@@ -579,7 +579,7 @@ int checkFluidSystem()
try
{
val = FluidSystem::fugacityCoefficient(fs, paramCache, phaseIdx, compIdx);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: FluidSystem::fugacityCoefficient() is not implemented\n";
} catch (...)
......@@ -605,10 +605,10 @@ int checkFluidSystem()
try
{
val = FluidSystem::binaryDiffusionCoefficient(fs, paramCache, phaseIdx, compIdx, comp2Idx);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: FluidSystem::binaryDiffusionCoefficient() is not implemented\n";
} catch (Dune::InvalidStateException)
} catch (Dune::InvalidStateException&)
{
collectedWarnings += "warning: FluidSystem::binaryDiffusionCoefficient() gives invalid state exception\n";
} catch (...)
......
......@@ -91,7 +91,7 @@ int checkSolidSystem()
try
{
val = SolidSystem::heatCapacity(sst);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: SolidSystem::heatCapacity() is not implemented\n";
} catch (...)
......@@ -102,7 +102,7 @@ int checkSolidSystem()
try
{
val = SolidSystem::thermalConductivity(sst);
} catch (Dune::NotImplemented)
} catch (Dune::NotImplemented&)
{
collectedWarnings += "warning: SolidSystem::thermalConductivity() is not implemented\n";
} catch (...)
......@@ -113,7 +113,7 @@ int checkSolidSystem()
try
{
val = SolidSystem::density(sst);
} catch (Dune::Exception e)
} catch (Dune::Exception &e)
{
collectedErrors += "error: SolidSystem::density() throws exception!\n";
}
......
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