From bc8bee4dd844b172da9eb40bf44262559afbb568 Mon Sep 17 00:00:00 2001
From: Klaus Mosthaf <klmos@env.dtu.dk>
Date: Tue, 22 Jan 2013 07:32:03 +0000
Subject: [PATCH] Fixed make headercheck and corrected some whitespaces
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10052 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/2p2cni/2p2cnifluxvariables.hh | 28 ++++++-------
dumux/implicit/2pni/2pnifluxvariables.hh | 43 +++++++++++---------
2 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
index 9067622d04..e80056e1ef 100644
--- a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
@@ -30,6 +30,7 @@
#include <dumux/common/math.hh>
#include <dumux/implicit/2p2c/2p2cfluxvariables.hh>
+#include "2p2cniproperties.hh"
namespace Dumux
{
@@ -98,7 +99,7 @@ public:
*/
DimVector temperatureGradient() const
{ return temperatureGrad_; }
-
+
/*!
* \brief The harmonically averaged effective thermal conductivity.
*/
@@ -118,7 +119,7 @@ protected:
{
tmp = this->face().grad[idx];
- // index for the element volume variables
+ // index for the element volume variables
int volVarsIdx = this->face().fapIndices[idx];
tmp *= elemVolVars[volVarsIdx].temperature();
@@ -129,8 +130,7 @@ protected:
calculateEffThermalConductivity_(problem, element, elemVolVars);
// project the heat flux vector on the face's normal vector
- normalMatrixHeatFlux_ = temperatureGrad_*
- this->face().normal;
+ normalMatrixHeatFlux_ = temperatureGrad_* this->face().normal;
normalMatrixHeatFlux_ *= -lambdaEff_;
}
@@ -139,17 +139,17 @@ protected:
const ElementVolumeVariables &elemVolVars)
{
const Scalar lambdaI =
- ThermalConductivityModel::effectiveThermalConductivity(element,
- elemVolVars,
- this->fvGeometry_,
- problem.spatialParams(),
- this->face().i);
+ ThermalConductivityModel::effectiveThermalConductivity(element,
+ elemVolVars,
+ this->fvGeometry_,
+ problem.spatialParams(),
+ this->face().i);
const Scalar lambdaJ =
- ThermalConductivityModel::effectiveThermalConductivity(element,
- elemVolVars,
- this->fvGeometry_,
- problem.spatialParams(),
- this->face().j);
+ ThermalConductivityModel::effectiveThermalConductivity(element,
+ elemVolVars,
+ this->fvGeometry_,
+ problem.spatialParams(),
+ this->face().j);
// -> harmonic mean
lambdaEff_ = harmonicMean(lambdaI, lambdaJ);
}
diff --git a/dumux/implicit/2pni/2pnifluxvariables.hh b/dumux/implicit/2pni/2pnifluxvariables.hh
index 3c2ed18847..bec6a02946 100644
--- a/dumux/implicit/2pni/2pnifluxvariables.hh
+++ b/dumux/implicit/2pni/2pnifluxvariables.hh
@@ -31,6 +31,8 @@
#include <dumux/common/math.hh>
#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
+#include "2pniproperties.hh"
+
namespace Dumux
{
@@ -77,11 +79,11 @@ public:
*/
TwoPNIFluxVariables(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- int faceIdx,
- const ElementVolumeVariables &elemVolVars,
- const bool onBoundary = false)
+ const Element &element,
+ const FVElementGeometry &fvGeometry,
+ int faceIdx,
+ const ElementVolumeVariables &elemVolVars,
+ const bool onBoundary = false)
: ParentType(problem, element, fvGeometry, faceIdx, elemVolVars, onBoundary)
{
faceIdx_ = faceIdx;
@@ -123,7 +125,7 @@ protected:
{
tmp = this->face().grad[idx];
- // index for the element volume variables
+ // index for the element volume variables
int volVarsIdx = this->face().fapIndices[idx];
tmp *= elemVolVars[volVarsIdx].temperature();
@@ -134,25 +136,26 @@ protected:
calculateEffThermalConductivity_(problem, element, elemVolVars);
// project the heat flux vector on the face's normal vector
- normalMatrixHeatFlux_ = temperatureGrad_*
- this->face().normal;
+ normalMatrixHeatFlux_ = temperatureGrad_ * this->face().normal;
normalMatrixHeatFlux_ *= -lambdaEff_;
}
void calculateEffThermalConductivity_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
+ const Element &element,
+ const ElementVolumeVariables &elemVolVars)
{
- const Scalar lambdaI = ThermalConductivityModel::effectiveThermalConductivity(element,
- elemVolVars,
- this->fvGeometry_,
- problem.spatialParams(),
- this->face().i);
- const Scalar lambdaJ = ThermalConductivityModel::effectiveThermalConductivity(element,
- elemVolVars,
- this->fvGeometry_,
- problem.spatialParams(),
- this->face().j);
+ const Scalar lambdaI =
+ ThermalConductivityModel::effectiveThermalConductivity(element,
+ elemVolVars,
+ this->fvGeometry_,
+ problem.spatialParams(),
+ this->face().i);
+ const Scalar lambdaJ =
+ ThermalConductivityModel::effectiveThermalConductivity(element,
+ elemVolVars,
+ this->fvGeometry_,
+ problem.spatialParams(),
+ this->face().j);
// -> harmonic mean
lambdaEff_ = harmonicMean(lambdaI, lambdaJ);
}
--
GitLab