diff --git a/test/porousmediumflow/2p/sequential/test_3d2p.cc b/test/porousmediumflow/2p/sequential/test_3d2p.cc index 2785fa0e912d8a41d48dc641eecc5da83c177076..aacabb608d44776d067771d64738ba992c01072d 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 c24eef9eba53427041c3e89fd1381f084fb00f5f..57cfe6061a4cd8224226c7807b08d22431481dab 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 d3fead0746860e773e795ad89ee81df12d649f49..838099eed5dc183c8fda55cc67a99283a47f9adb 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 256715aa2c279203d9479b4c8251c877f05fd5ff..95424a7c3dd71084eec53c9b698fea28fcec9a0a 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