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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/FullyImplicitBlackoilSolver.cpp
View File

@ -1008,11 +1008,8 @@ namespace Opm {
// compute gravity potensial using the face average as in eclipse and MRST // compute gravity potensial using the face average as in eclipse and MRST
const ADB rhoavg = ops_.caver * rho; 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*dp;
//head = transi*(ops_.ngrad * state.pressure) + gflux; //head = transi*(ops_.ngrad * state.pressure) + gflux;

10
opm/autodiff/GeoProps.hpp
View File

@ -84,11 +84,11 @@ namespace Opm
} }
} }
const Vector& poreVolume() const { return pvol_ ; } const Vector& poreVolume() const { return pvol_ ;}
const Vector& transmissibility() const { return trans_; } const Vector& transmissibility() const { return trans_ ;}
const Vector& gravityPotential() const { return gpot_ ; } const Vector& gravityPotential() const { return gpot_ ;}
const Vector& z() const {return z_;} const Vector& z() const { return z_ ;}
const double* gravity() const { return gravity_; } const double* gravity() const { return gravity_;}
private: private:
Vector pvol_ ; Vector pvol_ ;