Commit ee6819ee authored by Hanchuan Wu's avatar Hanchuan Wu Committed by Timo Koch
Browse files

Merge branch 'feature/header-check-v3.4' into 'master'

Resolve "Run and fix make headercheck (3.4)" (dumux-repo)

Closes #1040

See merge request !2675

(cherry picked from commit e1a0949b)

2709ed6f [headercheck] Fix missing headers and non ISO C++11 code
parent cb4149a0
......@@ -40,6 +40,7 @@
#include <dumux/material/fluidsystems/liquidphase2c.hh>
#include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
#include <dumux/multidomain/traits.hh>
#include "problem_soil.hh"
#include "problem_root.hh"
......
......@@ -26,13 +26,13 @@
// default to tpfa for both domains
#ifndef BULKTYPETAG
#define BULKTYPETAG=TissueCC
#define BULKTYPETAG TissueCC
#endif
#ifndef LOWDIMTYPETAG
#define LOWDIMTYPETAG=BloodFlowCC
#define LOWDIMTYPETAG BloodFlowCC
#endif
#ifndef COUPLINGMODE
#define COUPLINGMODE=Embedded1d3dCouplingMode::Average
#define COUPLINGMODE Embedded1d3dCouplingMode::Average
#endif
#include <dune/grid/yaspgrid.hh>
......@@ -48,6 +48,7 @@
#include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
#include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
#include <dumux/multidomain/traits.hh>
#include "problem_tissue.hh"
#include "spatialparams_tissue.hh"
......
......@@ -23,7 +23,9 @@
*/
#ifndef DUMUX_ROOTSOIL_PROPERTIES_HH
#define DUMUX_ROOTSOIL_PROPERTIES_HH
#ifndef SOILTYPETAG
#define SOILTYPETAG SoilCC
#endif
#include <dune/grid/yaspgrid.hh>
#include <dune/foamgrid/foamgrid.hh>
......@@ -39,6 +41,7 @@
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/multidomain/embedded/couplingmanager1d3d.hh>
#include <dumux/multidomain/traits.hh>
#include "problem_soil.hh"
#include "problem_root.hh"
......
......@@ -34,6 +34,7 @@
#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/multidomain/embedded/couplingmanager2d3d.hh>
#include <dumux/multidomain/traits.hh>
#include "spatialparams.hh"
#include "problem_matrix.hh"
......
......@@ -35,6 +35,7 @@
#include <dumux/multidomain/facet/cellcentered/tpfa/properties.hh>
#include <dumux/multidomain/facet/couplingmapper.hh>
#include <dumux/multidomain/facet/couplingmanager.hh>
#include <dumux/multidomain/traits.hh>
#include <dumux/discretization/box.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -38,6 +38,7 @@
#include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
#include <dumux/multidomain/facet/couplingmapper.hh>
#include <dumux/multidomain/facet/couplingmanager.hh>
#include <dumux/multidomain/traits.hh>
#include "spatialparams.hh"
#include "problem_bulk.hh"
......
......@@ -36,6 +36,7 @@
#include <dumux/multidomain/facet/box/properties.hh>
#include <dumux/multidomain/facet/cellcentered/tpfa/properties.hh>
#include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
#include <dumux/multidomain/traits.hh>
#include <dumux/porousmediumflow/1p/model.hh>
......
......@@ -36,6 +36,7 @@
#include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
#include <dumux/multidomain/facet/couplingmapper.hh>
#include <dumux/multidomain/facet/couplingmanager.hh>
#include <dumux/multidomain/traits.hh>
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/discretization/box.hh>
......
......@@ -24,6 +24,12 @@
#ifndef DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH
#define DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH
#ifndef BULKTYPETAG
#define BULKTYPETAG OnePNCBulkTpfa
#endif
#ifndef FACETTYPETAG
#define FACETTYPETAG OnePNCFacetTpfa
#endif
#ifndef DIMWORLD
#define DIMWORLD 2
#endif
......@@ -41,7 +47,7 @@
#include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
#include <dumux/multidomain/facet/couplingmapper.hh>
#include <dumux/multidomain/facet/couplingmanager.hh>
#include <dumux/multidomain/traits.hh>
#include <dumux/porousmediumflow/1pnc/model.hh>
#include "problem_facet.hh"
......
......@@ -37,6 +37,7 @@
#include <dumux/multidomain/facet/cellcentered/mpfa/properties.hh>
#include <dumux/multidomain/facet/couplingmapper.hh>
#include <dumux/multidomain/facet/couplingmanager.hh>
#include <dumux/multidomain/traits.hh>
#include <dumux/discretization/box.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -33,6 +33,7 @@
#include <dune/common/quadmath.hh>
#endif
#include <dumux/common/boundarytypes.hh>
#include <dumux/io/grid/gridmanager_yasp.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/ccmpfa.hh>
#include <dumux/discretization/box.hh>
......
......@@ -26,9 +26,16 @@
#ifndef DUMUX_LENSPROBLEM_ADAPTIVE_PROPERTIES_HH
#define DUMUX_LENSPROBLEM_ADAPTIVE_PROPERTIES_HH
#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#include <test/porousmediumflow/2p/incompressible/problem.hh>
#include "../incompressible/properties.hh"
#include "problem.hh"
#include "pointsourceproblem.hh"
// Type tags for the adaptive versions of the two-phase incompressible problem
namespace Dumux::Properties {
......
......@@ -41,6 +41,8 @@
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/mpnc/pressureformulation.hh>
#include <dumux/material/binarycoefficients/h2o_n2.hh>
#include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
namespace Dumux {
......
......@@ -36,6 +36,7 @@
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/mpnc/pressureformulation.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
namespace Dumux {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment