Commit 8b6f68a7 authored by Gabi Seitz's avatar Gabi Seitz
Browse files

Merge branch 'fix/headercheck' into 'master'

Fix Course Headercheck

See merge request !99
parents 9e4105cc 2c78f992
Pipeline #1840 passed with stage
in 1 minute and 8 seconds
......@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/binarycoefficients/h2o_n2.hh>
namespace Dumux {
......
......@@ -24,6 +24,9 @@
#ifndef DUMUX_BIOMIN_REACTIONS_HH
#define DUMUX_BIOMIN_REACTIONS_HH
#include <dumux/common/parameters.hh>
// #include <dumux-course/exercises/exercise-biomineralization/components/urea.hh>
namespace Dumux {
/*!
......@@ -98,6 +101,7 @@ public:
// TODO: dumux-course-task
// compute rate of ureolysis by implementing Z_urease,biofilm and r_urea
Scalar rurea = 0.0;
// compute/set dissolution and precipitation rate of calcite
Scalar rprec = 0.0;
......
......@@ -26,9 +26,9 @@
#include <dumux/material/components/base.hh>
#include <dumux/material/components/solid.hh>
#include <dumux/common/parameters.hh>
namespace Dumux {
namespace Components {
namespace Dumux::Components {
/*!
* \ingroup Components
......@@ -71,7 +71,6 @@ public:
}
};
} // end namespace Components
} // end namespace Dumux
} // end namespace Dumux::Components
#endif
......@@ -25,6 +25,8 @@
// Both Domains
#include <dune/grid/yaspgrid.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// TODO: dumux-course-task 1.C
//****** uncomment for the last exercise *****//
......
......@@ -24,11 +24,12 @@
#ifndef DUMUX_STOKES1P2C_SUBPROBLEM_HH
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
namespace Dumux {
#include <dumux/freeflow/navierstokes/problem.hh>
namespace Dumux {
/*!
* \ingroup NavierStokesTests
* \brief Test problem for the one-phase compositional (Navier-) Stokes problem.
......
......@@ -24,8 +24,11 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
......
......@@ -26,6 +26,8 @@
// Both Domains
#include <dune/grid/yaspgrid.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
......
......@@ -23,13 +23,15 @@
#ifndef DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
// TODO: dumux-course-task 3.A
// Include headers for turbulence problem (rans) here.
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
namespace Dumux {
/*!
* \brief The free-flow sub problem
*/
......
......@@ -26,6 +26,8 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
......
......@@ -26,6 +26,8 @@
// Both domain
#include <dune/grid/yaspgrid.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
......
......@@ -24,6 +24,8 @@
#ifndef DUMUX_BIOMIN_REACTIONS_HH
#define DUMUX_BIOMIN_REACTIONS_HH
#include <dumux/common/parameters.hh>
namespace Dumux {
/*!
......
......@@ -24,11 +24,12 @@
#ifndef DUMUX_BIOFILM_HH
#define DUMUX_BIOFILM_HH
#include <dumux/common/parameters.hh>
#include <dumux/material/components/base.hh>
#include <dumux/material/components/solid.hh>
namespace Dumux {
namespace Components {
namespace Dumux::Components {
/*!
* \ingroup Components
......@@ -71,7 +72,6 @@ public:
}
};
} // end namespace Components
} // end namespace Dumux
} // end namespace Dumux::Components
#endif
......@@ -26,8 +26,7 @@
#include <dumux/material/components/base.hh>
namespace Dumux {
namespace Components {
namespace Dumux::Components {
/*!
* \ingroup Components
......@@ -52,7 +51,5 @@ public:
};
} // end namespace Components
} // end namespace Dumux
} // end namespace Dumux::Components
#endif
......@@ -27,12 +27,12 @@
#include <string>
#include <dune/common/exceptions.hh>
#include "../components/biofilm.hh"
#include <dumux/common/parameters.hh>
#include <dumux/material/components/calcite.hh>
#include <dumux/material/components/granite.hh>
#include "../components/biofilm.hh"
namespace Dumux {
namespace SolidSystems {
namespace Dumux::SolidSystems {
/*!
* \ingroup SolidSystems
......@@ -195,7 +195,6 @@ public:
};
} // end namespace SolidSystems
} // end namespace Dumux
} // end namespace Dumux::SolidSystems
#endif
......@@ -23,11 +23,12 @@
#ifndef DUMUX_STOKES_SUBPROBLEM_HH
#define DUMUX_STOKES_SUBPROBLEM_HH
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
namespace Dumux {
#include <dumux/freeflow/navierstokes/problem.hh>
namespace Dumux {
/*!
* \brief The free flow sub problem
*/
......
......@@ -26,6 +26,8 @@
// Both domains
#include <dune/grid/yaspgrid.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
#if EXNUMBER >= 3
#include <dumux/io/grid/gridmanager_sub.hh>
......
......@@ -24,11 +24,12 @@
#ifndef DUMUX_STOKES1P2C_SUBPROBLEM_HH
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
namespace Dumux {
#include <dumux/freeflow/navierstokes/problem.hh>
namespace Dumux {
/*!
* \ingroup NavierStokesTests
* \brief Test problem for the one-phase compositional (Navier-) Stokes problem.
......
......@@ -24,11 +24,13 @@
#ifndef DUMUX_DARCY_SUBPROBLEM_HH
#define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
namespace Dumux {
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
/*!
* \brief The porous medium flow sub problem
*/
......
......@@ -30,6 +30,8 @@
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/material/fluidsystems/1padapter.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/multidomain/staggeredtraits.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
// Porous medium flow domain
#include <dumux/discretization/cctpfa.hh>
......
......@@ -29,7 +29,9 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#endif
#include <dumux/common/timeloop.hh>
#include <dumux/common/properties.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
namespace Dumux {
......
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