From a423990d22edb674eeb81efb82126fd98ffe02cf Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Tue, 29 Apr 2014 14:10:19 +0000
Subject: [PATCH] [multidomain] Fix headercheck for test/multidomain.

(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12793 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 .../multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh | 3 +--
 test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh       | 6 ++++--
 test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh   | 3 +++
 test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh  | 5 -----
 test/multidomain/2cstokes2p2c/2p2csubproblem.hh             | 5 ++++-
 test/multidomain/2cstokes2p2c/stokes2csubproblem.hh         | 4 ++++
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index 96372d88f4..6199971dbb 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -38,6 +38,7 @@
 #include <dune/grid/multidomaingrid.hh>
 #include <dune/grid/io/file/dgfparser.hh>
 
+#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
 #include <dumux/multidomain/common/multidomainproblem.hh>
 #include <dumux/multidomain/2cstokes2p2c/2cstokes2p2cnewtoncontroller.hh>
 #include <dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh>
@@ -48,8 +49,6 @@
 #endif // HAVE_PARDISO
 
 #include "2cnistokes2p2cnispatialparams.hh"
-#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
-
 #include "stokes2cnisubproblem.hh"
 #include "2p2cnisubproblem.hh"
 
diff --git a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
index 39fae90660..48fc3afa82 100644
--- a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
@@ -29,15 +29,17 @@
 #include "config.h"
 #endif
 
+#include <dune/pdelab/finiteelementmap/conformingconstraints.hh>
+#include <dune/pdelab/gridoperator/gridoperator.hh>
+
 #include <dumux/implicit/common/implicitporousmediaproblem.hh>
 #include <dumux/implicit/2p2cni/2p2cnimodel.hh>
 #include <dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 #include <dumux/multidomain/common/multidomainlocaloperator.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-#include <dune/pdelab/finiteelementmap/conformingconstraints.hh>
 
-#include "2cnistokes2p2cniproblem.hh"
+#include "2cnistokes2p2cnispatialparams.hh"
 
 namespace Dumux
 {
diff --git a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
index eefdf7ba77..e53eebf7a8 100644
--- a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
@@ -26,11 +26,14 @@
 #define DUMUX_STOKES2CNI_SUBPROBLEM_HH
 
 #include <dune/pdelab/finiteelementmap/conformingconstraints.hh>
+#include <dune/pdelab/gridoperator/gridoperator.hh>
 
 #include <dumux/freeflow/stokesncni/stokesncnimodel.hh>
 #include <dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 
+#include "2cnistokes2p2cnispatialparams.hh"
+
 namespace Dumux
 {
 
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
index d74f846eb4..9371fb7b01 100644
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
+++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
@@ -91,11 +91,6 @@ class TwoCStokesTwoPTwoCSpatialParams : public ImplicitSpatialParams<TypeTag>
         dim=GridView::dimension,
         dimWorld=GridView::dimensionworld
     };
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-    enum {
-        wPhaseIdx = FluidSystem::wPhaseIdx,
-        nPhaseIdx = FluidSystem::nPhaseIdx
-    };
 
     typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
     typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
index dc245c6e95..04ff3176e5 100644
--- a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
@@ -25,12 +25,15 @@
 #ifndef DUMUX_2P2C_SUBPROBLEM_HH
 #define DUMUX_2P2C_SUBPROBLEM_HH
 
+#include <dune/pdelab/gridoperator/gridoperator.hh>
+
+#include <dumux/implicit/2p2c/2p2cindices.hh>
 #include <dumux/implicit/common/implicitporousmediaproblem.hh>
 #include <dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 #include <dumux/multidomain/common/multidomainlocaloperator.hh>
 
-#include "2cstokes2p2cproblem.hh"
+#include "2cstokes2p2cspatialparams.hh"
 
 namespace Dumux
 {
diff --git a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
index c1c50f4442..cf2f0b581e 100644
--- a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
+++ b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
@@ -25,10 +25,14 @@
 #ifndef DUMUX_STOKES2C_SUBPROBLEM_HH
 #define DUMUX_STOKES2C_SUBPROBLEM_HH
 
+#include <dune/pdelab/gridoperator/gridoperator.hh>
+
 #include <dumux/freeflow/stokesnc/stokesncmodel.hh>
 #include <dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh>
 #include <dumux/multidomain/common/subdomainpropertydefaults.hh>
 
+#include "2cstokes2p2cspatialparams.hh"
+
 namespace Dumux
 {
 
-- 
GitLab