diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index 59dd426a517466d23d672617a4931d22e87a017b..f799ea780b9a9509a14ffbb0fff5327f20a744b3 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -172,7 +172,7 @@ public:
* scvf
* ---------======= == and # staggered half-control-volume
* | # | current scvf
- * | # | # staggered face over wich fluxes are calculated
+ * | # | # staggered face over which fluxes are calculated
* vel.Opp <~~| #~~> x~~~~> vel.Self
* | # | x dof position
* scvf | # |
@@ -265,7 +265,7 @@ public:
* scvf
* ---------####### || and # staggered half-control-volume
* | || | current scvf
- * | || | # normal staggered sub faces over wich fluxes are calculated
+ * | || | # normal staggered sub faces over which fluxes are calculated
* | || x~~~~> vel.Self
* | || | x dof position
* scvf | || |
@@ -344,7 +344,7 @@ private:
* | | |
* scvf ---------####### || and # staggered half-control-volume
* | || | current scvf
- * | || | # normal staggered faces over wich fluxes are calculated
+ * | || | # normal staggered faces over which fluxes are calculated
* | || x~~~~> vel.Self
* | || | x dof position
* scvf | || |
@@ -423,7 +423,7 @@ private:
* | || | curr. ::
* | || | scvf :: :: staggered half-control-volume (neighbor element)
* | || x~~~~> ::
- * | || | vel. :: # normal staggered faces over wich fluxes are calculated
+ * | || | vel. :: # normal staggered faces over which fluxes are calculated
* scvf | || | Self ::
* ---------#######::::::::: x dof position
* scvf
@@ -513,7 +513,7 @@ private:
* scvf //
* ---------=======// == and # staggered half-control-volume
* | || #// current scvf
- * | || #// # staggered boundary face over wich fluxes are calculated
+ * | || #// # staggered boundary face over which fluxes are calculated
* | || x~~~~> vel.Self
* | || #// x dof position
* scvf | || #//
diff --git a/dumux/geomechanics/elastic/localresidual.hh b/dumux/geomechanics/elastic/localresidual.hh
index e0a49dca3ad49a199f7bc01467af27cd7efda9a1..a4351fe553aed5ae066bdcb417e9b0480cf4b287 100644
--- a/dumux/geomechanics/elastic/localresidual.hh
+++ b/dumux/geomechanics/elastic/localresidual.hh
@@ -26,6 +26,7 @@
#ifndef DUMUX_GEOMECHANICS_ELASTIC_LOCAL_RESIDUAL_HH
#define DUMUX_GEOMECHANICS_ELASTIC_LOCAL_RESIDUAL_HH
+#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
diff --git a/dumux/geomechanics/elastic/volumevariables.hh b/dumux/geomechanics/elastic/volumevariables.hh
index 2f7423fe504f41ccd9bebde7641b4264468017db..254d70e6eb898537d974be5289419f57907df9d5 100644
--- a/dumux/geomechanics/elastic/volumevariables.hh
+++ b/dumux/geomechanics/elastic/volumevariables.hh
@@ -26,7 +26,9 @@
#define DUMUX_ELASTIC_VOLUME_VARIABLES_HH
#include <type_traits>
+
#include <dune/common/exceptions.hh>
+
#include <dumux/material/solidstates/updatesolidvolumefractions.hh>
namespace Dumux {
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index 0889919d48603f3bb634d35ed0da42b8aec07783..d4e147a0d24e688672a6d89f0aca18cca6a03889 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -26,12 +26,12 @@
#define DUMUX_FV_SPATIAL_PARAMS_ONE_P_HH
#include <dune/common/exceptions.hh>
+#include <dune/common/fmatrix.hh>
+
#include <dumux/common/parameters.hh>
#include <dumux/common/math.hh>
#include <dumux/common/typetraits/isvalid.hh>
-#include <dune/common/fmatrix.hh>
-
namespace Dumux {
#ifndef DOXYGEN
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh
index 62d7f625d132af68660c6e3e8a0c83e7ea8882de..c36abb5eb166f697c77ef372532b73972d98af8b 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh
@@ -121,7 +121,7 @@ public:
/*! \brief Compositional pressure solution routine: update estimate for secants, assemble, solve.
* An update estime (transport step acoording to old pressure field) determines changes in
- * mass, composition, wich is used to calculate volume derivatives entering the pressure
+ * mass, composition, which is used to calculate volume derivatives entering the pressure
* equation, as well as an approximate guess for time step size for the storage terms in the
* p.e.
* Afterwards, the system is assembled and solved for pressure.
diff --git a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
index c4a1d936317a29721b8c7498b8f4625ee44eac8d..5cbbeaa2bb137e693c0837ed6ea06a6e5ae4ca0b 100644
--- a/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvelementgeometry.hh
@@ -303,7 +303,7 @@ private:
// NOTE We do not construct fracture scvfs on boundaries here!
// That means specifying Neumann fluxes on only the fractures is not possible
// However, it is difficult to interpret this here as a fracture ending on the boundary
- // could also be connected to a facet wich is both boundary and fracture at the same time!
+ // could also be connected to a facet which is both boundary and fracture at the same time!
// In that case, the fracture boundary scvf wouldn't make sense. In order to do it properly
// we would have to find only those fractures that are at the boundary and aren't connected
// to a fracture which is a boundary.
diff --git a/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh b/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh
index 8477d35727706d5e6673c596c66b641574cab261..908f720e08057fa8c4d719c571019c31eaf2ac00 100644
--- a/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh
+++ b/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh
@@ -218,7 +218,7 @@ public:
// NOTE We do not construct fracture scvfs on boundaries here!
// That means specifying Neumann fluxes on only the fractures is not possible
// However, it is difficult to interpret this here as a fracture ending on the boundary
- // could also be connected to a facet wich is both boundary and fracture at the same time!
+ // could also be connected to a facet which is both boundary and fracture at the same time!
// In that case, the fracture boundary scvf wouldn't make sense. In order to do it properly
// we would have to find only those fractures that are at the boundary and aren't connected
// to a fracture which is a boundary.
diff --git a/dumux/porousmediumflow/richardsnc/volumevariables.hh b/dumux/porousmediumflow/richardsnc/volumevariables.hh
index f96a162fd7fc68d2a28f05c985189183d88eac05..9546150af0aa95d0651b5fe1ff9d8d5c4964cf36 100644
--- a/dumux/porousmediumflow/richardsnc/volumevariables.hh
+++ b/dumux/porousmediumflow/richardsnc/volumevariables.hh
@@ -25,6 +25,7 @@
#ifndef DUMUX_RICHARDSNC_VOLUME_VARIABLES_HH
#define DUMUX_RICHARDSNC_VOLUME_VARIABLES_HH
+#include <algorithm>
#include <array>
#include <dumux/porousmediumflow/volumevariables.hh>
diff --git a/test/freeflow/navierstokes/stokeschannel3dproblem.hh b/test/freeflow/navierstokes/stokeschannel3dproblem.hh
index f9d7440d57682d9ba7c3105c4f2962ac8be9a8b6..b757d830a90254237b6f211ae8614a18b293bcbf 100644
--- a/test/freeflow/navierstokes/stokeschannel3dproblem.hh
+++ b/test/freeflow/navierstokes/stokeschannel3dproblem.hh
@@ -36,6 +36,10 @@
#include <dumux/freeflow/navierstokes/model.hh>
#include <dune/common/float_cmp.hh>
+#ifndef DIM_3D
+#define DIM_3D 0
+#endif
+
namespace Dumux
{
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
index 8b217a7cac8e12c2c7e25d46c5c55ecbcac07c25..f0db44035b39111c2020aa55604af4e24f701da4 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
@@ -294,7 +294,7 @@ public:
* \brief Evaluate the analytical solution.
*
* \param values The dirichlet values for the primary variables
- * \param time The time at wich the solution should be evaluated
+ * \param time The time at which the solution should be evaluated
* \param globalPos The position for which the Dirichlet value is set
*
* For this method, the \a values parameter stores primary variables.
diff --git a/tutorial/ex3/components/mycompressiblecomponent.hh b/tutorial/ex3/components/mycompressiblecomponent.hh
index 5e21380c07023c42e3cabbe98e963ea7c22f4b1c..0cbdd944a60dffd7f7a03f32b1c559ec0dc00e09 100644
--- a/tutorial/ex3/components/mycompressiblecomponent.hh
+++ b/tutorial/ex3/components/mycompressiblecomponent.hh
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup Components
- * \brief A ficitious component to be implemented in exercise 3.
+ * \brief A fictitious component to be implemented in exercise 3.
*/
#ifndef DUMUX_MYCOMPRESSIBLECOMPONENT_HH
#define DUMUX_MYCOMPRESSIBLECOMPONENT_HH
@@ -33,7 +33,7 @@ namespace Dumux
{
/*!
* \ingroup Components
- * \brief A ficitious component to be implemented in exercise 3.
+ * \brief A fictitious component to be implemented in exercise 3.
*
* \tparam Scalar The type used for scalar values
*/
diff --git a/tutorial/ex3/components/myincompressiblecomponent.hh b/tutorial/ex3/components/myincompressiblecomponent.hh
index 17310abd78ea627378add33214e05801dcf0ca94..18e982a336b9eeaf96f58ecc6392c1cb4ac5b1e9 100644
--- a/tutorial/ex3/components/myincompressiblecomponent.hh
+++ b/tutorial/ex3/components/myincompressiblecomponent.hh
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup Components
- * \brief A ficitious component to be implemented in tutorial exercise 3.
+ * \brief A fictitious component to be implemented in tutorial exercise 3.
*/
#ifndef DUMUX_MYINCOMPRESSIBLECOMPONENT_HH
#define DUMUX_MYINCOMPRESSIBLECOMPONENT_HH
@@ -33,7 +33,7 @@ namespace Dumux
{
/*!
* \ingroup Components
- * \brief A ficitious component to be implemented in exercise 3.
+ * \brief A fictitious component to be implemented in exercise 3.
*
* \tparam Scalar The type used for scalar values
*/
diff --git a/tutorial/ex3/fluidsystems/h2omycompressiblecomponent.hh b/tutorial/ex3/fluidsystems/h2omycompressiblecomponent.hh
index e98c1a011f39db1f15f39084de77035e5e975612..cb2db42fef2330ba89eb19bd097be674fd8d21dc 100644
--- a/tutorial/ex3/fluidsystems/h2omycompressiblecomponent.hh
+++ b/tutorial/ex3/fluidsystems/h2omycompressiblecomponent.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief A fluid system with water and a ficitious component, which is to be
+ * \brief A fluid system with water and a fictitious component, which is to be
* implemented in tutorial exercise 3a, as phases and components. This
* fluid system is to be implemented in exercise 3b.
*/
@@ -31,7 +31,7 @@
#include <dumux/material/fluidsystems/base.hh>
-// the ficitious component that was created in exercise 3a
+// the fictitious component that was created in exercise 3a
#include <tutorial/ex3/components/mycompressiblecomponent.hh>
// the binary coefficients corresponding to this fluid system
@@ -44,7 +44,7 @@ namespace FluidSystems
/*!
* \brief A compositional fluid consisting of two liquid phases,
- * which are water and a ficitious component from tutorial exercise 3a.
+ * which are water and a fictitious component from tutorial exercise 3a.
*/
template <class Scalar,
class H2OType = Dumux::Components::TabulatedComponent<Dumux::Components::H2O<Scalar> > >
diff --git a/tutorial/solution/ex3/h2omycompressiblecomponent.hh b/tutorial/solution/ex3/h2omycompressiblecomponent.hh
index 80995530eba36be1ebe54ea3047eb731ad14b8f4..8fb7938a1ed261ee32607a0667cdf02b8285aac8 100644
--- a/tutorial/solution/ex3/h2omycompressiblecomponent.hh
+++ b/tutorial/solution/ex3/h2omycompressiblecomponent.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief A fluid system with water and a ficitious component, which is to be
+ * \brief A fluid system with water and a fictitious component, which is to be
* implemented in tutorial exercise 3a, as phases and components. This
* fluid system is to be implemented in exercise 3b.
*/
@@ -31,7 +31,7 @@
#include <dumux/material/fluidsystems/base.hh>
-// the ficitious component that was created in exercise 3a
+// the fictitious component that was created in exercise 3a
#include <tutorial/ex3/components/mycompressiblecomponent.hh>
// the binary coefficients corresponding to this fluid system
@@ -44,7 +44,7 @@ namespace FluidSystems
/*!
* \brief A compositional fluid consisting of two liquid phases,
- * which are water and a ficitious component from tutorial exercise 3a.
+ * which are water and a fictitious component from tutorial exercise 3a.
*/
template <class TypeTag, class Scalar,
class H2OType = Dumux::Components::TabulatedComponent<Dumux::Components::H2O<Scalar> > >
diff --git a/tutorial/solution/ex3/mycompressiblecomponent.hh b/tutorial/solution/ex3/mycompressiblecomponent.hh
index 7ee4c509590918f78414eb37760c9fbc4b2a52ea..03c4b674763dcbed03f198fdc92cffc273054b39 100644
--- a/tutorial/solution/ex3/mycompressiblecomponent.hh
+++ b/tutorial/solution/ex3/mycompressiblecomponent.hh
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup Components
- * \brief A ficitious component to be implemented in exercise 3.
+ * \brief A fictitious component to be implemented in exercise 3.
*/
#ifndef DUMUX_MYCOMPRESSIBLECOMPONENT_HH
#define DUMUX_MYCOMPRESSIBLECOMPONENT_HH
@@ -35,7 +35,7 @@ namespace Dumux
{
/*!
* \ingroup Components
- * \brief A ficitious component to be implemented in exercise 3.
+ * \brief A fictitious component to be implemented in exercise 3.
*
* \tparam Scalar The type used for scalar values
*/
diff --git a/tutorial/solution/ex3/myincompressiblecomponent.hh b/tutorial/solution/ex3/myincompressiblecomponent.hh
index 7325bb40bd68b3e5d7add4b78e58ac595be3184b..1766e4b6fcd4d7730b170ad695a39f8b41f77835 100644
--- a/tutorial/solution/ex3/myincompressiblecomponent.hh
+++ b/tutorial/solution/ex3/myincompressiblecomponent.hh
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup Components
- * \brief A ficitious component to be implemented in tutorial exercise 3.
+ * \brief A fictitious component to be implemented in tutorial exercise 3.
*/
#ifndef DUMUX_MYINCOMPRESSIBLECOMPONENT_HH
#define DUMUX_MYINCOMPRESSIBLECOMPONENT_HH
@@ -33,7 +33,7 @@ namespace Dumux
{
/*!
* \ingroup Components
- * \brief A ficitious component to be implemented in exercise 3.
+ * \brief A fictitious component to be implemented in exercise 3.
*
* \tparam Scalar The type used for scalar values
*/