From 7c3f277082c788539eba99e803906661f005edaf Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Wed, 11 Apr 2018 18:26:49 +0200
Subject: [PATCH] [tests][2padaptive] Fix sequential 2p adaptivity tests
---
test/porousmediumflow/2p/sequential/test_3d2p.cc | 3 +--
.../2p/sequential/test_3d2pproblem.hh | 16 +---------------
.../2p/sequential/test_mpfa2p.cc | 3 +--
.../2p/sequential/test_mpfa2pproblem.hh | 2 +-
4 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/test/porousmediumflow/2p/sequential/test_3d2p.cc b/test/porousmediumflow/2p/sequential/test_3d2p.cc
index 2785fa0e91..aacabb608d 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2p.cc
+++ b/test/porousmediumflow/2p/sequential/test_3d2p.cc
@@ -69,8 +69,7 @@ int main(int argc, char** argv)
using namespace Dumux;
try {
- auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TTAG(ThreeDTwoPTestTypeTag), ModelDefaultParameters)::defaultParams(p);};
- Parameters::init(argc, argv, defaultParams, usage);
+ Parameters::init(argc, argv, usage);
const auto modelType = getParam<std::string>("ModelType", "MPFAL");
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index c24eef9eba..57cfe6061a 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -58,7 +58,7 @@ class Test3D2PProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(ThreeDTwoPTestTypeTag, INHERITS_FROM(SequentialModel, Test3d2pSpatialParams));
+NEW_TYPE_TAG(ThreeDTwoPTestTypeTag, INHERITS_FROM(Test3d2pSpatialParams));
// Set the grid type
#if HAVE_DUNE_ALUGRID
@@ -79,20 +79,6 @@ SET_PROP(ThreeDTwoPTestTypeTag, FluidSystem)
#if PROBLEM == 1
SET_INT_PROP(ThreeDTwoPTestTypeTag, Formulation, SequentialTwoPCommonIndices::pnSw);
-#endif
-
-// Set the spatial parameters
-SET_PROP(ThreeDTwoPTestTypeTag, SpatialParams)
-{
-private:
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-
-public:
- using type = Test3d2pSpatialParams<TypeTag>;
-};
-
-#if PROBLEM == 1
SET_TYPE_PROP(ThreeDTwoPTestTypeTag, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
#endif
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2p.cc b/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
index d3fead0746..838099eed5 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
@@ -60,8 +60,7 @@ int main(int argc, char** argv)
using namespace Dumux;
try {
- auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TTAG(MPFATwoPTestTypeTag), ModelDefaultParameters)::defaultParams(p);};
- Parameters::init(argc, argv, defaultParams, usage);
+ Parameters::init(argc, argv, usage);
const auto modelType = getParam<std::string>("ModelType", "MPFAL");
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 256715aa2c..95424a7c3d 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -57,7 +57,7 @@ class MPFATwoPTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(MPFATwoPTestTypeTag, INHERITS_FROM(SequentialModel, Test2PSpatialParams));
+NEW_TYPE_TAG(MPFATwoPTestTypeTag, INHERITS_FROM(Test2PSpatialParams));
// Set the grid type
#if HAVE_UG
--
GitLab