From ce9e379ee91d7c78429e2802a467f9fd5dbf4783 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 7 Dec 2017 00:27:35 +0100
Subject: [PATCH] [test][tpfa] Remove dependency on model properties
---
.../discretization/cellcentered/tpfa/test_tpfafvgeometry.cc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
index 6af7916700..baa2ecac34 100644
--- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
+++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
@@ -32,7 +32,6 @@
#include <dune/grid/common/mcmgmapper.hh>
#include <dumux/common/properties.hh>
-#include <dumux/common/properties/model.hh>
#include <dumux/discretization/cellcentered/tpfa/properties.hh>
//! Dummy flux variables class so that we can update the connectivity map
@@ -50,7 +49,7 @@ public:
namespace Dumux {
namespace Properties {
- NEW_TYPE_TAG(TestFVGeometry, INHERITS_FROM(CCTpfaModel, ModelProperties));
+ NEW_TYPE_TAG(TestFVGeometry, INHERITS_FROM(CCTpfaModel));
SET_TYPE_PROP(TestFVGeometry, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(TestFVGeometry, FluxVariables, MockFluxVariables);
}
@@ -78,8 +77,7 @@ int main (int argc, char *argv[]) try
constexpr int dim = GridView::dimension;
constexpr int dimworld = GridView::dimensionworld;
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
+ using GlobalPosition = Dune::FieldVector<typename GridView::ctype, dimworld>;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
--
GitLab