1. The geo_.z() is now called directly instead of first converted to ADB

vector
2. Added some whitespaces fro readability
This commit is contained in:
Tor Harald Sandve 2013-09-24 09:33:33 +02:00
parent 5dcc4aab3a
commit 34cc4f7da0
2 changed files with 6 additions and 9 deletions

View File

@ -1008,11 +1008,8 @@ namespace Opm {
// compute gravity potensial using the face average as in eclipse and MRST
const ADB rhoavg = ops_.caver * rho;
const V vz = geo_.z();
std::vector<int> blocksizes = rhoavg.blockPattern();
ADB z = ADB::constant(vz,blocksizes);
const ADB dp = ops_.ngrad * state.pressure - geo_.gravity()[2] * (rhoavg * (ops_.ngrad * z));
const ADB dp = ops_.ngrad * state.pressure - geo_.gravity()[2] * (rhoavg * (ops_.ngrad * geo_.z().matrix()));
head = transi*dp;
//head = transi*(ops_.ngrad * state.pressure) + gflux;