From 4752cf47739099fb4e34ec429c3634a4ced87ae4 Mon Sep 17 00:00:00 2001
From: hanchuan <>
Date: Wed, 12 May 2021 23:50:15 +0200
Subject: [PATCH] [2p][sequentical][mpfa] Remove forward declared
 LinearMaterialDefault and correct the pcSwCurveIsLinear

---
 .../sequential/2p/test_mpfa2pspatialparams.hh          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/test/porousmediumflow/sequential/2p/test_mpfa2pspatialparams.hh b/test/porousmediumflow/sequential/2p/test_mpfa2pspatialparams.hh
index d758aef5ec..7e2a04bf7c 100644
--- a/test/porousmediumflow/sequential/2p/test_mpfa2pspatialparams.hh
+++ b/test/porousmediumflow/sequential/2p/test_mpfa2pspatialparams.hh
@@ -26,6 +26,8 @@
 #include <dumux/common/properties.hh>
 #include <dumux/material/spatialparams/sequentialfv.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/brookscorey.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
+
 
 namespace Dumux
 {
@@ -46,11 +48,6 @@ struct SpatialParams<TypeTag, TTag::Test2PSpatialParams> { using type = Test2PSp
 
 }
 
-// forward declaration
-template<class Scalar>
-class LinearMaterialDefault;
-class LinearMaterial;
-
 /*!
  * \ingroup SequentialTwoPTests
  * \brief Test problem for the sequential 2p models
@@ -73,14 +70,13 @@ class Test2PSpatialParams: public SequentialFVSpatialParams<TypeTag>
 
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using FieldMatrix = Dune::FieldMatrix<Scalar, dim, dim>;
-
     using PcKrSwCurve = FluidMatrix::BrooksCoreyDefault<Scalar>;
 
 public:
 
     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
-- 
GitLab