diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh index ad7f3a555081ecf1d7c8611c043229e3774ac552..8786ec38a0aed89492f6bafe65ba9349e10c5293 100644 --- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh +++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh @@ -112,7 +112,7 @@ public: /*! \brief Initializes the pressure model * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() * * \param solveTwice indicates if more than one iteration is allowed to get an initial pressure solution */ @@ -132,7 +132,7 @@ public: /*! \brief Pressure update * - * \copydetails ParentType::update() + * \copydetails FVPressure::update() * */ void update() diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressurevelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressurevelocity1p.hh index 215bb357085516ad95edea5c550c86e27453f344..d1411fc0f98186fc93fc23787f6f36a3773577b5 100644 --- a/dumux/decoupled/1p/diffusion/fv/fvpressurevelocity1p.hh +++ b/dumux/decoupled/1p/diffusion/fv/fvpressurevelocity1p.hh @@ -59,7 +59,7 @@ template<class TypeTag> class FVPressureVelocity1P: public FVPressure1P<TypeTag> public: /*! \brief Initializes the pressure model * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize() { @@ -69,7 +69,7 @@ public: /*! \brief Pressure update * - * \copydetails ParentType::update() + * \copydetails FVPressure::update() * */ void update() diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh index 15c28b39716062b698a6e2867e3adbdda231d656..1751ced59e95f2c6c482db5e8e17ffea2f68fc82 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh @@ -240,8 +240,7 @@ public: /*! \brief Pressure update * - * \copydetails ParentType::update() - * + * \copydetails FVPressure::update() */ void update() { diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh index a23a33afd21610722ed1bd76b1a41d02fad45ffc..aabcab61a0716f51ed8b47c44111cf51ccf46a67 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh @@ -120,7 +120,7 @@ public: /*! \brief Pressure update * - * \copydetails FVPressure2P::update() + * \copydetails FVPressure::update() * * The grid-adaptive implementation also reconstructs the velocity directly after the pressure update. * This is necessary to make sure the hanging nodes are treated correctly! diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh index a87b7d830790942d62d19ecea1ba9f7f933fc726..2d0e43fd64768af3c1e224f5fe2a75069451d628 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh @@ -186,7 +186,7 @@ public: /*! \brief Initializes the pressure model * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize() { @@ -285,7 +285,7 @@ public: /*! \brief Pressure update * - * \copydetails ParentType::update() + * \copydetails FVPressure::update() * */ void update() diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh index 3d2787d79830d51561240b242ee10fc653fae5e5..fb5076f9c9ee71b17490d5feb1b3acfbc8d871f1 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh @@ -133,7 +133,7 @@ public: /*! \brief Initializes pressure and velocity * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize() { @@ -159,7 +159,7 @@ public: /*! \brief Pressure and velocity update * - * \copydetails ParentType::update() + * \copydetails FVPressure::update() * */ void update() diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh index f392a6959599a11d17c283ea0972f2f0961e9dda..97e7247d5dfd56cf0be64c6cce378785561642dc 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh @@ -143,7 +143,7 @@ public: /*! \brief Initializes pressure and velocity * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize() { @@ -169,7 +169,7 @@ public: /*! \brief Pressure and velocity update * - * \copydetails ParentType::update() + * \copydetails FVPressure::update() * */ void update() diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh index 4a9a92fc8cd0b2de759b4f30145c9dee72e51927..9b98243fe80bf4a901d2c2dca0f450f4a8560cb6 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh @@ -176,7 +176,7 @@ public: /*! \brief Initializes the pressure model * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize(bool solveTwice = true) { @@ -269,8 +269,7 @@ public: /*! \brief Pressure update * - * \copydetails ParentType::update() - * + * \copydetails FVPressure::update() */ void update() { diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh index 75e2e3149d985a0a53d45614a5895fd264612dbc..c16a3b4764b9b0433979055cd817e7fb91765ff7 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh @@ -128,7 +128,7 @@ public: /*! \brief Initializes pressure and velocity * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize(bool solveTwice = true) { @@ -155,8 +155,7 @@ public: /*! \brief Pressure and velocity update * - * \copydetails ParentType::update() - * + * \copydetails FVPressure::update() */ void update() { diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh index 3cbb42436a2b317753f5210a93028e11e4c9e4ea..d53618e429a3efe6031381e1e0d08baffd2049bc 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh @@ -170,8 +170,7 @@ public: /*! \brief Initializes the pressure model * - * \copydetails ParentType::initialize() - * + * \copydetails FVPressure::initialize() */ void initialize() { @@ -206,8 +205,7 @@ public: /*! \brief Pressure update * - * \copydetails ParentType::update() - * + * \copydetails FVPressure::update() */ void update() { diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh index 16b53da3864f44d8794a14b74c6ef037484a6fa7..66973867e83a0d636a050bf0990a6f6c69c89849 100644 --- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh +++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh @@ -134,7 +134,7 @@ public: /*! \brief Initializes pressure and velocity * - * \copydetails ParentType::initialize() + * \copydetails FVPressure::initialize() */ void initialize() { @@ -160,8 +160,7 @@ public: /*! \brief Pressure and velocity update * - * \copydetails ParentType::update() - * + * \copydetails FVPressure::update() */ void update() { diff --git a/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh b/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh index d1750c6042eff6f947b3fd3e3d573a459630c5f6..26e6678a4aff7125b127ae035da10ff775dabcd7 100644 --- a/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh +++ b/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh @@ -32,8 +32,8 @@ namespace Dumux { -//! \ingroup Adaptive2p2c mpfa -/*! \brief Interactionvolume container for compositional adaptive 3-d (using MPFA L-method) Model +/*! \ingroup Adaptive2p2c mpfa + * \brief Interactionvolume container for compositional adaptive 3-d (using MPFA L-method) Model * * Container class which stores MPFA-interaction-volume information for each vertex of a DUNE grid. * diff --git a/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh b/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh index 626dbd6a61d0a77ff836fa8ecf315c0aa8df0dd6..ea2cbc991ae6ef64a9bd4ed3823e5ebb8910123b 100644 --- a/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh +++ b/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh @@ -583,13 +583,14 @@ public: + (1.-massUpwindWeight_) * transportedThingDn ) ; } + /*! \brief The heat conduction in the phase - * - * \param flux The flux over the SCV (sub-control-volume) face for each component - * \param fluxVars The flux Variables - * \param elemVolVars The volume variables of the current element - * \param phaseIdx The local index of the phases - */ + * + * \param flux The flux over the SCV (sub-control-volume) face for each component + * \param fluxVars The flux Variables + * \param elemVolVars The volume variables of the current element + * \param energyEqIdx The index of the phase energy equation + */ static void computeHeatConduction(PrimaryVariables & flux, const FluxVariables & fluxVars, const ElementVolumeVariables & elemVolVars, diff --git a/dumux/linear/amgparallelhelpers.hh b/dumux/linear/amgparallelhelpers.hh index 4d720b4e6478a15ee2475ffde1c428be8726cf05..fe9ddcfcf28108546b215ba866639d0c04f7c26d 100644 --- a/dumux/linear/amgparallelhelpers.hh +++ b/dumux/linear/amgparallelhelpers.hh @@ -499,8 +499,7 @@ class EntityExchanger public: /*! \brief Constructor. Sets up the local to global relations. - - \param[in] gridView The grid view to operate on. + \param[in] problem The problem to be solved. */ EntityExchanger(const Problem& problem) : problem_(problem) @@ -633,7 +632,7 @@ public: } /** @brief Constructor - @param[in] gridView Grid view. + @param[in] problem The problem to be solved. @param[in] g2i Global to local index map. @param[in] i2g Local to global index map. @param[in] A Matrix to operate on. @@ -739,7 +738,7 @@ public: } /** @brief Constructor - @param[in] gridView Grid view. + @param[in] problem The problem to be solved. @param[in] g2i Global to local index map. @param[in] i2g Local to global index map. @param[in] A Matrix to operate on. diff --git a/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh b/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh index 519728047275cd3c610f8175bc80a20d69dbb6be..9c9b28a8fe21d50edc10c37bb865f1c30088ba06 100644 --- a/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh +++ b/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh @@ -55,6 +55,7 @@ public: /*! * \brief The capillary pressure-saturation curve. * + * \param params Array of parameters * \param Sw Effective saturation of of the wetting phase \f$\overline{S}_w\f$ */ static Scalar pc(const Params ¶ms, Scalar Sw) @@ -118,6 +119,7 @@ public: /*! * \brief The relative permeability for the wetting phase. * + * \param params Array of parameters * \param Sw The mobile saturation of the wetting phase. */ static Scalar krw(const Params ¶ms, Scalar Sw) @@ -128,6 +130,7 @@ public: /*! * \brief The relative permeability for the non-wetting phase. * + * \param params Array of parameters * \param Sw The mobile saturation of the wetting phase. */ static Scalar krn(const Params ¶ms, Scalar Sw)