From 559821148430c267d6697db9f8f963285e25b66b Mon Sep 17 00:00:00 2001
From: Mirka Papenheim <mirka.papenheim@googlemail.com>
Date: Mon, 17 Feb 2014 10:03:12 +0000
Subject: [PATCH] Removed superfluous typedefs in folder multidomain/common.
Reviewed by Klaus
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12486 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/multidomain/common/multidomainassembler.hh | 1 -
dumux/multidomain/common/multidomainnewtoncontroller.hh | 1 -
dumux/multidomain/common/multidomainproblem.hh | 3 +--
dumux/multidomain/common/splitandmerge.hh | 3 ---
4 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/dumux/multidomain/common/multidomainassembler.hh b/dumux/multidomain/common/multidomainassembler.hh
index a9d61b0a7e..23c3b33170 100644
--- a/dumux/multidomain/common/multidomainassembler.hh
+++ b/dumux/multidomain/common/multidomainassembler.hh
@@ -57,7 +57,6 @@ class MultiDomainAssembler
{
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MultiDomainGrid;
typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
diff --git a/dumux/multidomain/common/multidomainnewtoncontroller.hh b/dumux/multidomain/common/multidomainnewtoncontroller.hh
index ef1262a19c..b44fecbd38 100644
--- a/dumux/multidomain/common/multidomainnewtoncontroller.hh
+++ b/dumux/multidomain/common/multidomainnewtoncontroller.hh
@@ -65,7 +65,6 @@ class MultiDomainNewtonController : public NewtonController<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
diff --git a/dumux/multidomain/common/multidomainproblem.hh b/dumux/multidomain/common/multidomainproblem.hh
index 4a2e703541..7d827d8a32 100644
--- a/dumux/multidomain/common/multidomainproblem.hh
+++ b/dumux/multidomain/common/multidomainproblem.hh
@@ -79,8 +79,7 @@ private:
typedef typename GET_PROP_TYPE(SubDomain1TypeTag, GridView) SubDomainGridView1;
typedef typename GET_PROP_TYPE(SubDomain2TypeTag, GridView) SubDomainGridView2;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) HostGrid;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MultiDomainGrid;
+ typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MultiDomainGrid;
typedef typename MultiDomainGrid::LeafGridView MultiDomainGridView;
typedef typename MultiDomainGrid::Traits::template Codim<0>::Entity MultiDomainElement;
diff --git a/dumux/multidomain/common/splitandmerge.hh b/dumux/multidomain/common/splitandmerge.hh
index eef57e554c..b155046334 100644
--- a/dumux/multidomain/common/splitandmerge.hh
+++ b/dumux/multidomain/common/splitandmerge.hh
@@ -54,9 +54,6 @@ class SplitAndMerge
typedef typename GET_PROP_TYPE(SubTypeTag1, JacobianMatrix) JacobianMatrix1;
typedef typename GET_PROP_TYPE(SubTypeTag2, JacobianMatrix) JacobianMatrix2;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(SubTypeTag1, Model) Model1;
- typedef typename GET_PROP_TYPE(SubTypeTag2, Model) Model2;
enum {
numEq1 = GET_PROP_VALUE(SubTypeTag1, NumEq),
--
GitLab