From 12d1c1af4fa46419352cac4dd44efcf3db40c101 Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <benjamin.faigle@posteo.de>
Date: Mon, 20 Feb 2012 16:32:22 +0000
Subject: [PATCH] git-svn-id:
svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7831
2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p2c/2p2cproblem.hh | 13 ++++++++-----
dumux/decoupled/2p2c/fvpressure2p2c.hh | 2 +-
.../decoupled/2p2c/fvpressurecompositional.hh | 2 +-
dumux/decoupled/2p2c/fvtransport2p2c.hh | 4 ++--
.../2p2c/fvtransport2p2cmultiphysics.hh | 18 +++---------------
5 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index 14e24c622a..d7f7dbee9a 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -39,7 +39,7 @@ namespace Dumux
* \brief Base class for all compositional 2-phase problems which use an impet algorithm
*
* Extends IMPESProblem2P by the compositional the boundary formulation and initial conditions.
- * These can be specified via a feed mass fractions \f{ Z^k \f} or a saturation, specified by
+ * These can be specified via a feed mass fractions \f$ Z^k \f$ or a saturation, specified by
* the appropriate flag.
*/
template<class TypeTag>
@@ -69,7 +69,7 @@ class IMPETProblem2P2C : public IMPESProblem2P<TypeTag>
public:
/*!
- * \brief The constructor
+ * \brief The standard constructor
*
* \param timeManager The time manager
* \param gridView The grid view
@@ -78,7 +78,10 @@ public:
: ParentType(timeManager, gridView)
{ }
/*!
- * \brief The constructor
+ * \brief The constructor for a given spatialParameters
+ *
+ * This constructor uses a predefined SpatialParameters object that was created (e.g. in
+ * the problem) and does not create one in the base class.
*
* \param timeManager The time manager
* \param gridView The grid view
@@ -89,7 +92,7 @@ public:
{ }
/*!
- * \brief The constructor
+ * \brief The deprecated constructor without the time manager
*
* \param gridView The grid view
* \param verbose Output flag for the time manager.
@@ -99,7 +102,7 @@ public:
: ParentType(gridView, verbose)
{ }
/*!
- * \brief The constructor
+ * \brief The deprecated constructor without the time manager
*
* \param gridView The grid view
* \param spatialParameters SpatialParameters instantiation
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 8504c88bb4..9f3efbfe5d 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -195,7 +195,7 @@ protected:
/** for first == true, a source is implemented as in FVPressure2P.
* for first == false, the source is translated into a volumentric source term:
* \f[ V_i \sum_{\kappa} \frac{\partial v_{t}}{\partial C^{\kappa}} q^{\kappa}_i \f].
- * \param storageEntry The Matrix and RHS entries
+ * \param sourceEntry The Matrix and RHS entries
* \param elementI The element I
* \param cellDataI Data of cell I
* \param first Flag if pressure field is unknown
diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh
index d3d03aa7f6..883dee7680 100644
--- a/dumux/decoupled/2p2c/fvpressurecompositional.hh
+++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh
@@ -603,7 +603,7 @@ void FVPressureCompositional<TypeTag>::initialMaterialLaws(bool compositional)
* \f$ \frac{\partial v}{\partial C^{\kappa}} = \frac{\partial V}{\partial m^{\kappa}}\f$
*
* \param globalPos The global position of the current element
- * \param ep A pointer to the current element
+ * \param element The current element
*/
template<class TypeTag>
void FVPressureCompositional<TypeTag>::volumeDerivatives(const GlobalPosition& globalPos, const Element& element)
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index f73f1687eb..a36c9de804 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -168,7 +168,7 @@ public:
return totalConcentration_;
}
//! \copydoc transportedQuantity()
- void getTransportedQuantity(TransportSolutionType& transportedQuantity) DUNE_DEPRECATED
+ void getTransportedQuantity(TransportSolutionType& transportedQuantity)
{
transportedQuantity = totalConcentration_;
}
@@ -241,7 +241,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt,
// Cell which restricts time step size
int restrictingCell = -1;
- Dune::FieldVector<Scalar, 2> entries(0.), timestepFlux(0.);
+ PhaseVector entries(0.), timestepFlux(0.);
// compute update vector
ElementIterator eItEnd = problem().gridView().template end<0> ();
for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 6f5f9d5205..04dc3957c3 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -77,10 +77,6 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
- pglobal = Indices::pressureGlobal,
- vw = Indices::velocityW,
- vn = Indices::velocityNW,
- vt = Indices::velocityTotal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW
};
@@ -169,21 +165,13 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
{
- // handle interior face
+ /****** interior face *****************/
if (isIt->neighbor())
- {
this->getFlux(entries, timestepFlux, *isIt, cellDataI);
- }
- /******************************************
- * Boundary Face
- ******************************************/
+ /****** Boundary Face *****************/
if (isIt->boundary())
- {
this->getFluxOnBoundary(entries, timestepFlux, *isIt, cellDataI);
- }
- if(isnan(entries[0]) or isinf(entries[0]) or isnan(entries[1]) or isinf(entries[1]))
- std::cout << "args!!!";
// add to update vector
updateVec[wCompIdx][globalIdxI] += entries[wCompIdx];
@@ -201,7 +189,7 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
updateVec[wCompIdx][globalIdxI] += q[Indices::contiWEqIdx];
updateVec[nCompIdx][globalIdxI] += q[Indices::contiNEqIdx];
- // account for porosity
+ // account for porosity in fluxes for time-step
sumfactorin = std::max(sumfactorin,sumfactorout)
/ problem().spatialParameters().porosity(*eIt);
--
GitLab