diff --git a/doc/doxygen/modules.txt b/doc/doxygen/modules.txt index 11a3cc1fae44be0faf5da24e28ec75cfb68d7e71..b2528a33987280e3a5abf76bfdee1fc6d288bb28 100644 --- a/doc/doxygen/modules.txt +++ b/doc/doxygen/modules.txt @@ -66,6 +66,12 @@ * * \copydetails Dumux::TwoPOneCModel */ + /*! + * \ingroup Porousmediaflow + * \defgroup TwoPOneCModel 2p1c (two-phase, one-component Darcy flow) + * + * \copydetails Dumux::TwoPTwoCModel + */ /*! * \ingroup Porousmediaflow * \defgroup TwoPTwoCModels 2p2c (two-phase, two-component Darcy flow) @@ -439,7 +445,7 @@ /*! * \ingroup Material * \defgroup Fluidsystems Fluid Systems - * Fluid systems express the thermodynamic relations + * Fluid systems express the thermodynamic relations * Strictly speaking, these relations are * functions, mathematically.} between quantities. Since functions do * not exhibit any internal state, fluid systems are stateless classes, diff --git a/dumux/linear/scotchbackend.hh b/dumux/linear/scotchbackend.hh index 9121848cdf3234fa5dce79a85b238f4aa299c511..4cea13d99b4bd6b5b8a6791931a329eeb35bcbd5 100644 --- a/dumux/linear/scotchbackend.hh +++ b/dumux/linear/scotchbackend.hh @@ -18,7 +18,6 @@ *****************************************************************************/ /*! - * \file * \brief An interface to the scotch library for matrix reordering * \note This is adapted from the FEniCS implementation of the scotch interface */ diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh index cfc2b6f90d4f6300814e62ace0c427cc60e07222..d1d64e2a74a74f8c129747e1c6b60d45aa226eeb 100644 --- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh +++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh @@ -151,6 +151,19 @@ public: return BrooksCorey::sw(params, pc); } + /*! + * \brief The old function for a regularized version of the partial derivative + * of the \f$\mathrm{p_c(\overline{S}_w)}\f$ w.r.t. effective saturation + * according to Brooks & Corey. + *\param params parameters + *\param swe effective saturation + */ + DUNE_DEPRECATED_MSG("dpc_dsw(const Params ¶ms, Scalar swe) is deprecated. Use dpc_dswe(const Params ¶ms, Scalar swe) instead.") + static Scalar dpc_dsw(const Params ¶ms, Scalar swe) + { + DUNE_THROW(Dune::InvalidStateException, "dpc_dsw(const Params ¶ms, Scalar swe) is deprecated. Use dpc_dswe(const Params ¶ms, Scalar swe) instead."); + } + /*! * \brief A regularized version of the partial derivative * of the \f$\mathrm{p_c(\overline{S}_w)}\f$ w.r.t. effective saturation @@ -184,6 +197,23 @@ public: return BrooksCorey::dpc_dswe(params, swe); } + /*! + * \brief The old function for a regularized version of the partial derivative + * of the \f$\mathrm{\overline{S}_w(p_c)}\f$ w.r.t. cap.pressure + * according to Brooks & Corey. + * + * \param params parameters + * \param pc capilary pressure + * + * + * + */ + DUNE_DEPRECATED_MSG("dsw_dpc(const Params ¶ms, Scalar pc) is deprecated. Use dswe_dpc(const Params ¶ms, Scalar pc) instead.") + static Scalar dsw_dpc(const Params ¶ms, Scalar pc) + { + DUNE_THROW(Dune::InvalidStateException, "dsw_dpc(const Params ¶ms, Scalar pc) is deprecated. Use dswe_dpc(const Params ¶ms, Scalar pc) instead."); + } + /*! * \brief A regularized version of the partial derivative * of the \f$\mathrm{\overline{S}_w(p_c)}\f$ w.r.t. cap.pressure diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh index 30bf0d7c79110bc3f23aeb83bec4c80159be1c4d..8060658bfab8a15773130bc1d1bcdab6d5f44b22 100644 --- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh +++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh @@ -187,6 +187,19 @@ public: return sw; } + /*! + * \brief The old function for a regularized version of the partial derivative + * of the \f$\mathrm{p_c(\overline{S}_w)}\f$ w.r.t. effective saturation + * according to van Genuchten. + *\param params parameters + *\param swe effective saturation + */ + DUNE_DEPRECATED_MSG("dpc_dsw(const Params ¶ms, Scalar swe) is deprecated. Use dpc_dswe(const Params ¶ms, Scalar swe) instead.") + static Scalar dpc_dsw(const Params ¶ms, Scalar swe) + { + DUNE_THROW(Dune::InvalidStateException, "dpc_dsw(const Params ¶ms, Scalar swe) is deprecated. Use dpc_dswe(const Params ¶ms, Scalar swe) instead."); + } + /*! * \brief A regularized version of the partial derivative * of the \f$\mathrm{p_c(\overline{S}_w)}\f$ w.r.t. effective saturation @@ -217,18 +230,31 @@ public: return VanGenuchten::dpc_dswe(params, swe); } + /*! - * \brief A regularized version of the partial derivative - * of the \f$\mathrm{\overline{S}_w(p_c)}\f$ w.r.t. cap.pressure - * according to van Genuchten. - * - * regularized part: - * - low saturation: use the slope of the regularization point (i.e. no kink). - * - high saturation: connect the high regularization point with \f$\mathrm{\overline{S}_w =1}\f$ - * by a straight line and use that slope (yes, there is a kink :-( ). - * - * For not-regularized part: - \copydetails VanGenuchten::dswe_dpc() + * \brief The old function for a regularized version of the partial derivative + *of the \f$\mathrm{\overline{S}_w(p_c)}\f$ w.r.t. cap.pressure + *according to van Genuchten. + *\param params parameters + *\param pc capilary pressure + */ + DUNE_DEPRECATED_MSG("dsw_dpc(const Params ¶ms, Scalar pc) is deprecated. Use dswe_dpc(const Params ¶ms, Scalar pc) instead.") + static Scalar dsw_dpc(const Params ¶ms, Scalar pc) + { + DUNE_THROW(Dune::InvalidStateException,"dsw_dpc(const Params ¶ms, Scalar pc) is deprecated. Use dswe_dpc(const Params ¶ms, Scalar pc) instead."); + } + + + /*! + *\brief A regularized version of the partial derivative + *of the \f$\mathrm{\overline{S}_w(p_c)}\f$ w.r.t. cap.pressure + *according to van Genuchten. + *regularized part: + *- low saturation: use the slope of the regularization point (i.e. no kink). + *- high saturation: connect the high regularization point with \f$\mathrm{\overline{S}_w =1}\f$ + *by a straight line and use that slope (yes, there is a kink :-( ). + *For not-regularized part: + *\copydetails VanGenuchten::dswe_dpc() */ static Scalar dswe_dpc(const Params ¶ms, Scalar pc) { diff --git a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh index 1ffc3138475f9039d468e77cc37e17e11093226c..29086bd30e72a96c571b2ef367350f9ccd1be666 100644 --- a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh +++ b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh @@ -52,10 +52,10 @@ public: * \brief effective permeability tensor \f$\mathrm{[m^{2})]}\f$ after Rutqvist and Tsang (2002) \cite rutqvist2002
* * \param volVars volume variables - * \param fluxVars flux variables * \param spatialParams spatial parameters * \param element element (to be passed to spatialParams) * \param fvGeometry fvGeometry (to be passed to spatialParams) + * \param scvIdx control volumne * * \return effective permeability tensor \f$\mathrm{[m^{2})]}\f$ after Rutqvist and Tsang (2002) \cite rutqvist2002
* diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh index 2fdbdb659d243fdd3eef4ffcf88e694a73877ff8..5f692af98c02907e304e370aa742a79930a88200 100644 --- a/dumux/material/fluidsystems/brineair.hh +++ b/dumux/material/fluidsystems/brineair.hh @@ -348,8 +348,6 @@ public: * density \f$\mathrm{[kg/m^3]}\f$. * * \param phaseIdx index of the phase - * \param temperature phase temperature in \f$\mathrm{[K]}\f$ - * \param pressure phase pressure in \f$\mathrm{[Pa]}\f$ * \param fluidState the fluid state * * Equation given in: diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh index 975978ca790bed921fdc3796f14665c015078745..f20212a9029bf57428f70a61a2b30ff22b801e72 100644 --- a/dumux/material/fluidsystems/brineco2.hh +++ b/dumux/material/fluidsystems/brineco2.hh @@ -36,10 +36,10 @@ #include #include - +#include namespace Dumux { -#include + namespace FluidSystems{ /*! @@ -565,9 +565,7 @@ public: using Base::heatCapacity; /*! - * \copydoc BaseFluidSystem::heatCapacity - * - * \note We employ the heat capacity of the pure phases. + * \brief Heat capacity of the pure phases. * * \todo Implement heat capacity for gaseous CO2 * diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh index 4b5a02877b224350463215e5481eca07abed8794..ae0ea87d68750fa6edb168d786e44267f7666eeb 100644 --- a/dumux/material/fluidsystems/gasphase.hh +++ b/dumux/material/fluidsystems/gasphase.hh @@ -19,7 +19,7 @@ /*! * \file * - * \brief @copybrief Dumux::FluidSystems::GasPhase + * \brief A gaseous phase consisting of a single component */ #ifndef DUMUX_GAS_PHASE_HH #define DUMUX_GAS_PHASE_HH @@ -238,7 +238,10 @@ public: using Base::fugacityCoefficient; /*! - * \copydoc Base::fugacityCoefficient + *\brief Fugacity Coefficient + *\param fluidState flid state of the system + *\param phaseIdx The index of the fluid phase to consider + *\param compIdx The index of the component to consider */ template static Scalar fugacityCoefficient(const FluidState &fluidState, @@ -259,7 +262,10 @@ public: using Base::diffusionCoefficient; /*! - * \copydoc Base::diffusionCoefficient + *\brief Diffusion Coefficient + *\param fluidState flid state of the system + *\param phaseIdx The index of the fluid phase to consider + *\param compIdx The index of the component to consider */ template static Scalar diffusionCoefficient(const FluidState &fluidState, @@ -271,7 +277,11 @@ public: using Base::binaryDiffusionCoefficient; /*! - * \copydoc Base::binaryDiffusionCoefficient + *\brief Binary Diffusion Coefficient + *\param fluidState flid state of the system + *\param phaseIdx The index of the fluid phase to consider + *\param compIIdx The index of the component to consider + *\param compJIdx The index of the component to consider */ template static Scalar binaryDiffusionCoefficient(const FluidState &fluidState, diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh index 519c82341e61aea808a5844e815e3f5dfbe00a25..548c59a0008f9f67115cb58405e2ceb196bd13a6 100644 --- a/dumux/material/fluidsystems/h2oair.hh +++ b/dumux/material/fluidsystems/h2oair.hh @@ -385,8 +385,6 @@ public: * for the liquid density. * * \param phaseIdx index of the phase - * \param temperature phase temperature in \f$\mathrm{[K]}\f$ - * \param pressure phase pressure in \f$\mathrm{[Pa]}\f$ * \param fluidState the fluid state * */ @@ -445,7 +443,7 @@ public: * \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$ * * Compositional effects in the gas phase are accounted by the Wilke method. - * See \cite reid1987R Reid, et al.: The Properties of Gases and Liquids, + * See Reid 1987, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 * 5th edition, McGraw-Hill, 20001, p. 9.21/22 * \note Compositional effects for a liquid mixture have to be implemented. @@ -744,7 +742,7 @@ public: * \todo Check whether the gas phase enthalpy is a linear mixture of the component * enthalpies and the mole fractions is a good assumption. * - * \param params mutable parameters + * \param fluidState mutable parameters * \param phaseIdx for which phase to give back the heat capacity */ template diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh index ab29179313506708a30878ae8b043a11c4f2cfbc..a91156a35ae1236f45b1e150a0c083e6b46ea63e 100644 --- a/dumux/material/fluidsystems/h2on2.hh +++ b/dumux/material/fluidsystems/h2on2.hh @@ -401,7 +401,7 @@ public: * \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$ * * Compositional effects in the gas phase are accounted by the Wilke method. - * See \cite reid1987R Reid, et al.: The Properties of Gases and Liquids, + * See Reid 1987, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 * 5th edition, McGraw-Hill, 20001, p. 9.21/22 * \note Compositional effects for a liquid mixture have to be implemented. diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh index 28eab1ecd302485bba4490bcfb583d6c9ff1a678..d715967b9ea7c1d19bbb6ae3894e7a9b4558fe4d 100644 --- a/dumux/material/fluidsystems/h2on2o2.hh +++ b/dumux/material/fluidsystems/h2on2o2.hh @@ -472,7 +472,7 @@ public: * \brief Calculate the dynamic viscosity of a fluid phase \f$\mathrm{[Pa*s]}\f$ * * Compositional effects in the gas phase are accounted by the Wilke method. - * See \cite reid1987R Reid, et al.: The Properties of Gases and Liquids, + * See Reid 1987, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 * 5th edition, McGraw-Hill, 20001, p. 9.21/22 * \note Compositional effects for a liquid mixture have to be implemented. diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh index b26f42ea4f9b88c68d5b62f27f83e274cf999f33..0ad459450dab738a26e61739de50c3e2027f7fd4 100644 --- a/dumux/material/fluidsystems/liquidphase.hh +++ b/dumux/material/fluidsystems/liquidphase.hh @@ -17,9 +17,7 @@ * along with this program. If not, see . * *****************************************************************************/ /*! - * \file - * - * \brief @copybrief Dumux::FluidSystems::LiquidPhase + * \brief A liquid phase consisting of a single component. */ #ifndef DUMUX_LIQUID_PHASE_HH #define DUMUX_LIQUID_PHASE_HH @@ -226,7 +224,10 @@ public: using Base::fugacityCoefficient; /*! - * \copydoc Base::fugacityCoefficient + *\brief Binary Diffusion Coefficient + *\param fluidState flid state of the system + *\param phaseIdx The index of the fluid phase to consider + *\param compIdx The index of the component to consider */ template static Scalar fugacityCoefficient(const FluidState &fluidState, @@ -247,7 +248,10 @@ public: using Base::diffusionCoefficient; /*! - * \copydoc Base::diffusionCoefficient + *\brief Binary Diffusion Coefficient + *\param fluidState flid state of the system + *\param phaseIdx The index of the fluid phase to consider + *\param compIdx The index of the component to consider */ template static Scalar diffusionCoefficient(const FluidState &fluidState, @@ -259,14 +263,17 @@ public: using Base::binaryDiffusionCoefficient; /*! - * \copydoc Base::binaryDiffusionCoefficient + *\brief Binary Diffusion Coefficient + *\param fluidState flid state of the system + *\param phaseIdx The index of the fluid phase to consider + *\param compIIdx The index of the component to consider + *\param compJIdx The index of the component to consider */ template static Scalar binaryDiffusionCoefficient(const FluidState &fluidState, int phaseIdx, int compIIdx, int compJIdx) - { DUNE_THROW(Dune::InvalidStateException, "Not applicable: Binary diffusion coefficients"); } diff --git a/dumux/material/spatialparams/gstatrandomfield.hh b/dumux/material/spatialparams/gstatrandomfield.hh index 929a5eb06ccf96a98c2a6256a8ba865cada35ef9..fd76f82c54cf23626f0bb6f6177626fce5daddbf 100644 --- a/dumux/material/spatialparams/gstatrandomfield.hh +++ b/dumux/material/spatialparams/gstatrandomfield.hh @@ -61,27 +61,27 @@ public: enum FieldType { scalar, log10 }; /*! - * \brief Constructor. - * - * Creates a new field with random variables, if desired. - * Otherwise creates a data field from already available data. - * - * For the random field generation three files are necessary. - * A \a gstatControlFile in which all commands and in/output files for gstat are specified. - * A \a gstatInputFile contains all coordinates (cell centers) of the grid, so that - * gstat can perform its random realization. The filename must be same as in the gstatControlFile. - * A \a gstatOutputFile in which gstat writes the random values to this file. - * The filename must be the same as in the gstatControlFile. - * + * \brief Constructor * \param gridView the used gridView - * \param gstatControlFile name of control file for gstat - * \param gstatInputFile name of input file for gstat - * \param gstatOutputFile name of the gstat output file - * \param createNew set true to create a new field */ GstatRandomField(const GridView& gridView) : gridView_(gridView), elementMapper_(gridView), data_(gridView.size(0)) {} + /*! + * \brief Creates a new field with random variables, if desired. + * Otherwise creates a data field from already available data. + * For the random field generation three files are necessary. + * A \a gstatControlFile in which all commands and in/output files for gstat are specified. + * A \a gstatInputFile contains all coordinates (cell centers) of the grid, so that + * gstat can perform its random realization. The filename must be same as in the gstatControlFile. + * A \a gstatOutputFile in which gstat writes the random values to this file. + * The filename must be the same as in the gstatControlFile. + * \param fieldType + * \param gstatControlFile name of control file for gstat + * \param gstatInputFile name of input file for gstat + * \param gstatOutputFile name of the gstat output file + * \param createNew set true to create a new field + */ void create(const std::string& gstatControlFile, const std::string& gstatInputFile = "gstatInput.txt", diff --git a/dumux/multidomain/newtoncontroller.hh b/dumux/multidomain/newtoncontroller.hh index e1844c17b068a68db8185ed13687215acc6e092d..d34f68276107cb1d3f976077da054df603ab1207 100644 --- a/dumux/multidomain/newtoncontroller.hh +++ b/dumux/multidomain/newtoncontroller.hh @@ -97,7 +97,11 @@ public: << std::endl; } - //! \copydoc ParentType::newtonUpdateShift() + /*! + * \brief To update Newton controller shift + * \param uLastIter Last iterator + * \param deltaU Delta + */ void newtonUpdateShift(const SolutionVector &uLastIter, const SolutionVector &deltaU) { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh index ca1f97f6fe07a537962ce016aab8f6ba96d2360b..99ef70f4c99a3d08998ce5d47c03b2e86303977a 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh @@ -259,11 +259,15 @@ int FvMpfaL3dTransmissibilityCalculator::chooseTransmissibility(Transmi * \return The type of the chosen L-shape (1-4) */ template -int FvMpfaL3dTransmissibilityCalculator::transmissibility(TransmissibilityType& transmissibility, +int FvMpfaL3dTransmissibilityCalculator::transmissibility(Dune::FieldMatrix& transmissibility, InteractionVolume& interactionVolume, std::vector& lambda, int idx1, int idx2, int idx3, int idx4, int idx5, int idx6) + + + + { int level1 = interactionVolume.getSubVolumeElement(idx1).level(); int level2 = interactionVolume.getSubVolumeElement(idx2).level(); @@ -360,7 +364,7 @@ int FvMpfaL3dTransmissibilityCalculator::transmissibility(Transmissibil * \return The type of the chosen L-shape (1-4) */ template -int FvMpfaL3dTransmissibilityCalculator::transmissibility(TransmissibilityType& transmissibility, +int FvMpfaL3dTransmissibilityCalculator::transmissibility(Dune::FieldMatrix& transmissibility, InteractionVolume& interactionVolume, std::vector& lambda, int idx1, int idx2, int idx3, int idx4, int idx5, diff --git a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh index 7e753c3742263b4ccaf2d88fc538aee218613073..334eb2bc19921c325ea87ab7f93047b4a7972e22 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh @@ -62,7 +62,7 @@ class FvMpfaL3d2P2CInteractionVolumeContainerAdaptive : public FvMpfaL3dInteract typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices; typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes; - typedef typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables PrimaryVariables; + typedef typename GET_PROP_TYPE(TypeTag, SolutionTypes) PrimaryVariables; typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices; diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh index 060b90ce42b72ffaa11e4a1b6b815e768e63cdf4..6b30a986aebb38f220475e8e863b96cf635840f7 100644 --- a/dumux/porousmediumflow/3pwateroil/localresidual.hh +++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh @@ -172,7 +172,7 @@ public: * over a face of a sub-control volume. * * \param flux The flux over the SCV (sub-control-volume) face for each component - * \param faceIdx The index of the SCV face + * \param fIdx The index of the SCV face * \param onBoundary A boolean variable to specify whether the flux variables * are calculated for interior SCV faces or boundary faces, default=false */ diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh index 614fea99c26a71c2f9e91a836d1d54d42dae0a6f..31a95cf05e8644c2aa5672d5395309bb77e4d9cb 100644 --- a/test/geomechanics/el2p/el2pproblem.hh +++ b/test/geomechanics/el2p/el2pproblem.hh @@ -204,10 +204,8 @@ class El2P_TestProblem : public ImplicitPorousMediaProblem public: /*! * \brief The constructor - * * \param timeManager The time manager * \param gridView The grid view - * \param tInitEnd End of initialization period */ El2P_TestProblem(TimeManager &timeManager, const GridView &gridView) diff --git a/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh index ed1d97a03ac94853a9fea3c272a438a9e80eda65..0d1d786be10a081f96247e5418f6a17c8d0d1b15 100644 --- a/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh +++ b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh @@ -126,10 +126,10 @@ public: /*! * \brief Intrinsic permability - * * \param element The current element * \param fvGeometry The current finite volume geometry of the element * \param scvIdx The index of the sub-control volume. + * \param nC Number of component for heterogeneous problems * \return Intrinsic permeability */ Scalar intrinsicPermeability(const Element &element, @@ -144,10 +144,10 @@ public: /*! * \brief Porosity - * * \param element The current element * \param fvGeometry The current finite volume geometry of the element * \param scvIdx The index of the sub-control volume. + * \param nC Number of component for heterogeneous problems * \return Porosity */ Scalar porosity(const Element &element, diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh index 4d9b35d7d42e5e1d6cc06e31ebc68ab0cf479a84..abc63d864ed0e147a41f47d774d30e3c473ca835 100644 --- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh +++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh @@ -267,7 +267,7 @@ public: * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment. * - * \param values The boundary types for the conservation equations + * \param bcTypes The boundary types for the conservation equations * \param globalPos The position for which the bc type should be evaluated */ void boundaryTypesAtPos(BoundaryTypes &bcTypes, @@ -307,14 +307,13 @@ public: /*! * \brief Evaluate the boundary conditions for a neumann * boundary segment. - * * \param values The neumann values for the conservation equations * \param element The finite element - * \param fvGeomtry The finite-volume geometry in the box scheme + * \param fvGeometry The finite-volume geometry in the box scheme * \param is The intersection between element and boundary * \param scvIdx The local vertex index * \param boundaryFaceIdx The index of the boundary face - * + * \param elemVolVars Element volume variables * For this method, the \a values parameter stores the mass flux * in normal direction of each phase. Negative values mean influx. */