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

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
e1a0949b · Hanchuan Wu · 56a0c660 · 2709ed6f · e1a0949b · e1a0949b
Commit e1a0949b authored Jun 08, 2021 by Hanchuan Wu
--- a/dumux/assembly/jacobianpattern.hh
+++ b/dumux/assembly/jacobianpattern.hh
@@ -179,10 +179,10 @@ Dune::MatrixIndexSet getFEJacobianPattern(const FEBasis& feBasis)

        const auto& finiteElement = localView.tree().finiteElement();
        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);
-            for (size_t j = 0; j < numLocalDofs; j++)
+            for (std::size_t j = 0; j < numLocalDofs; j++)
            {
                const auto dofIdxJ = localView.index(j);
                pattern.add(dofIdxI, dofIdxJ);

--- a/dumux/common/numeqvector.hh
+++ b/dumux/common/numeqvector.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_COMMON_NUMEQVECTOR_HH
 #define DUMUX_COMMON_NUMEQVECTOR_HH

+#include <cstddef>
+
 namespace Dumux {

 template<class PrimaryVariables>

--- a/dumux/common/properties/model.hh
+++ b/dumux/common/properties/model.hh
@@ -25,6 +25,7 @@
 #define DUMUX_MODEL_PROPERTIES_HH

 #include <dune/common/fvector.hh>
+#include <dune/common/deprecated.hh>

 #include <dumux/common/properties.hh>
 #include <dumux/common/balanceequationopts.hh>

--- a/dumux/discretization/porenetwork/fvelementgeometry.hh
+++ b/dumux/discretization/porenetwork/fvelementgeometry.hh
@@ -25,6 +25,8 @@
 #define DUMUX_DISCRETIZATION_PNM_FV_ELEMENT_GEOMETRY_HH

 #include <optional>
+#include <array>
+
 #include <dumux/common/indextraits.hh>
 #include <dumux/discretization/scvandscvfiterators.hh>


--- a/dumux/nonlinear/primaryvariableswitchadapter.hh
+++ b/dumux/nonlinear/primaryvariableswitchadapter.hh
@@ -26,6 +26,7 @@

 #include <memory>
 #include <dune/common/std/type_traits.hh>
+#include <dumux/common/parameters.hh>

 namespace Dumux {
 namespace Detail {

--- a/dumux/porenetwork/2p/newtonconsistencychecks.hh
+++ b/dumux/porenetwork/2p/newtonconsistencychecks.hh
@@ -28,6 +28,7 @@
 #include <iostream>
 #include <dune/common/exceptions.hh>
 #include <dumux/common/exceptions.hh>
+#include <dumux/common/parameters.hh>
 #include <dumux/discretization/localview.hh>

 namespace Dumux::PoreNetwork {

--- a/dumux/porenetwork/common/poreproperties.hh
+++ b/dumux/porenetwork/common/poreproperties.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_PNM_BASE_PORE_PROPERTIES_HH
 #define DUMUX_PNM_BASE_PORE_PROPERTIES_HH

+#include <cmath>
 #include <string>
 #include <dune/common/exceptions.hh>


--- a/test/multidomain/boundary/darcydarcy/1p_1p/properties.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/properties.hh
@@ -24,6 +24,12 @@
 #ifndef 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/porousmediumflow/1p/model.hh>

--- a/test/multidomain/boundary/darcydarcy/1p_2p/properties.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/properties.hh
@@ -26,6 +26,9 @@

 #include <config.h>

+#include <dune/grid/yaspgrid.hh>
+#include <dune/subgrid/subgrid.hh>
+
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/2p/model.hh>


--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
@@ -30,7 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/numeqvector.hh>
-
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 #include <dumux/porousmediumflow/problem.hh>

 namespace Dumux {

--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/properties.hh
@@ -43,6 +43,7 @@

 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>

 #include "problem_darcy.hh"
 #include "problem_stokes.hh"

--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -29,7 +29,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/numeqvector.hh>
-
+#include <dumux/common/timeloop.hh>
 #include <dumux/porousmediumflow/problem.hh>

 namespace Dumux {

--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/numeqvector.hh>
-
+#include <dumux/common/timeloop.hh>
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 #include <dumux/freeflow/navierstokes/problem.hh>


--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties.hh
@@ -39,7 +39,7 @@
 #include <dumux/flux/maxwellstefanslaw.hh>

 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
-
+#include <dumux/multidomain/staggeredtraits.hh>
 #include "problem_darcy.hh"
 #include "problem_stokes.hh"
 #include "spatialparams.hh"

--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/properties_stokes.hh
@@ -30,7 +30,7 @@
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>
 #include <dumux/material/fluidsystems/1padapter.hh>
 #include <dumux/material/fluidsystems/h2oair.hh>
-
+#include <dumux/discretization/staggered/freeflow/properties.hh>
 #include "problem_stokes.hh"

 namespace Dumux::Properties {

--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/properties.hh
@@ -38,6 +38,7 @@
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>

 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>

 #include "problem_darcy.hh"
 #include "problem_stokes.hh"

--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/properties.hh
@@ -34,6 +34,7 @@
 #include <dumux/freeflow/compositional/navierstokesncmodel.hh>

 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>

 #include "h2n2co2fluidsystem.hh"
 #include "problem_darcy.hh"

--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/properties.hh
@@ -35,6 +35,7 @@
 #include <dumux/porousmediumflow/1p/model.hh>

 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>

 #include "spatialparams.hh"
 #include "problem_darcy.hh"

--- a/test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/properties.hh
@@ -36,6 +36,7 @@
 #include <dumux/discretization/staggered/freeflow/properties.hh>

 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>

 #include "spatialparams.hh"
 #include "problem_darcy.hh"

--- a/test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/properties.hh
@@ -42,6 +42,7 @@
 #include <dumux/material/fluidsystems/1padapter.hh>

 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
+#include <dumux/multidomain/staggeredtraits.hh>

 #include "problem_darcy.hh"
 #include "problem_stokes.hh"