diff --git a/doc/doxygen/modules.txt b/doc/doxygen/modules.txt
index 26a12ee9de916b987d34375e2c7a177adc1fabdd..8b1afb8a7832b7a1d62582f42aed33fe8775b3ae 100644
--- a/doc/doxygen/modules.txt
+++ b/doc/doxygen/modules.txt
@@ -243,6 +243,12 @@
* \brief An energy equation adaptor for isothermal free-flow models
* \copydetails ./freeflow/nonisothermal/model.hh
*/
+ /*!
+ * \ingroup FreeflowModels
+ * \defgroup ShallowWaterModel 2D shallow water model
+ * \brief Two-dimensional shallow water flow (depth-averaged)
+ * \copydetails ./freeflow/shallowwater/model.hh
+ */
/*!
* \defgroup Geomechanics Geomechanics Models
* \brief Models for taking into account solid deformation
@@ -375,6 +381,11 @@
* \defgroup RANSNCTests Reynolds-Averaged Navier-Stokes nc tests
* \brief Various tests using a single-phase Reynolds-Averaged Navier-Stokes flow with n components. The files are listed below.
*/
+ /*!
+ * \ingroup FreeflowTests
+ * \defgroup ShallowWaterTests 2D shallow water tests
+ * \brief Tests for the two-dimensional shallow water model. The files are listed below.
+ */
/*!
* \ingroup BenchmarksAndTests
* \defgroup GeomechanicsTests Geomechanics Tests
@@ -471,6 +482,11 @@
* \defgroup StaggeredFlux Flux related to the staggered scheme
* \brief Flux related to the staggered scheme
*/
+ /*!
+ * \ingroup Flux
+ * \defgroup ShallowWaterFlux Flux related to the shallow water model
+ * \brief Flux related to the shallow water model
+ */
/* ***************** Material ******************/
/*!
* \defgroup Material Material and Fluid Framework
diff --git a/dumux/flux/shallowwater/exactriemann.hh b/dumux/flux/shallowwater/exactriemann.hh
index 9bb3fefc5295a9e1eeadd74758eaf939432344f1..c2c4fd8237953500ec96b85c3a0ebb77a9c0ae1a 100644
--- a/dumux/flux/shallowwater/exactriemann.hh
+++ b/dumux/flux/shallowwater/exactriemann.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWater
+ * \ingroup ShallowWaterFlux
* \brief Function to compute the Riemann flux at the interface
*/
#ifndef DUMUX_FLUX_SHALLOW_WATER_EXACT_RIEMANN_HH
@@ -40,7 +40,7 @@ struct RiemannSolution {
/*!
- * \ingroup ShallowWater
+ * \ingroup ShallowWaterFlux
* \brief Exact Riemann solver for Shallow water equations.
*
* This Riemann solver is described in the book
diff --git a/dumux/flux/shallowwater/fluxlimiterlet.hh b/dumux/flux/shallowwater/fluxlimiterlet.hh
index f6b07952bfbb83394474f7f42507244d96ce4318..a0966cdc8716a18528edb23737616c6d1b245fce 100644
--- a/dumux/flux/shallowwater/fluxlimiterlet.hh
+++ b/dumux/flux/shallowwater/fluxlimiterlet.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWater
+ * \ingroup ShallowWaterFlux
* \brief Function to limit the fluxes
*
*/
@@ -32,7 +32,7 @@ namespace Dumux {
namespace ShallowWater {
/*!
- * \ingroup ShallowWater
+ * \ingroup ShallowWaterFlux
* \brief Flux limiter function to scale fluxes for small water depths.
*
* This function acts like a kind of mobility, it limits the water flux
diff --git a/dumux/flux/shallowwater/riemannproblem.hh b/dumux/flux/shallowwater/riemannproblem.hh
index 9566face8e06a356747bbaf00896c2810fea434b..d009787a7a120b0937ddcfb56f913b5e0573a2ab 100644
--- a/dumux/flux/shallowwater/riemannproblem.hh
+++ b/dumux/flux/shallowwater/riemannproblem.hh
@@ -18,8 +18,8 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWater
- * \brief This file includes a unction to construct the Riemann problem
+ * \ingroup ShallowWaterFlux
+ * \brief This file includes a function to construct the Riemann problem
*
*/
#ifndef DUMUX_FLUX_SHALLOW_WATER_RIEMANN_PROBLEM_HH
@@ -32,7 +32,7 @@ namespace Dumux {
namespace ShallowWater {
/*!
- * \ingroup ShallowWater
+ * \ingroup ShallowWaterFlux
* \brief Construct Riemann Problem and solve it
*
*
@@ -58,7 +58,7 @@ namespace ShallowWater {
* \param velocityYRight velocityY on the right side
* \param bedSurfaceLeft surface of the bed on the left side
* \param bedSurfaceRight surface of the bed on the right side
- * \param grav gravity constant
+ * \param gravity gravity constant
* \param nxy the normal vector
*
*/
diff --git a/dumux/flux/shallowwaterflux.hh b/dumux/flux/shallowwaterflux.hh
index 4e90663bae75851a1c2d648fb759de73bf396c3d..cb11f465a5f5565c5de783b3d9e4e08cbf8463d4 100644
--- a/dumux/flux/shallowwaterflux.hh
+++ b/dumux/flux/shallowwaterflux.hh
@@ -16,6 +16,11 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
+/*!
+ * \file
+ * \ingroup Flux
+ * \copydoc Dumux::ShallowWaterFlux
+ */
#ifndef DUMUX_FLUX_SHALLOW_WATER_FLUX_HH
#define DUMUX_FLUX_SHALLOW_WATER_FLUX_HH
@@ -24,6 +29,10 @@
namespace Dumux {
+/*!
+ * \ingroup Flux
+ * \brief Computes the shallow water flux by solving a riemann problem.
+ */
template<class NumEqVector>
class ShallowWaterFlux
{
diff --git a/dumux/freeflow/shallowwater/boundaryfluxes.hh b/dumux/freeflow/shallowwater/boundaryfluxes.hh
index f261af4c99808e0c1320d935ac9cfabff2c3e460..0e00f1fa0de2328bf75c45e30dc618902e83116f 100644
--- a/dumux/freeflow/shallowwater/boundaryfluxes.hh
+++ b/dumux/freeflow/shallowwater/boundaryfluxes.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWater
+ * \ingroup ShallowWaterModel
* \brief Compute boundary conditions (cell state) via Riemann invariants
*
*/
diff --git a/dumux/freeflow/shallowwater/indices.hh b/dumux/freeflow/shallowwater/indices.hh
index c137f986e23282bff3479a71bcebc5db303f61ab..aba2416eecd89b65852843fa7c1916c93177c95c 100644
--- a/dumux/freeflow/shallowwater/indices.hh
+++ b/dumux/freeflow/shallowwater/indices.hh
@@ -30,8 +30,6 @@ namespace Dumux {
/*!
* \ingroup ShallowWaterModel
* \brief The common indices for the shallow water equations model.
- *
- * \tparam PVOffset The first index in a primary variable vector.
*/
struct ShallowWaterIndices
{
diff --git a/dumux/freeflow/shallowwater/iofields.hh b/dumux/freeflow/shallowwater/iofields.hh
index dbcc79324cbcb8b8ad6e9104b11fda983f4375cf..137b75ef0f4f061bd64064e14264638f369f0c62 100644
--- a/dumux/freeflow/shallowwater/iofields.hh
+++ b/dumux/freeflow/shallowwater/iofields.hh
@@ -19,7 +19,7 @@
/*!
* \file
* \ingroup ShallowWaterModel
- * \copydoc Add I/O fields specific to shallow water
+ * \brief Add I/O fields specific to shallow water
*/
#ifndef DUMUX_FREEFLOW_SHALLOW_WATER_IO_FIELDS_HH
#define DUMUX_FREEFLOW_SHALLOW_WATER_IO_FIELDS_HH
diff --git a/dumux/freeflow/shallowwater/localresidual.hh b/dumux/freeflow/shallowwater/localresidual.hh
index e92a14f8f220c4865bd1ba2d0001436ff079b648..3144b373ba01799e56a170328d5b5f61f882968c 100644
--- a/dumux/freeflow/shallowwater/localresidual.hh
+++ b/dumux/freeflow/shallowwater/localresidual.hh
@@ -85,6 +85,7 @@ public:
* \param fvGeometry The finite-volume geometry
* \param elemVolVars The volume variables of the current element
* \param scvf The sub control volume face to compute the flux on
+ * \param elemFluxVarsCache the flux variable cache for the element stencil
*/
NumEqVector computeFlux(const Problem& problem,
const Element& element,
diff --git a/dumux/freeflow/shallowwater/model.hh b/dumux/freeflow/shallowwater/model.hh
index c2e3f421d75cac8c04bfbeaf955f85d9ac6e548a..db9b06b6a9742a2d0ab7c87c1e4970de9261f242 100644
--- a/dumux/freeflow/shallowwater/model.hh
+++ b/dumux/freeflow/shallowwater/model.hh
@@ -20,8 +20,7 @@
* \file
* \ingroup ShallowWaterModel
*
- * \brief A two-dimesnional shallow water equations model
- *
+ * \brief A two-dimensional shallow water equations model
* The two-dimensonal shallow water equations (SWEs) can be written as
*
* \f[
diff --git a/dumux/freeflow/shallowwater/problem.hh b/dumux/freeflow/shallowwater/problem.hh
index 0be939764df2e1068407462cf51a44b2dc14dd34..53caba20ec85e30c2a7ce813f79b868166d90480 100644
--- a/dumux/freeflow/shallowwater/problem.hh
+++ b/dumux/freeflow/shallowwater/problem.hh
@@ -32,7 +32,7 @@ namespace Dumux {
/*!
* \ingroup ShallowWaterModel
- * \brief ShallowWater problem base class.
+ * \brief Shallow water problem base class.
*/
template<class TypeTag>
class ShallowWaterProblem : public FVProblem<TypeTag>
diff --git a/test/freeflow/shallowwater/dambreak/main.cc b/test/freeflow/shallowwater/dambreak/main.cc
index dfc934da7afa9f1bc02199b68814e7824871c42f..b53701e1ff07c76fde8e39d9d44bc2aea04280b7 100644
--- a/test/freeflow/shallowwater/dambreak/main.cc
+++ b/test/freeflow/shallowwater/dambreak/main.cc
@@ -18,8 +18,8 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWaterTest
- * \brief Test for the shallow water model (wet dam break).
+ * \ingroup ShallowWaterTests
+ * \brief A test for the shallow water model (wet dam break).
*/
#include <config.h>
diff --git a/test/freeflow/shallowwater/dambreak/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh
index 58088fecbf8529415875225e888e47f131d22cc1..3bc779c8d8aa85bb4a2c68556db8fdf09bd25259 100644
--- a/test/freeflow/shallowwater/dambreak/problem.hh
+++ b/test/freeflow/shallowwater/dambreak/problem.hh
@@ -18,8 +18,8 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWaterTest
- * \brief Test for the Shallow water model (wet dam break).
+ * \ingroup ShallowWaterTests
+ * \brief A test for the Shallow water model (wet dam break).
*/
#ifndef DUMUX_DAM_BREAK_TEST_PROBLEM_HH
#define DUMUX_DAM_BREAK_TEST_PROBLEM_HH
diff --git a/test/freeflow/shallowwater/dambreak/spatialparams.hh b/test/freeflow/shallowwater/dambreak/spatialparams.hh
index 348d10915f7d0b4d023e46f65cde904f85cb94cc..c5c32c5440beaa9122c81abb34b2b8e27af62793 100644
--- a/test/freeflow/shallowwater/dambreak/spatialparams.hh
+++ b/test/freeflow/shallowwater/dambreak/spatialparams.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
- * \ingroup ShallowWaterTest
+ * \ingroup ShallowWaterTests
* \brief The spatial parameters for the dam break problem.
*/
#ifndef DUMUX_DAM_BREAK_SPATIAL_PARAMETERS_HH