From d9f70d635ae59b50d3e2719cb603629d6e1cc95a Mon Sep 17 00:00:00 2001 From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de> Date: Wed, 2 Oct 2013 14:35:08 +0000 Subject: [PATCH] Added doxygen docu and cleared some white space git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11608 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- .../2p/diffusion/fv/fvpressure2padaptive.hh | 70 +++++++++++-------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh index f23817b2f5..6eeaa8ae68 100644 --- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh +++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh @@ -25,8 +25,8 @@ #include <dumux/decoupled/common/fv/fvvelocity.hh> /** - * @file - * @brief Finite Volume discretization of a two-phase flow pressure equation. + * \file + * \brief Finite Volume discretization of a two-phase flow pressure equation. */ namespace Dumux @@ -37,6 +37,7 @@ namespace Dumux * * Details see FVPressure2P * + * \tparam TypeTag The Type Tag */ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag> { @@ -91,7 +92,10 @@ public: // Function which calculates the flux entry void getFlux(EntryType&, const Intersection&, const CellData&, const bool); - //!Initialize + /*! \brief Initializes the adaptive pressure model + * + * \copydetails FVPressure2P::initialize() + */ void initialize() { ParentType::initialize(); @@ -127,50 +131,56 @@ public: // update RHS vector, matrix if (problem_.gridAdapt().wasAdapted()) { - this->A_.setSize(gridSize, gridSize); // - this->f_.resize(gridSize); - this->pressure().resize(gridSize); - - - for (int i = 0; i < gridSize; i++) - { - CellData& cellData = problem_.variables().cellData(i); - - switch (pressureType_) - { - case pw: - this->pressure()[i] = cellData.pressure(wPhaseIdx); - break; - case pn: - this->pressure()[i] = cellData.pressure(nPhaseIdx); - break; - case pGlobal: - this->pressure()[i] = cellData.globalPressure(); - break; - } + this->A_.setSize(gridSize, gridSize); // + this->f_.resize(gridSize); + this->pressure().resize(gridSize); + + + for (int i = 0; i < gridSize; i++) + { + CellData& cellData = problem_.variables().cellData(i); + + switch (pressureType_) + { + case pw: + this->pressure()[i] = cellData.pressure(wPhaseIdx); + break; + case pn: + this->pressure()[i] = cellData.pressure(nPhaseIdx); + break; + case pGlobal: + this->pressure()[i] = cellData.globalPressure(); + break; + } + } + + ParentType::initializeMatrix(); } - ParentType::initializeMatrix(); - } - ParentType::update(); - calculateVelocity(); + calculateVelocity(); return; } + /*! \brief Velocity calculation + * + */ void calculateVelocity() { - velocity_.calculateVelocity(); + velocity_.calculateVelocity(); } + /*! \brief Velocity update + * + */ void updateVelocity() { ParentType::updateVelocity(); - calculateVelocity(); + calculateVelocity(); } /*! \brief Adds pressure output to the output file -- GitLab