From 6d045c54b170972b4995af8ea32e281dcdbaf660 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 11 Nov 2013 17:16:13 +0000
Subject: [PATCH] fix results from DimVector/GlobalPosition name changes
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11956 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../common/implicitforchheimerfluxvariables.hh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dumux/implicit/common/implicitforchheimerfluxvariables.hh b/dumux/implicit/common/implicitforchheimerfluxvariables.hh
index 4b25355a5e..90f1d686f8 100644
--- a/dumux/implicit/common/implicitforchheimerfluxvariables.hh
+++ b/dumux/implicit/common/implicitforchheimerfluxvariables.hh
@@ -178,11 +178,11 @@ protected:
{
// initial guess of velocity: Darcy relation
// first taken from base class, later overwritten in base class
- DimVector velocity = this-> velocity(phaseIdx);
+ GlobalPosition velocity = this-> velocity(phaseIdx);
- DimVector deltaV; // the change in velocity between Newton iterations
- DimVector residual(10e10); // the residual (function value that is to be minimized)
- DimVector tmp; // temporary variable for numerical differentiation
+ GlobalPosition deltaV; // the change in velocity between Newton iterations
+ GlobalPosition residual(10e10); // the residual (function value that is to be minimized)
+ GlobalPosition tmp; // temporary variable for numerical differentiation
Tensor gradF; // slope of equation that is to be solved
// search by means of the Newton method for a root of Forchheimer equation
@@ -259,13 +259,13 @@ protected:
* \param gradPotential The gradient in potential
* \param phaseIdx The index of the currently considered phase
*/
- void forchheimerResidual_(DimVector & residual,
+ void forchheimerResidual_(GlobalPosition & residual,
const Scalar forchCoeff,
const DimMatrix & sqrtK,
const DimMatrix & K,
- const DimVector & velocity,
+ const GlobalPosition & velocity,
const ElementVolumeVariables & elemVolVars,
- const DimVector & gradPotential ,
+ const GlobalPosition & gradPotential ,
const unsigned int phaseIdx) const
{
const VolumeVariables upVolVars = elemVolVars[this->upstreamIdx(phaseIdx)];
@@ -332,7 +332,7 @@ protected:
void forchheimerDerivative_(Tensor & derivative,
const Scalar forchCoeff,
const DimMatrix & sqrtK,
- const DimVector & velocity,
+ const GlobalPosition & velocity,
const ElementVolumeVariables & elemVolVars,
const unsigned int phaseIdx) const
{
--
GitLab