From a767cbf694ac0926ebf5fce7babbc941d65db48a Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 5 Jan 2012 13:47:33 +0000
Subject: [PATCH] add missing includes
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7308 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
configure.ac | 4 +++-
dumux/common/start.hh | 1 +
dumux/common/tabulated2dfunction.hh | 3 +++
dumux/common/variablelengthspline_.hh | 1 +
dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh | 1 +
.../2p/diffusion/fv/fvvelocity2padaptive.hh | 1 +
.../2p/diffusion/mimetic/croperator.hh | 2 ++
.../2p/diffusion/mimetic/localstiffness.hh | 2 ++
.../2p/diffusion/mimetic/mimeticgroundwater.hh | 2 +-
.../decoupled/2p/transport/fv/convectivepart.hh | 2 ++
.../decoupled/2p/transport/fv/diffusivepart.hh | 2 ++
dumux/decoupled/2p/transport/fv/evalcflflux.hh | 2 ++
.../decoupled/2p/transport/fv/fvsaturation2p.hh | 1 +
.../2p/transport/transportproperties.hh | 2 ++
dumux/decoupled/2p2c/2p2cproperties.hh | 1 +
dumux/decoupled/2p2c/fvpressure2p2c.hh | 3 ++-
dumux/decoupled/2p2c/fvtransport2p2c.hh | 1 +
dumux/decoupled/2p2c/variableclass2p2c.hh | 1 +
dumux/decoupled/common/gridadapt.hh | 1 +
dumux/linear/Makefile.am | 4 ++++
dumux/linear/elementborderlistfromgrid.hh | 1 +
dumux/linear/globalindices.hh | 7 +++++++
dumux/linear/impetbicgstabilu0solver.hh | 1 +
dumux/linear/linearsolverproperties.hh | 2 +-
dumux/linear/overlappingbcrsmatrix.hh | 1 +
dumux/linear/overlappingblockvector.hh | 5 +++++
dumux/linear/overlappingoperator.hh | 2 ++
dumux/linear/overlappingpreconditioner.hh | 3 +++
dumux/linear/overlappingscalarproduct.hh | 6 ++++++
dumux/linear/seqsolverbackend.hh | 2 ++
dumux/linear/vertexborderlistfromgrid.hh | 1 +
dumux/material/components/simplednapl.hh | 2 +-
dumux/material/components/tabulatedcomponent.hh | 1 +
dumux/material/eos/pengrobinson.hh | 1 +
dumux/material/eos/pengrobinsonparams.hh | 2 ++
.../spatialparameters/boxspatialparameters.hh | 1 +
.../spatialparameters/fvspatialparameters.hh | 4 ++++
dumux/nonlinear/newtoncontroller.hh | 3 +++
dumux/nonlinear/newtonconvergencewriter.hh | 2 ++
dumux/parallel/mpibuffer.hh | 17 +++++++++--------
.../2p2c/injectionspatialparameters.hh | 2 ++
.../2p2cni/waterairspatialparameters.hh | 2 ++
.../richards/richardslensspatialparameters.hh | 2 ++
.../generallensspatialparameters.hh | 2 ++
test/decoupled/1p/benchmarkresult.hh | 2 ++
.../2p2c/test_dec2p2c_spatialparams.hh | 2 +-
.../2padaptive/test_impes_adaptive_problem.hh | 2 ++
47 files changed, 101 insertions(+), 14 deletions(-)
create mode 100644 dumux/linear/Makefile.am
diff --git a/configure.ac b/configure.ac
index 3c6aa08ecf..c37aa42ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ AC_CONFIG_FILES([dumux.pc
dumux/decoupled/2p2c/Makefile
dumux/decoupled/common/Makefile
dumux/io/Makefile
+ dumux/linear/Makefile
dumux/material/Makefile
dumux/material/binarycoefficients/Makefile
dumux/material/components/Makefile
@@ -53,7 +54,8 @@ AC_CONFIG_FILES([dumux.pc
dumux/material/fluidsystems/Makefile
dumux/material/constraintsolvers/Makefile
dumux/material/eos/Makefile
- dumux/nonlinear/Makefile
+ dumux/nonlinear/Makefile
+ dumux/parallel/Makefile
m4/Makefile
test/Makefile
test/boxmodels/Makefile
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 638dd40cfd..b116b8fd9d 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -27,6 +27,7 @@
#define DUMUX_START_HH
#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
#include <dune/grid/io/file/dgfparser.hh>
#include <dune/common/mpihelper.hh>
diff --git a/dumux/common/tabulated2dfunction.hh b/dumux/common/tabulated2dfunction.hh
index 48c3d04e86..869880382e 100644
--- a/dumux/common/tabulated2dfunction.hh
+++ b/dumux/common/tabulated2dfunction.hh
@@ -26,6 +26,9 @@
#ifndef DUMUX_TABULATED_2D_FUNCTION_HH
#define DUMUX_TABULATED_2D_FUNCTION_HH
+#include <vector>
+#include <assert.h>
+
namespace Dumux
{
/*!
diff --git a/dumux/common/variablelengthspline_.hh b/dumux/common/variablelengthspline_.hh
index 259ec89547..cd3cee0481 100644
--- a/dumux/common/variablelengthspline_.hh
+++ b/dumux/common/variablelengthspline_.hh
@@ -27,6 +27,7 @@
#define DUMUX_VARIABLE_LENGTH_SPLINE_HH
#include <dune/common/fvector.hh>
+#include <dune/common/fmatrix.hh>
#include <dune/istl/bvector.hh>
#include <dune/istl/btdmatrix.hh>
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index efab2b2a0c..deaf450b35 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -29,6 +29,7 @@
*/
#include <dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh>
+#include <dune/grid/common/gridenums.hh>
namespace Dumux
{
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index 5c2aaf14c7..0ebc8dfaab 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -29,6 +29,7 @@
*/
#include <dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh>
+#include <dune/grid/common/gridenums.hh>
namespace Dumux
{
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
index 95afbff723..7fc48090e4 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
@@ -44,6 +44,8 @@
#include<dumux/common/boundaryconditions.hh>
#include<dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh>
+#include "mimeticproperties.hh"
+
/**
* @file
* @brief defines a class for piecewise linear finite element functions
diff --git a/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh b/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
index f95a7c3c45..496f4e92c2 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
@@ -36,6 +36,8 @@
#include<dune/istl/matrix.hh>
#include<dumux/common/boundaryconditions.hh>
+#include "mimeticproperties.hh"
+
/**
* @file
* @brief defines a class for piecewise linear finite element functions
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index b477429bff..83c6b419ee 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -40,7 +40,7 @@
#include<dune/grid/common/quadraturerules.hh>
#include<dumux/common/boundaryconditions.hh>
-
+#include "localstiffness.hh"
namespace Dumux
{
/*!
diff --git a/dumux/decoupled/2p/transport/fv/convectivepart.hh b/dumux/decoupled/2p/transport/fv/convectivepart.hh
index 16a667b05c..316604c2f3 100644
--- a/dumux/decoupled/2p/transport/fv/convectivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/convectivepart.hh
@@ -22,6 +22,8 @@
#ifndef DUMUX_CONVECTIVEPART_HH
#define DUMUX_CONVECTIVEPART_HH
+#include <dumux/decoupled/2p/2pproperties.hh>
+
/**
* @file
* @brief Base class for defining a convective part of an advection-diffusion equation
diff --git a/dumux/decoupled/2p/transport/fv/diffusivepart.hh b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
index 84be54e116..2f8d02098d 100644
--- a/dumux/decoupled/2p/transport/fv/diffusivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
@@ -23,6 +23,8 @@
#ifndef DUMUX_DIFFUSIVEPART_HH
#define DUMUX_DIFFUSIVEPART_HH
+#include <dumux/decoupled/2p/2pproperties.hh>
+
/**
* @file
* @brief Base class for defining the diffusive part of an advection-diffusion equation
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux.hh b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
index 99415b793d..746650f92c 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
@@ -22,6 +22,8 @@
#ifndef DUMUX_EVALCFLFLUX_HH
#define DUMUX_EVALCFLFLUX_HH
+#include <dumux/decoupled/2p/2pproperties.hh>
+
/**
* @file
* @brief Base class for implementations of different kinds of fluxes to evaluate a CFL-Condition
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index 36ff6bf63a..7ddb834ad9 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -22,6 +22,7 @@
#ifndef DUMUX_FVSATURATION2P_HH
#define DUMUX_FVSATURATION2P_HH
+#include <dune/grid/common/gridenums.hh>
#include "dumux/decoupled/2p/transport/fv/diffusivepart.hh"
#include "dumux/decoupled/2p/transport/fv/convectivepart.hh"
#include <dumux/decoupled/2p/transport/transportproperties.hh>
diff --git a/dumux/decoupled/2p/transport/transportproperties.hh b/dumux/decoupled/2p/transport/transportproperties.hh
index dd82f32f3f..6bcbfb0fa7 100644
--- a/dumux/decoupled/2p/transport/transportproperties.hh
+++ b/dumux/decoupled/2p/transport/transportproperties.hh
@@ -22,6 +22,8 @@
#ifndef DUMUX_TRANSPORT_PROPERTIES_HH
#define DUMUX_TRANSPORT_PROPERTIES_HH
+#include <dumux/common/basicproperties.hh>
+
/*!
* \ingroup Saturation2p
* \ingroup Properties
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index 33a80cb99a..8f67475f96 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -36,6 +36,7 @@
//DUMUX includes
#include <dumux/decoupled/2p/2pindices.hh>
+#include <dumux/decoupled/common/impetproperties.hh>
namespace Dumux
{
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index dec3c82232..e37aff016b 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -31,7 +31,8 @@
#include <dune/istl/preconditioners.hh>
// dumux environment
-#include "dumux/common/math.hh"
+#include <dumux/common/math.hh>
+#include <dumux/io/vtkmultiwriter.hh>
#include <dumux/decoupled/2p2c/2p2cproperties.hh>
/**
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index 1cab0b1096..7e0b979622 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -22,6 +22,7 @@
#ifndef DUMUX_FVTRANSPORT2P2C_HH
#define DUMUX_FVTRANSPORT2P2C_HH
+#include <dune/grid/common/gridenums.hh>
#include <dumux/decoupled/2p2c/2p2cproperties.hh>
#include <dumux/common/math.hh>
diff --git a/dumux/decoupled/2p2c/variableclass2p2c.hh b/dumux/decoupled/2p2c/variableclass2p2c.hh
index c1c05ddf4b..0e23d96495 100644
--- a/dumux/decoupled/2p2c/variableclass2p2c.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2c.hh
@@ -22,6 +22,7 @@
#ifndef DUMUX_VARIABLECLASS2P2C_HH
#define DUMUX_VARIABLECLASS2P2C_HH
+#include <dune/grid/common/gridenums.hh>
#include <dumux/decoupled/common/variableclass.hh>
#include <dumux/decoupled/2p2c/dec2p2cfluidstate.hh>
diff --git a/dumux/decoupled/common/gridadapt.hh b/dumux/decoupled/common/gridadapt.hh
index 8a66a1945b..ba99fe2f01 100644
--- a/dumux/decoupled/common/gridadapt.hh
+++ b/dumux/decoupled/common/gridadapt.hh
@@ -26,6 +26,7 @@
#ifndef DUMUX_GIRDADAPT_HH
#define DUMUX_GIRDADAPT_HH
+#include "decoupledproperties.hh"
namespace Dumux
{
diff --git a/dumux/linear/Makefile.am b/dumux/linear/Makefile.am
new file mode 100644
index 0000000000..8bff48483d
--- /dev/null
+++ b/dumux/linear/Makefile.am
@@ -0,0 +1,4 @@
+lineardir = $(includedir)/dune/dumux/linear
+linear_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/linear/elementborderlistfromgrid.hh b/dumux/linear/elementborderlistfromgrid.hh
index 54054db9ea..a67e8dae99 100644
--- a/dumux/linear/elementborderlistfromgrid.hh
+++ b/dumux/linear/elementborderlistfromgrid.hh
@@ -29,6 +29,7 @@
#define DUMUX_ELEMENT_BORDER_LIST_FROM_GRID_HH
#include <dune/grid/common/datahandleif.hh>
+#include <dune/grid/common/gridenums.hh>
#include <dune/common/fmatrix.hh>
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/scalarproducts.hh>
diff --git a/dumux/linear/globalindices.hh b/dumux/linear/globalindices.hh
index edc5b919df..060c20c098 100644
--- a/dumux/linear/globalindices.hh
+++ b/dumux/linear/globalindices.hh
@@ -39,6 +39,13 @@
#include <list>
#include <set>
#include <map>
+#include <tr1/tuple>
+
+#if HAVE_MPI
+#include <mpi.h>
+#endif
+
+#include "borderindex.hh"
namespace Dumux {
diff --git a/dumux/linear/impetbicgstabilu0solver.hh b/dumux/linear/impetbicgstabilu0solver.hh
index 3cc5d33a8a..3f40928fa9 100644
--- a/dumux/linear/impetbicgstabilu0solver.hh
+++ b/dumux/linear/impetbicgstabilu0solver.hh
@@ -32,6 +32,7 @@
#include <dune/istl/solvers.hh>
#include <dune/istl/preconditioners.hh>
#include <dumux/common/exceptions.hh>
+#include <dumux/common/parameters.hh>
#include <dumux/linear/elementborderlistfromgrid.hh>
#include <dumux/linear/overlappingbcrsmatrix.hh>
diff --git a/dumux/linear/linearsolverproperties.hh b/dumux/linear/linearsolverproperties.hh
index 2b611479e0..9a90cb0b9d 100644
--- a/dumux/linear/linearsolverproperties.hh
+++ b/dumux/linear/linearsolverproperties.hh
@@ -30,7 +30,7 @@
#ifndef DUMUX_LINEAR_SOLVER_PROPERTIES_HH
#define DUMUX_LINEAR_SOLVER_PROPERTIES_HH
-#include <dumux/common/propertysystem.hh>
+#include <dumux/common/basicproperties.hh>
namespace Dumux
{
diff --git a/dumux/linear/overlappingbcrsmatrix.hh b/dumux/linear/overlappingbcrsmatrix.hh
index d082160f29..72483206d6 100644
--- a/dumux/linear/overlappingbcrsmatrix.hh
+++ b/dumux/linear/overlappingbcrsmatrix.hh
@@ -33,6 +33,7 @@
#include <dumux/parallel/mpibuffer.hh>
#include <dune/istl/scalarproducts.hh>
+#include <dune/istl/io.hh>
#include <algorithm>
#include <list>
diff --git a/dumux/linear/overlappingblockvector.hh b/dumux/linear/overlappingblockvector.hh
index 8cf305e7c0..8f818331a4 100644
--- a/dumux/linear/overlappingblockvector.hh
+++ b/dumux/linear/overlappingblockvector.hh
@@ -28,6 +28,11 @@
#ifndef DUMUX_OVERLAPPING_BLOCK_VECTOR_HH
#define DUMUX_OVERLAPPING_BLOCK_VECTOR_HH
+#include <tr1/memory>
+#include <vector>
+#include <map>
+#include <iostream>
+
#include <dune/istl/bvector.hh>
#include <dumux/parallel/mpibuffer.hh>
diff --git a/dumux/linear/overlappingoperator.hh b/dumux/linear/overlappingoperator.hh
index c2eed3a535..673745a179 100644
--- a/dumux/linear/overlappingoperator.hh
+++ b/dumux/linear/overlappingoperator.hh
@@ -27,6 +27,8 @@
#ifndef DUMUX_OVERLAPPING_OPERATOR_HH
#define DUMUX_OVERLAPPING_OPERATOR_HH
+#include <dune/istl/operators.hh>
+
namespace Dumux {
// operator that resets result to zero at constrained DOFS
diff --git a/dumux/linear/overlappingpreconditioner.hh b/dumux/linear/overlappingpreconditioner.hh
index 021ab7a32f..d5c1463b3d 100644
--- a/dumux/linear/overlappingpreconditioner.hh
+++ b/dumux/linear/overlappingpreconditioner.hh
@@ -27,6 +27,9 @@
#ifndef DUMUX_OVERLAPPING_PRECONDITIONER_HH
#define DUMUX_OVERLAPPING_PRECONDITIONER_HH
+#include <dumux/common/exceptions.hh>
+#include <dune/istl/preconditioners.hh>
+
#include "overlappingscalarproduct.hh"
namespace Dumux {
diff --git a/dumux/linear/overlappingscalarproduct.hh b/dumux/linear/overlappingscalarproduct.hh
index ba9ff008bc..1f366a2011 100644
--- a/dumux/linear/overlappingscalarproduct.hh
+++ b/dumux/linear/overlappingscalarproduct.hh
@@ -27,6 +27,12 @@
#ifndef DUMUX_OVERLAPPING_SCALAR_PRODUCT_HH
#define DUMUX_OVERLAPPING_SCALAR_PRODUCT_HH
+#if HAVE_MPI
+#include <mpi.h>
+#endif
+
+#include <dune/istl/scalarproducts.hh>
+
namespace Dumux {
template <class OverlappingBlockVector, class Overlap>
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 87514c1db2..1db80c71c4 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -32,6 +32,8 @@
#include <dune/istl/superlu.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/boxmodels/common/boxproperties.hh>
+#include <dumux/decoupled/common/decoupledproperties.hh>
#include <dumux/linear/linearsolverproperties.hh>
namespace Dumux
diff --git a/dumux/linear/vertexborderlistfromgrid.hh b/dumux/linear/vertexborderlistfromgrid.hh
index 1d87c7759d..baf8200033 100644
--- a/dumux/linear/vertexborderlistfromgrid.hh
+++ b/dumux/linear/vertexborderlistfromgrid.hh
@@ -31,6 +31,7 @@
#include "borderindex.hh"
#include <dune/grid/common/datahandleif.hh>
+#include <dune/grid/common/gridenums.hh>
#include <dune/common/fmatrix.hh>
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/scalarproducts.hh>
diff --git a/dumux/material/components/simplednapl.hh b/dumux/material/components/simplednapl.hh
index a7174871d2..6f787dddef 100644
--- a/dumux/material/components/simplednapl.hh
+++ b/dumux/material/components/simplednapl.hh
@@ -28,7 +28,7 @@
#ifndef DUMUX_SIMPLE_DNAPL_HH
#define DUMUX_SIMPLE_DNAPL_HH
-
+#include <dumux/material/idealgas.hh>
#include "component.hh"
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 0593771f32..53c72d7ece 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -32,6 +32,7 @@
#define DUMUX_TABULATED_COMPONENT_HH
#include <dumux/common/exceptions.hh>
+#include <cmath>
#include <limits>
#include <assert.h>
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index 62f0f9fd04..ac0afef8da 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -39,6 +39,7 @@
#include <dumux/material/fluidstates/temperatureoverlayfluidstate.hh>
#include <dumux/material/idealgas.hh>
+#include <dumux/common/exceptions.hh>
#include <dumux/common/math.hh>
#include <dumux/common/tabulated2dfunction.hh>
diff --git a/dumux/material/eos/pengrobinsonparams.hh b/dumux/material/eos/pengrobinsonparams.hh
index 35bc2e779b..0023f7109c 100644
--- a/dumux/material/eos/pengrobinsonparams.hh
+++ b/dumux/material/eos/pengrobinsonparams.hh
@@ -33,6 +33,8 @@
#ifndef DUMUX_PENG_ROBINSON_PARAMS_HH
#define DUMUX_PENG_ROBINSON_PARAMS_HH
+#include <dumux/common/valgrind.hh>
+
namespace Dumux
{
/*!
diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh
index 676112b170..0573e80cc0 100644
--- a/dumux/material/spatialparameters/boxspatialparameters.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters.hh
@@ -35,6 +35,7 @@ namespace Dumux {
// forward declation of property tags
namespace Properties {
NEW_PROP_TAG(SpatialParameters);
+NEW_PROP_TAG(MaterialLawParams);
}
/*!
diff --git a/dumux/material/spatialparameters/fvspatialparameters.hh b/dumux/material/spatialparameters/fvspatialparameters.hh
index 0baff8cb25..fc04611517 100644
--- a/dumux/material/spatialparameters/fvspatialparameters.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters.hh
@@ -33,6 +33,10 @@
namespace Dumux
{
+// forward declation of property tags
+namespace Properties {
+NEW_PROP_TAG(MaterialLaw);
+}
/*!
* \ingroup SpatialParameters
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index 58802429dd..02d7ad9348 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -43,6 +43,9 @@ namespace Dumux
template <class TypeTag>
class NewtonController;
+template <class TypeTag>
+class NewtonConvergenceWriter;
+
namespace Properties
{
//! Specifies the implementation of the Newton controller
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 9e3ef11040..165ef3a935 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -28,6 +28,8 @@
#ifndef DUMUX_NEWTON_CONVERGENCE_WRITER_HH
#define DUMUX_NEWTON_CONVERGENCE_WRITER_HH
+#include "newtoncontroller.hh"
+
namespace Dumux
{
/*!
diff --git a/dumux/parallel/mpibuffer.hh b/dumux/parallel/mpibuffer.hh
index 7f1c00b890..2e9d984194 100644
--- a/dumux/parallel/mpibuffer.hh
+++ b/dumux/parallel/mpibuffer.hh
@@ -32,6 +32,7 @@
#endif
#include <tr1/type_traits>
+#include <assert.h>
namespace Dumux
{
@@ -51,21 +52,21 @@ public:
mpiDataSize_ = size;
// set the MPI data type
- if (std::is_same<DataType, char>::value)
+ if (std::tr1::is_same<DataType, char>::value)
mpiDataType_ = MPI_CHAR;
- else if (std::is_same<DataType, unsigned char>::value)
+ else if (std::tr1::is_same<DataType, unsigned char>::value)
mpiDataType_ = MPI_UNSIGNED_CHAR;
- else if (std::is_same<DataType, short>::value || std::is_same<DataType, unsigned short>::value)
+ else if (std::tr1::is_same<DataType, short>::value || std::tr1::is_same<DataType, unsigned short>::value)
mpiDataType_ = MPI_SHORT;
- else if (std::is_same<DataType, int>::value || std::is_same<DataType, unsigned>::value)
+ else if (std::tr1::is_same<DataType, int>::value || std::tr1::is_same<DataType, unsigned>::value)
mpiDataType_ = MPI_INT;
- else if (std::is_same<DataType, long>::value || std::is_same<DataType, unsigned long>::value)
+ else if (std::tr1::is_same<DataType, long>::value || std::tr1::is_same<DataType, unsigned long>::value)
mpiDataType_ = MPI_LONG;
- else if (std::is_same<DataType, float>::value)
+ else if (std::tr1::is_same<DataType, float>::value)
mpiDataType_ = MPI_FLOAT;
- else if (std::is_same<DataType, double>::value)
+ else if (std::tr1::is_same<DataType, double>::value)
mpiDataType_ = MPI_DOUBLE;
- else if (std::is_same<DataType, long double>::value)
+ else if (std::tr1::is_same<DataType, long double>::value)
mpiDataType_ = MPI_LONG_DOUBLE;
else {
mpiDataType_ = MPI_BYTE;
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index bb1a73d101..e19c131f28 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -35,6 +35,8 @@
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+#include <dumux/boxmodels/2p2c/2p2cmodel.hh>
+
namespace Dumux
{
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index 4224f2f034..ec8bdc70ab 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -33,6 +33,8 @@
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+#include <dumux/boxmodels/2p2cni/2p2cnimodel.hh>
+
namespace Dumux
{
diff --git a/test/boxmodels/richards/richardslensspatialparameters.hh b/test/boxmodels/richards/richardslensspatialparameters.hh
index 60a76be407..44abf545de 100644
--- a/test/boxmodels/richards/richardslensspatialparameters.hh
+++ b/test/boxmodels/richards/richardslensspatialparameters.hh
@@ -35,6 +35,8 @@
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+#include <dumux/boxmodels/richards/richardsmodel.hh>
+
namespace Dumux
{
diff --git a/test/common/generalproblem/generallensspatialparameters.hh b/test/common/generalproblem/generallensspatialparameters.hh
index fd6ac853f3..4fc87a65fc 100644
--- a/test/common/generalproblem/generallensspatialparameters.hh
+++ b/test/common/generalproblem/generallensspatialparameters.hh
@@ -36,6 +36,8 @@
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+#include <dumux/boxmodels/2p/2pmodel.hh>
+
namespace Dumux
{
//forward declaration
diff --git a/test/decoupled/1p/benchmarkresult.hh b/test/decoupled/1p/benchmarkresult.hh
index 65b1fa3108..9678c48171 100644
--- a/test/decoupled/1p/benchmarkresult.hh
+++ b/test/decoupled/1p/benchmarkresult.hh
@@ -28,6 +28,8 @@
#ifndef DUMUX_BENCHMARKRESULT_HH
#define DUMUX_BENCHMARKRESULT_HH
+#include <dumux/decoupled/common/onemodelproblem.hh>
+
namespace Dumux
{
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index 17a9345843..0fecc25a9d 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -27,7 +27,7 @@
#ifndef TEST_2P2C_SPATIALPARAMETERS_HH
#define TEST_2P2C_SPATIALPARAMETERS_HH
-
+#include <dumux/decoupled/2p2c/2p2cproperties.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
//#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh b/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
index 674e42f45d..d38acdf432 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
+++ b/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
@@ -66,7 +66,9 @@ NEW_TYPE_TAG(TestIMPESAdaptiveProblem, INHERITS_FROM(DecoupledTwoP, Transport, T
// Set the grid type
SET_PROP(TestIMPESAdaptiveProblem, Grid)
{
+#if HAVE_UG
typedef Dune::UGGrid<2> type;
+#endif
};
// Set the problem property
--
GitLab