Added gasoilratio() to BlackoilState.

This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-27 12:53:06 +02:00
parent 125c573461
commit 6e9a46b34d

View File

@ -48,6 +48,7 @@ namespace Opm
// but use available phase information instead.
sat_[num_phases*cell + 1] = 1.0;
}
gor_.resize(g.number_of_cells, 0.0);
}
enum ExtremalSat { MinSat, MaxSat };
@ -60,10 +61,13 @@ namespace Opm
const Opm::BlackoilPropertiesInterface& props,
ExtremalSat es)
{
if (cells.empty()) {
return;
}
const int n = cells.size();
ASSERT(n > 0);
std::vector<double> smin(num_phases_*n);
std::vector<double> smax(num_phases_*n);
ASSERT(n > 0);
props.satRange(n, &cells[0], &smin[0], &smax[0]);
const double* svals = (es == MinSat) ? &smin[0] : &smax[0];
for (int ci = 0; ci < n; ++ci) {
@ -83,12 +87,14 @@ namespace Opm
std::vector<double>& faceflux () { return flux_ ; }
std::vector<double>& surfacevol () { return surfvol_; }
std::vector<double>& saturation () { return sat_ ; }
std::vector<double>& gasoilratio () { return gor_ ; }
const std::vector<double>& pressure () const { return press_ ; }
const std::vector<double>& facepressure() const { return fpress_; }
const std::vector<double>& faceflux () const { return flux_ ; }
const std::vector<double>& surfacevol () const { return surfvol_; }
const std::vector<double>& saturation () const { return sat_ ; }
const std::vector<double>& gasoilratio () const { return gor_ ; }
private:
int num_phases_;
@ -97,6 +103,7 @@ namespace Opm
std::vector<double> flux_ ;
std::vector<double> surfvol_;
std::vector<double> sat_ ;
std::vector<double> gor_ ;
};
} // namespace Opm