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

Removed redundant calcPressII() method.

Browse Source 
Pressure is also calculated in the calcPressSat() method.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-26 14:49:06 +01:00
parent 38c89f363d
commit d5ffcc051c
1 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,9 +259,7 @@ namespace Opm
{ {
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));
calcPressSat(eqlmap, rec, props, G, grav);
calcPressII(eqlmap, rec, props, G, grav);
calcSat(eqlmap, rec, props, G, grav);
} }
typedef std::vector<double> PVal; typedef std::vector<double> PVal;
@ -279,50 +277,11 @@ namespace Opm
template <class RMap> template <class RMap>
void void
calcPressII(const RMap& reg , calcPressSat(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) const double grav)
{
typedef Miscibility::NoMixing NoMix;
for (typename RMap::RegionId
r = 0, nr = reg.numRegions();
r < nr; ++r)
{
const typename RMap::CellRange cells = reg.cells(r);
const int repcell = *cells.begin();
const RhoCalc calc(props, repcell);
const EqReg eqreg(rec[r], calc,
std::make_shared<NoMix>(), std::make_shared<NoMix>(),
props.phaseUsage());
const PPress& res = phasePressures(G, eqreg, cells, grav);
for (int p = 0, np = props.numPhases(); p < np; ++p) {
PVal& d = pp_[p];
PVal::const_iterator s = res[p].begin();
for (typename RMap::CellRange::const_iterator
c = cells.begin(),
e = cells.end();
c != e; ++c, ++s)
{
d[*c] = *s;
}
}
}
}
template <class RMap>
void
calcSat(const RMap& reg ,
const std::vector< EquilRecord >& rec ,
const Opm::BlackoilPropertiesInterface& props,
const UnstructuredGrid& G ,
const double grav)
{ {
typedef Miscibility::NoMixing NoMix; typedef Miscibility::NoMixing NoMix;