OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'bska/master'

Browse Source 
Conflicts:
	ImpesTPFAAD.hpp
This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-13 10:31:15 +02:00
commit 9620339476
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ImpesTPFAAD.hpp
View File

@ -110,8 +110,10 @@ namespace Opm {
assert (0 <= phase); assert (0 <= phase);
assert (phase < np_ ); assert (phase < np_ );
typename ADB::V A = A_ .block(0, phase * (np_ + 1), nc_, 1); typedef typename ADB::V V;
typename ADB::V dA = dA_.block(0, phase * (np_ + 1), nc_, 1);
const V A = A_ .block(0, phase * (np_ + 1), nc_, 1);
const V dA = dA_.block(0, phase * (np_ + 1), nc_, 1);
std::vector<typename ADB::M> jac(p.numBlocks()); std::vector<typename ADB::M> jac(p.numBlocks());
assert(p.numBlocks() == 2); assert(p.numBlocks() == 2);
@ -124,7 +126,7 @@ namespace Opm {
typename ADB::V typename ADB::V
phaseRelPerm(const int phase) const phaseRelPerm(const int phase) const
{ {
typename ADB::V kr = kr_.block(0, phase, nc_, 1); const typename ADB::V kr = kr_.block(0, phase, nc_, 1);
return kr; return kr;
} }
@ -135,8 +137,10 @@ namespace Opm {
assert (0 <= phase); assert (0 <= phase);
assert (phase < np_ ); assert (phase < np_ );
typename ADB::V mu = mu_ .block(0, phase, nc_, 1); typedef typename ADB::V V;
typename ADB::V dmu = dmu_.block(0, phase, nc_, 1);
const V mu = mu_ .block(0, phase, nc_, 1);
const V dmu = dmu_.block(0, phase, nc_, 1);
std::vector<typename ADB::M> jac(p.numBlocks()); std::vector<typename ADB::M> jac(p.numBlocks());
assert(p.numBlocks() == 2); assert(p.numBlocks() == 2);