Skip to content
Snippets Groups Projects
Commit 030587c3 authored by Klaus Mosthaf's avatar Klaus Mosthaf
Browse files

reimplemented commit #7961:

removed calculation of unused velocityDivergence (commented) and
massFractionGradient (moleFractionGradient is used for the diffusion);
unfortunately, deprecation was not possible in this case

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8067 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 37e3f42f
No related branches found
No related tags found
No related merge requests found
...@@ -98,7 +98,7 @@ protected: ...@@ -98,7 +98,7 @@ protected:
velocityAtIP_ = Scalar(0); velocityAtIP_ = Scalar(0);
pressureGradAtIP_ = Scalar(0); pressureGradAtIP_ = Scalar(0);
velocityGradAtIP_ = Scalar(0); velocityGradAtIP_ = Scalar(0);
velocityDivAtIP_ = Scalar(0); // velocityDivAtIP_ = Scalar(0);
for (int idx = 0; for (int idx = 0;
idx < fvGeom_.numVertices; idx < fvGeom_.numVertices;
...@@ -136,7 +136,7 @@ protected: ...@@ -136,7 +136,7 @@ protected:
tmp *= elemVolVars[idx].velocity()[dimIdx]; tmp *= elemVolVars[idx].velocity()[dimIdx];
velocityGradAtIP_[dimIdx] += tmp; velocityGradAtIP_[dimIdx] += tmp;
velocityDivAtIP_ += face().grad[idx][dimIdx]*elemVolVars[idx].velocity()[dimIdx]; // velocityDivAtIP_ += face().grad[idx][dimIdx]*elemVolVars[idx].velocity()[dimIdx];
} }
} }
...@@ -148,7 +148,7 @@ protected: ...@@ -148,7 +148,7 @@ protected:
Valgrind::CheckDefined(velocityAtIP_); Valgrind::CheckDefined(velocityAtIP_);
Valgrind::CheckDefined(pressureGradAtIP_); Valgrind::CheckDefined(pressureGradAtIP_);
Valgrind::CheckDefined(velocityGradAtIP_); Valgrind::CheckDefined(velocityGradAtIP_);
Valgrind::CheckDefined(velocityDivAtIP_); // Valgrind::CheckDefined(velocityDivAtIP_);
}; };
void determineUpwindDirection_(const ElementVolumeVariables &elemVolVars) void determineUpwindDirection_(const ElementVolumeVariables &elemVolVars)
...@@ -238,12 +238,12 @@ public: ...@@ -238,12 +238,12 @@ public:
const VectorGradient &velocityGradAtIP() const const VectorGradient &velocityGradAtIP() const
{ return velocityGradAtIP_; } { return velocityGradAtIP_; }
/*! // /*!
* \brief Return the divergence of the normal velocity at the // * \brief Return the divergence of the normal velocity at the
* integration point. // * integration point.
*/ // */
Scalar velocityDivAtIP() const // Scalar velocityDivAtIP() const
{ return velocityDivAtIP_; } // { return velocityDivAtIP_; }
/*! /*!
* \brief Return the local index of the upstream sub-control volume. * \brief Return the local index of the upstream sub-control volume.
...@@ -274,7 +274,7 @@ protected: ...@@ -274,7 +274,7 @@ protected:
Scalar viscosityAtIP_; Scalar viscosityAtIP_;
Scalar pressureAtIP_; Scalar pressureAtIP_;
Scalar normalVelocityAtIP_; Scalar normalVelocityAtIP_;
Scalar velocityDivAtIP_; // Scalar velocityDivAtIP_;
VelocityVector velocityAtIP_; VelocityVector velocityAtIP_;
// gradients at the IPs // gradients at the IPs
......
...@@ -97,12 +97,6 @@ public: ...@@ -97,12 +97,6 @@ public:
Scalar diffusionCoeffAtIP() const Scalar diffusionCoeffAtIP() const
{ return diffusionCoeffAtIP_; } { return diffusionCoeffAtIP_; }
/*!
* \brief Return the gradient of the mass fraction at the integration point.
*/
const ScalarGradient &massFractionGradAtIP() const
{ return massFractionGradAtIP_; }
/*! /*!
* \brief Return the gradient of the mole fraction at the integration point. * \brief Return the gradient of the mole fraction at the integration point.
*/ */
...@@ -117,7 +111,6 @@ protected: ...@@ -117,7 +111,6 @@ protected:
{ {
massFractionAtIP_ = Scalar(0); massFractionAtIP_ = Scalar(0);
diffusionCoeffAtIP_ = Scalar(0); diffusionCoeffAtIP_ = Scalar(0);
massFractionGradAtIP_ = Scalar(0);
moleFractionGradAtIP_ = Scalar(0); moleFractionGradAtIP_ = Scalar(0);
// calculate gradients and secondary variables at IPs // calculate gradients and secondary variables at IPs
...@@ -133,9 +126,6 @@ protected: ...@@ -133,9 +126,6 @@ protected:
// the gradient of the mass fraction at the IP // the gradient of the mass fraction at the IP
for (int dimIdx=0; dimIdx<dim; ++dimIdx) for (int dimIdx=0; dimIdx<dim; ++dimIdx)
{ {
massFractionGradAtIP_ +=
this->face().grad[idx][dimIdx]*
elemVolVars[idx].fluidState().massFraction(phaseIdx, lCompIdx);
moleFractionGradAtIP_ += moleFractionGradAtIP_ +=
this->face().grad[idx][dimIdx] * this->face().grad[idx][dimIdx] *
elemVolVars[idx].fluidState().moleFraction(phaseIdx, lCompIdx); elemVolVars[idx].fluidState().moleFraction(phaseIdx, lCompIdx);
...@@ -144,12 +134,11 @@ protected: ...@@ -144,12 +134,11 @@ protected:
Valgrind::CheckDefined(massFractionAtIP_); Valgrind::CheckDefined(massFractionAtIP_);
Valgrind::CheckDefined(diffusionCoeffAtIP_); Valgrind::CheckDefined(diffusionCoeffAtIP_);
Valgrind::CheckDefined(massFractionGradAtIP_); Valgrind::CheckDefined(moleFractionGradAtIP_);
} }
Scalar massFractionAtIP_; Scalar massFractionAtIP_;
Scalar diffusionCoeffAtIP_; Scalar diffusionCoeffAtIP_;
ScalarGradient massFractionGradAtIP_;
ScalarGradient moleFractionGradAtIP_; ScalarGradient moleFractionGradAtIP_;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment