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
...@@ -179,10 +179,10 @@ Dune::MatrixIndexSet getFEJacobianPattern(const FEBasis& feBasis) ...@@ -179,10 +179,10 @@ Dune::MatrixIndexSet getFEJacobianPattern(const FEBasis& feBasis)
const auto& finiteElement = localView.tree().finiteElement(); const auto& finiteElement = localView.tree().finiteElement();
const auto numLocalDofs = finiteElement.localBasis().size(); const auto numLocalDofs = finiteElement.localBasis().size();
for (size_t i = 0; i < numLocalDofs; i++) for (std::size_t i = 0; i < numLocalDofs; i++)
{ {
const auto dofIdxI = localView.index(i); const auto dofIdxI = localView.index(i);
for (size_t j = 0; j < numLocalDofs; j++) for (std::size_t j = 0; j < numLocalDofs; j++)
{ {
const auto dofIdxJ = localView.index(j); const auto dofIdxJ = localView.index(j);
pattern.add(dofIdxI, dofIdxJ); pattern.add(dofIdxI, dofIdxJ);
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#ifndef DUMUX_COMMON_NUMEQVECTOR_HH #ifndef DUMUX_COMMON_NUMEQVECTOR_HH
#define DUMUX_COMMON_NUMEQVECTOR_HH #define DUMUX_COMMON_NUMEQVECTOR_HH
#include <cstddef>
namespace Dumux { namespace Dumux {
template<class PrimaryVariables> template<class PrimaryVariables>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define DUMUX_MODEL_PROPERTIES_HH #define DUMUX_MODEL_PROPERTIES_HH
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <dune/common/deprecated.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/balanceequationopts.hh> #include <dumux/common/balanceequationopts.hh>
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#define DUMUX_DISCRETIZATION_PNM_FV_ELEMENT_GEOMETRY_HH #define DUMUX_DISCRETIZATION_PNM_FV_ELEMENT_GEOMETRY_HH
#include <optional> #include <optional>
#include <array>
#include <dumux/common/indextraits.hh> #include <dumux/common/indextraits.hh>
#include <dumux/discretization/scvandscvfiterators.hh> #include <dumux/discretization/scvandscvfiterators.hh>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <memory> #include <memory>
#include <dune/common/std/type_traits.hh> #include <dune/common/std/type_traits.hh>
#include <dumux/common/parameters.hh>
namespace Dumux { namespace Dumux {
namespace Detail { namespace Detail {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <iostream> #include <iostream>
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
#include <dumux/common/exceptions.hh> #include <dumux/common/exceptions.hh>
#include <dumux/common/parameters.hh>
#include <dumux/discretization/localview.hh> #include <dumux/discretization/localview.hh>
namespace Dumux::PoreNetwork { namespace Dumux::PoreNetwork {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#ifndef DUMUX_PNM_BASE_PORE_PROPERTIES_HH #ifndef DUMUX_PNM_BASE_PORE_PROPERTIES_HH
#define DUMUX_PNM_BASE_PORE_PROPERTIES_HH #define DUMUX_PNM_BASE_PORE_PROPERTIES_HH
#include <cmath>
#include <string> #include <string>
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
......
...@@ -24,6 +24,12 @@ ...@@ -24,6 +24,12 @@
#ifndef DUMUX_ONEP_SUB_TEST_PROPERTIES_HH #ifndef DUMUX_ONEP_SUB_TEST_PROPERTIES_HH
#define DUMUX_ONEP_SUB_TEST_PROPERTIES_HH #define DUMUX_ONEP_SUB_TEST_PROPERTIES_HH
#include <dune/grid/yaspgrid.hh>
#if DOMAINSPLIT==1
#include <dune/subgrid/subgrid.hh>
#endif
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/porousmediumflow/1p/model.hh> #include <dumux/porousmediumflow/1p/model.hh>
......
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
#include <config.h> #include <config.h>
#include <dune/grid/yaspgrid.hh>
#include <dune/subgrid/subgrid.hh>
#include <dumux/porousmediumflow/1p/model.hh> #include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/2p/model.hh> #include <dumux/porousmediumflow/2p/model.hh>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh> #include <dumux/common/numeqvector.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "problem_darcy.hh" #include "problem_darcy.hh"
#include "problem_stokes.hh" #include "problem_stokes.hh"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/numeqvector.hh> #include <dumux/common/numeqvector.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/numeqvector.hh> #include <dumux/common/numeqvector.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh> #include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh> #include <dumux/freeflow/navierstokes/problem.hh>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <dumux/flux/maxwellstefanslaw.hh> #include <dumux/flux/maxwellstefanslaw.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "problem_darcy.hh" #include "problem_darcy.hh"
#include "problem_stokes.hh" #include "problem_stokes.hh"
#include "spatialparams.hh" #include "spatialparams.hh"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <dumux/freeflow/compositional/navierstokesncmodel.hh> #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
#include <dumux/material/fluidsystems/1padapter.hh> #include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh> #include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include "problem_stokes.hh" #include "problem_stokes.hh"
namespace Dumux::Properties { namespace Dumux::Properties {
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <dumux/freeflow/compositional/navierstokesncmodel.hh> #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "problem_darcy.hh" #include "problem_darcy.hh"
#include "problem_stokes.hh" #include "problem_stokes.hh"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <dumux/freeflow/compositional/navierstokesncmodel.hh> #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "h2n2co2fluidsystem.hh" #include "h2n2co2fluidsystem.hh"
#include "problem_darcy.hh" #include "problem_darcy.hh"
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <dumux/porousmediumflow/1p/model.hh> #include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "spatialparams.hh" #include "spatialparams.hh"
#include "problem_darcy.hh" #include "problem_darcy.hh"
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <dumux/discretization/staggered/freeflow/properties.hh> #include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "spatialparams.hh" #include "spatialparams.hh"
#include "problem_darcy.hh" #include "problem_darcy.hh"
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <dumux/material/fluidsystems/1padapter.hh> #include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh> #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include "problem_darcy.hh" #include "problem_darcy.hh"
#include "problem_stokes.hh" #include "problem_stokes.hh"
......
Markdown is supported
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