From c216c8d4088dffb6b54a720177fbd9b88c1d1ef1 Mon Sep 17 00:00:00 2001
From: hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Wed, 25 Oct 2017 12:12:10 +0200
Subject: [PATCH] [2p] test with new .cc file structure
---
test/porousmediumflow/2p/implicit/lensproblem.hh | 13 +++++--------
test/porousmediumflow/2p/implicit/test_box2p.cc | 2 +-
test/porousmediumflow/2p/implicit/test_cc2p.cc | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/test/porousmediumflow/2p/implicit/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh
index 370ee05575..02e5edd668 100644
--- a/test/porousmediumflow/2p/implicit/lensproblem.hh
+++ b/test/porousmediumflow/2p/implicit/lensproblem.hh
@@ -28,11 +28,15 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/dnapl.hh>
+
+#include <dumux/discretization/cellcentered/box/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+
#include <dumux/porousmediumflow/problem.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
#include <dumux/porousmediumflow/2p/implicit/model.hh>
#include <dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh>
#include <dumux/porousmediumflow/2p/implicit/adaptionhelper.hh>
+
#include <dumux/implicit/adaptive/gridadaptinitializationindicator.hh>
#include "lensspatialparams.hh"
@@ -90,12 +94,7 @@ public:
typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
-// Linear solver settings
-SET_TYPE_PROP(LensCCProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-SET_TYPE_PROP(LensBoxProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(LensCCAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
SET_BOOL_PROP(LensCCAdaptiveProblem, AdaptiveGrid, true);
SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
@@ -103,8 +102,6 @@ SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionHelper, TwoPAdaptionHelper<TypeTag>
#endif
#if HAVE_UG
-SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
SET_BOOL_PROP(LensBoxAdaptiveProblem, AdaptiveGrid, true);
SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
diff --git a/test/porousmediumflow/2p/implicit/test_box2p.cc b/test/porousmediumflow/2p/implicit/test_box2p.cc
index 4b09751a67..8b460ddb59 100644
--- a/test/porousmediumflow/2p/implicit/test_box2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_box2p.cc
@@ -247,4 +247,4 @@ catch (...)
{
std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
return 4;
-}
\ No newline at end of file
+}
diff --git a/test/porousmediumflow/2p/implicit/test_cc2p.cc b/test/porousmediumflow/2p/implicit/test_cc2p.cc
index 35e01822de..833829b9d9 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_cc2p.cc
@@ -246,4 +246,4 @@ catch (...)
{
std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
return 4;
-}
\ No newline at end of file
+}
--
GitLab