From f57bf951d2bbd6589ed23b9776ffe63a7224ba0d Mon Sep 17 00:00:00 2001
From: Natalie Schroeder <natalies.schroeder@iws.uni-stuttgart.de>
Date: Tue, 23 Sep 2014 12:26:45 +0000
Subject: [PATCH] Log: [dim vs dimWorld]
changing dim-matrices to dimWorld-matrices, needed for dim!=dimWorld grids (dispersive fluxes)
reviewed by A.Kissinger
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13393 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/1p2c/1p2cfluxvariables.hh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dumux/implicit/1p2c/1p2cfluxvariables.hh b/dumux/implicit/1p2c/1p2cfluxvariables.hh
index 8256f2d918..c997cbcf2e 100644
--- a/dumux/implicit/1p2c/1p2cfluxvariables.hh
+++ b/dumux/implicit/1p2c/1p2cfluxvariables.hh
@@ -72,6 +72,7 @@ class OnePTwoCFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
+ typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimWorldMatrix;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
@@ -149,13 +150,13 @@ public:
/*!
* \brief Return the intrinsic permeability tensor \f$\mathrm{[m^2]}\f$.
*/
- const DimMatrix &intrinsicPermeability() const
+ const DimWorldMatrix &intrinsicPermeability() const
{ return K_; }
/*!
* \brief Return the dispersion tensor \f$\mathrm{[m^2/s]}\f$.
*/
- const DimMatrix &dispersionTensor() const
+ const DimWorldMatrix &dispersionTensor() const
{ return dispersionTensor_; }
/*!
@@ -521,10 +522,10 @@ protected:
Scalar porousDiffCoeff_;
//! the dispersion tensor in the porous medium
- DimMatrix dispersionTensor_;
+ DimWorldMatrix dispersionTensor_;
//! the intrinsic permeability tensor
- DimMatrix K_;
+ DimWorldMatrix K_;
// intrinsic permeability times pressure potential gradient
GlobalPosition Kmvp_;
// projected on the face normal
--
GitLab