Commit 4f012bd0 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/test_mpfa2p-failed-with-clang' into 'master'

Resolve "test_mpfa2p.cc broken with Clang 12"

Closes #1029

See merge request !2606
parents 85fc0d89 4752cf47
Pipeline #3979 passed with stages
in 0 seconds
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/material/spatialparams/sequentialfv.hh> #include <dumux/material/spatialparams/sequentialfv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/brookscorey.hh> #include <dumux/material/fluidmatrixinteractions/2p/brookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
namespace Dumux namespace Dumux
{ {
...@@ -46,11 +48,6 @@ struct SpatialParams<TypeTag, TTag::Test2PSpatialParams> { using type = Test2PSp ...@@ -46,11 +48,6 @@ struct SpatialParams<TypeTag, TTag::Test2PSpatialParams> { using type = Test2PSp
} }
// forward declaration
template<class Scalar>
class LinearMaterialDefault;
class LinearMaterial;
/*! /*!
* \ingroup SequentialTwoPTests * \ingroup SequentialTwoPTests
* \brief Test problem for the sequential 2p models * \brief Test problem for the sequential 2p models
...@@ -73,14 +70,13 @@ class Test2PSpatialParams: public SequentialFVSpatialParams<TypeTag> ...@@ -73,14 +70,13 @@ class Test2PSpatialParams: public SequentialFVSpatialParams<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using FieldMatrix = Dune::FieldMatrix<Scalar, dim, dim>; using FieldMatrix = Dune::FieldMatrix<Scalar, dim, dim>;
using PcKrSwCurve = FluidMatrix::BrooksCoreyDefault<Scalar>; using PcKrSwCurve = FluidMatrix::BrooksCoreyDefault<Scalar>;
public: public:
static constexpr bool pcSwCurveIsLinear() static constexpr bool pcSwCurveIsLinear()
{ {
return std::is_same_v<PcKrSwCurve, LinearMaterial> || std::is_same_v<PcKrSwCurve, LinearMaterialDefault>; return std::is_same_v<PcKrSwCurve, FluidMatrix::LinearMaterialDefault<Scalar>>;
} }
const FieldMatrix& intrinsicPermeabilityAtPos(const GlobalPosition& globalPos) const const FieldMatrix& intrinsicPermeabilityAtPos(const GlobalPosition& globalPos) const
......
Markdown is supported
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