OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'phase' parameter p->phase to avoid confusion.

Browse Source
This commit is contained in:
Bård Skaflestad 2013-05-08 13:13:57 +02:00
parent dfd33d8973
commit 673c044a6c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ImpesTPFAAD.hpp
View File

@ -99,34 +99,34 @@ namespace Opm {
}
ADB
fvf(const int p) const
fvf(const int phase) const
{
assert (0 <= p );
assert (p < np_);
assert (0 <= phase);
assert (phase < np_ );
typename ADB::V A = A_ .block(0, p * (np_ + 1), nc_, 1);
typename ADB::V dA = dA_.block(0, p * (np_ + 1), nc_, 1);
typename ADB::V A = A_ .block(0, phase * (np_ + 1), nc_, 1);
typename ADB::V dA = dA_.block(0, phase * (np_ + 1), nc_, 1);
typename ADB::M jac = dA.matrix().asDiagonal();
return one_ / ADB::function(A, jac);
}
typename ADB::V
phaseRelPerm(const int p) const
phaseRelPerm(const int phase) const
{
typename ADB::V kr = kr_.block(0, p, nc_, 1);
typename ADB::V kr = kr_.block(0, phase, nc_, 1);
return kr;
}
ADB
phaseViscosity(const int p) const
phaseViscosity(const int phase) const
{
assert (0 <= p );
assert (p < np_);
assert (0 <= phase);
assert (phase < np_ );
typename ADB::V mu = mu_ .block(0, p, nc_, 1);
typename ADB::V dmu = dmu_.block(0, p, nc_, 1);
typename ADB::V mu = mu_ .block(0, phase, nc_, 1);
typename ADB::V dmu = dmu_.block(0, phase, nc_, 1);
typename ADB::M jac = dmu.matrix().asDiagonal();
return ADB::function(mu, jac);