From 5ce482f13c9c6adf195362e0a28e02f8d12215fb Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Tue, 14 Apr 2020 10:10:48 +0000 Subject: [PATCH] Merge branch 'fix/headercheck_3.2' into 'master' [cleanup] fix headercheck errors See merge request dumux-repositories/dumux!1970 (cherry picked from commit edd814416baef3be01fdb54507c04b51718d54f5) c396f0c5 [cleanup] fix headercheck errors --- dumux/common/pdesolver.hh | 2 ++ dumux/linear/preconditioners.hh | 1 + test/multidomain/facet/1pnc_1pnc/properties_bulk.hh | 4 ++++ test/multidomain/facet/1pnc_1pnc/properties_facet.hh | 6 +++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dumux/common/pdesolver.hh b/dumux/common/pdesolver.hh index c86d1f5ed7..9b02b124bc 100644 --- a/dumux/common/pdesolver.hh +++ b/dumux/common/pdesolver.hh @@ -26,6 +26,8 @@ #include <memory> +#include <dune/common/hybridutilities.hh> + #include <dumux/common/typetraits/matrix.hh> #include <dumux/common/timeloop.hh> diff --git a/dumux/linear/preconditioners.hh b/dumux/linear/preconditioners.hh index c0fc457a07..bbfa48cad7 100644 --- a/dumux/linear/preconditioners.hh +++ b/dumux/linear/preconditioners.hh @@ -28,6 +28,7 @@ #include <dune/common/float_cmp.hh> #include <dune/common/indices.hh> #include <dune/istl/preconditioners.hh> +#include <dune/istl/paamg/amg.hh> #include <dune/common/version.hh> #if HAVE_UMFPACK diff --git a/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh b/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh index 8ec238392f..b483c0cb29 100644 --- a/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh +++ b/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh @@ -24,6 +24,10 @@ #ifndef DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH #define DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH +#ifndef DIMWORLD +#define DIMWORLD 2 +#endif + #include <dune/alugrid/grid.hh> #include <dumux/material/fluidsystems/h2on2.hh> diff --git a/test/multidomain/facet/1pnc_1pnc/properties_facet.hh b/test/multidomain/facet/1pnc_1pnc/properties_facet.hh index 9faac2df95..53d3b195f7 100644 --- a/test/multidomain/facet/1pnc_1pnc/properties_facet.hh +++ b/test/multidomain/facet/1pnc_1pnc/properties_facet.hh @@ -24,6 +24,10 @@ #ifndef DUMUX_TEST_FACETCOUPLING_ONEPNC_FACET_PROPERTIES_HH #define DUMUX_TEST_FACETCOUPLING_ONEPNC_FACET_PROPERTIES_HH +#ifndef DIMWORLD +#define DIMWORLD 2 +#endif + #include <dune/foamgrid/foamgrid.hh> #include <dumux/material/fluidsystems/h2on2.hh> @@ -31,7 +35,7 @@ #include <dumux/discretization/box.hh> #include <dumux/discretization/cctpfa.hh> -#include <dumux/porousmediumflow/1p/model.hh> +#include <dumux/porousmediumflow/1pnc/model.hh> #include "problem_facet.hh" #include "spatialparams.hh" -- GitLab