Merge branch 'cherry-pick-edd81441' into 'releases/3.2'

Merge branch 'fix/headercheck_3.2' into 'master'

See merge request !1972

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>
 

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

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>

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"