From 3ad0eb03cfdf75b7b07056a15f2ea03e9e7425c6 Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <benjamin.faigle@posteo.de>
Date: Fri, 28 Feb 2014 16:41:20 +0000
Subject: [PATCH] Removed remaining doxygen errors from decoupled 2p2c model.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12556 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p2c/fvtransport2p2c.hh | 2 +-
.../2p2c/variableclass2p2cadaptive.hh | 1 -
test/decoupled/2p2c/test_adaptive2p2c2d.cc | 18 +++++++-----------
.../2p2c/test_adaptive2p2c2dproblem.hh | 3 ++-
test/decoupled/2p2c/test_dec2p2cproblem.hh | 6 ++----
5 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index 7271d78a85..3549afb882 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -332,7 +332,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! @copydoc Dumux::IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
};
diff --git a/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh b/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
index a929880225..8774b64b41 100644
--- a/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
@@ -446,7 +446,6 @@ public:
* If we arrive from the "wrong" (i.e. non-unique) direction, we invert fluxes.
*
* \param irregularIs The current irregular intersection
- * \param secondHalfEdgeIntersectionIt Iterator to the intersection connecting the second interaction region
* \param T1 Transmissitivity matrix for flux calculations: unique interaction region
* \param globalPos3 The position of the 3rd cell of the first interaction region
* \param globalIdx3 The index of the 3rd cell of the first interaction region
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2d.cc b/test/decoupled/2p2c/test_adaptive2p2c2d.cc
index 6844effc98..c26872a475 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2d.cc
+++ b/test/decoupled/2p2c/test_adaptive2p2c2d.cc
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief Test for the adaptive 2p2c model
+ * \brief Test for the adaptive 2p2c model in 2d
*/
#include "config.h"
@@ -42,16 +42,12 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += " [options]\n";
errorMessageOut += errorMsg;
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
- "\n";
-
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.NumberOfCellsX Resolution in x-direction [-]\n"
+ "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n"
+ "\t-Grid.UpperRightX Length of the domain [m]\n"
+ "\t-Grid.UpperRightY Height of the domain [m]\n";
std::cout << errorMessageOut
<< "\n";
}
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh b/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
index 168dd356eb..57f6f14412 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
+++ b/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief Test problem for the adaptive sequential 2p2c model
+ * \brief Test problem for the adaptive sequential 2p2c model in 2D
*/
#ifndef DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
#define DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
@@ -205,6 +205,7 @@ Adaptive2p2c2d(TimeManager &timeManager, const GridView& gridView) :
*/
// \{
+//! @copydoc Dumux::TestDecTwoPTwoCProblem::shouldWriteRestartFile()
bool shouldWriteRestartFile() const
{
return false;
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index ecab27bf44..4a8939f34d 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -268,8 +268,7 @@ void dirichletAtPos(PrimaryVariables &bcValues ,const GlobalPosition& globalPos)
*/
void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalPos) const
{
- neumannValues[Indices::contiNEqIdx] =0.;
- neumannValues[Indices::contiWEqIdx] =0.;
+ this->setZero(neumannValues);
// if (globalPos[1] < 15 && globalPos[1]> 5)
// {
// neumannValues[Indices::contiNEqIdx] = -0.015;
@@ -288,8 +287,7 @@ void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalP
*/
void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos) const
{
- sourceValues[Indices::contiWEqIdx]=0.;
- sourceValues[Indices::contiNEqIdx]=0.;
+ this->setZero(sourceValues);
if (fabs(globalPos[0] - 4.8) < 0.5 && fabs(globalPos[1] - 4.8) < 0.5)
sourceValues[Indices::contiNEqIdx] = 0.0001;
}
--
GitLab