OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 17:50:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add (defaulted) gravity argument in some places.

Browse Source 
This is done to facilitate testing, using gravity = 10 m/s^2 for example.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-19 13:38:21 +01:00
parent 1f2b2eadc5
commit 82216fa24f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/simulator/initStateEquil.hpp
View File

@ -643,14 +643,15 @@ namespace Opm
public: public:
PhasePressureComputer(const BlackoilPropertiesInterface& props, PhasePressureComputer(const BlackoilPropertiesInterface& props,
const EclipseGridParser& deck , const EclipseGridParser& deck ,
const UnstructuredGrid& G ) const UnstructuredGrid& G ,
const double grav = unit::gravity)
: pp_(props.numPhases(), : pp_(props.numPhases(),
std::vector<double>(G.number_of_cells)) std::vector<double>(G.number_of_cells))
{ {
const std::vector<EquilRecord> rec = getEquil(deck); const std::vector<EquilRecord> rec = getEquil(deck);
const RegionMapping<> eqlmap(equilnum(deck, G)); const RegionMapping<> eqlmap(equilnum(deck, G));
calcII(eqlmap, rec, props, G); calcII(eqlmap, rec, props, G, grav);
} }
typedef std::vector<double> PVal; typedef std::vector<double> PVal;
@ -669,7 +670,8 @@ namespace Opm
calcII(const RMap& reg , calcII(const RMap& reg ,
const std::vector< EquilRecord >& rec , const std::vector< EquilRecord >& rec ,
const Opm::BlackoilPropertiesInterface& props, const Opm::BlackoilPropertiesInterface& props,
const UnstructuredGrid& G ) const UnstructuredGrid& G ,
const double grav)
{ {
typedef miscibility::NoMixing NoMix; typedef miscibility::NoMixing NoMix;
@ -685,7 +687,7 @@ namespace Opm
const EqReg eqreg(rec[r], calc, NoMix(), NoMix(), const EqReg eqreg(rec[r], calc, NoMix(), NoMix(),
props.phaseUsage()); props.phaseUsage());
const PPress& res = phasePressures(G, eqreg, cells); const PPress& res = phasePressures(G, eqreg, cells, grav);
for (int p = 0, np = props.numPhases(); p < np; ++p) { for (int p = 0, np = props.numPhases(); p < np; ++p) {
PVal& d = pp_[p]; PVal& d = pp_[p];