Commit 20150426 authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

[make_headercheck] Add missing guards when include headers

parent ea81cb8c
Pipeline #6874 waiting for manual action with stages
......@@ -26,7 +26,9 @@
// ### Includes
// The header includes will be mentioned in the text below.
// [[details]] header includes
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -26,7 +26,9 @@
// [[content]]
// ### Includes
// [[details]] includes
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh> // for `Dune::FoamGrid`
#endif
// The `OneP` type tag specializes most of the `properties` required for single-
// phase flow simulations in DuMu<sup>x</sup>. We will use this in the following to inherit the
......
......@@ -27,7 +27,9 @@
#include <config.h>
#include <dune/grid/yaspgrid.hh>
#if HAVE_DUNE_SUBGRID
#include <dune/subgrid/subgrid.hh>
#endif
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/2p/model.hh>
......
......@@ -28,7 +28,9 @@
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/uggrid.hh>
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -36,7 +36,9 @@
#endif
#include <dune/grid/yaspgrid.hh>
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/discretization/box.hh>
......
......@@ -27,7 +27,9 @@
#define SOILTYPETAG SoilCC
#endif
#include <dune/grid/yaspgrid.hh>
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -24,7 +24,10 @@
#ifndef DUMUX_FRACTURE_PROPERTIES_HH
#define DUMUX_FRACTURE_PROPERTIES_HH
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/cctpfa.hh>
......
......@@ -25,8 +25,12 @@
#ifndef DUMUX_TEST_TPFAFACETCOUPLING_PROPERTIES_HH
#define DUMUX_TEST_TPFAFACETCOUPLING_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......
......@@ -24,8 +24,12 @@
#ifndef DUMUX_TEST_TPFAFACETCOUPLING_ONEP_BULK_PROPERTIES_HH
#define DUMUX_TEST_TPFAFACETCOUPLING_ONEP_BULK_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......
......@@ -24,8 +24,13 @@
#ifndef DUMUX_TEST_TPFAFACETCOUPLING_PROPERTIES_HH
#define DUMUX_TEST_TPFAFACETCOUPLING_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......
......@@ -25,8 +25,12 @@
#ifndef DUMUX_TEST_FACETCOUPLING_THREEDOMAIN_PROPERTIES_HH
#define DUMUX_TEST_FACETCOUPLING_THREEDOMAIN_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......
......@@ -34,8 +34,12 @@
#define DIMWORLD 2
#endif
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#include <dumux/material/fluidsystems/h2on2.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
......
......@@ -25,8 +25,13 @@
#ifndef DUMUX_TEST_TPFAFACETCOUPLING_PROPERTIES_HH
#define DUMUX_TEST_TPFAFACETCOUPLING_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......
......@@ -24,7 +24,9 @@
#ifndef DUMUX_PNM1P_NONCREEPING_PROPERTIES_HH
#define DUMUX_PNM1P_NONCREEPING_PROPERTIES_HH
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/common/properties.hh>
#include <dumux/porenetwork/1p/model.hh>
......
......@@ -24,7 +24,9 @@
#ifndef DUMUX_PNM1P_PROPERTIES_HH
#define DUMUX_PNM1P_PROPERTIES_HH
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/common/properties.hh>
......
......@@ -24,7 +24,9 @@
#ifndef DUMUX_PNM1P2C_PROPERTIES_HH
#define DUMUX_PNM1P2C_PROPERTIES_HH
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/porenetwork/1pnc/model.hh>
......
......@@ -24,7 +24,9 @@
#ifndef DUMUX_PNM2P_PROPERTIES_HH
#define DUMUX_PNM2P_PROPERTIES_HH
#if HAVE_DUNE_FOAMGRID
#include <dune/foamgrid/foamgrid.hh>
#endif
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porenetwork/2p/model.hh>
......
......@@ -45,8 +45,7 @@
#include "spatialparams.hh"
#ifndef GRIDTYPE
#include <dune/alugrid/grid.hh>
#define GRIDTYPE Dune::ALUGrid<2, 2, Dune::simplex , Dune::conforming>;
#define GRIDTYPE Dune::YaspGrid<2>;
#endif
namespace Dumux::Properties {
......
......@@ -20,7 +20,9 @@
#ifndef DUMUX_TEST_TWOP_ROTATIONALSYMMETRY_PROPERTIES_HH
#define DUMUX_TEST_TWOP_ROTATIONALSYMMETRY_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#include <dumux/common/properties.hh>
......
......@@ -25,7 +25,9 @@
#ifndef DUMUX_HETEROGENEOUS_PROPERTIES_HH
#define DUMUX_HETEROGENEOUS_PROPERTIES_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#include <dumux/discretization/cctpfa.hh>
#include <dumux/discretization/ccmpfa.hh>
......
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