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

Now saturation props read from deck may have multiple tables, and support SATNUM.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-04-19 11:49:59 +02:00
parent b0c60ee05b
commit 844ccf3562
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/fluid/BlackoilPropertiesFromDeck.cpp
View File

@@ -199,11 +199,11 @@ namespace Opm
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
void BlackoilPropertiesFromDeck::relperm(const int n,
const double* s,
const int* /*cells*/,
const int* cells,
double* kr,
double* dkrds) const
{
satprops_.relperm(n, s, kr, dkrds);
satprops_.relperm(n, s, cells, kr, dkrds);
}
@@ -218,11 +218,11 @@ namespace Opm
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
void BlackoilPropertiesFromDeck::capPress(const int n,
const double* s,
const int* /*cells*/,
const int* cells,
double* pc,
double* dpcds) const
{
satprops_.capPress(n, s, pc, dpcds);
satprops_.capPress(n, s, cells, pc, dpcds);
}

12
opm/core/fluid/IncompPropertiesFromDeck.cpp
View File

@@ -101,11 +101,11 @@ namespace Opm
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
void IncompPropertiesFromDeck::relperm(const int n,
const double* s,
const int* /*cells*/,
const int* cells,
double* kr,
double* dkrds) const
{
satprops_.relperm(n, s, kr, dkrds);
satprops_.relperm(n, s, cells, kr, dkrds);
}
@@ -120,11 +120,11 @@ namespace Opm
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
void IncompPropertiesFromDeck::capPress(const int n,
const double* s,
const int* /*cells*/,
const int* cells,
double* pc,
double* dpcds) const
{
satprops_.capPress(n, s, pc, dpcds);
satprops_.capPress(n, s, cells, pc, dpcds);
}
@@ -136,11 +136,11 @@ namespace Opm
/// \param[out] smin Array of nP minimum s values, array must be valid before calling.
/// \param[out] smax Array of nP maximum s values, array must be valid before calling.
void IncompPropertiesFromDeck::satRange(const int n,
const int* /*cells*/,
const int* cells,
double* smin,
double* smax) const
{
satprops_.satRange(n, smin, smax);
satprops_.satRange(n, cells, smin, smax);
}
} // namespace Opm

42
opm/core/fluid/SaturationPropsFromDeck.hpp
View File

@@ -23,6 +23,7 @@
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <vector>
namespace Opm
{
@@ -50,6 +51,7 @@ namespace Opm
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
void relperm(const int n,
const double* s,
const int* cells,
double* kr,
double* dkrds) const;
@@ -64,6 +66,7 @@ namespace Opm
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
void capPress(const int n,
const double* s,
const int* cells,
double* pc,
double* dpcds) const;
@@ -72,25 +75,36 @@ namespace Opm
/// \param[out] smin Array of nP minimum s values, array must be valid before calling.
/// \param[out] smax Array of nP maximum s values, array must be valid before calling.
void satRange(const int n,
const int* cells,
double* smin,
double* smax) const;
private:
void evalKr(const double* s, double* kr) const;
void evalKrDeriv(const double* s, double* kr, double* dkrds) const;
void evalPc(const double* s, double* pc) const;
void evalPcDeriv(const double* s, double* pc, double* dpcds) const;
private:
PhaseUsage phase_usage_;
utils::UniformTableLinear<double> krw_;
utils::UniformTableLinear<double> krow_;
utils::UniformTableLinear<double> pcow_;
utils::UniformTableLinear<double> krg_;
utils::UniformTableLinear<double> krog_;
utils::UniformTableLinear<double> pcog_;
double krocw_; // = krow_(s_wc)
double smin_[PhaseUsage::MaxNumPhases];
double smax_[PhaseUsage::MaxNumPhases];
class SatFuncSet
{
public:
void init(const EclipseGridParser& deck, const int table_num, PhaseUsage phase_usg);
void evalKr(const double* s, double* kr) const;
void evalKrDeriv(const double* s, double* kr, double* dkrds) const;
void evalPc(const double* s, double* pc) const;
void evalPcDeriv(const double* s, double* pc, double* dpcds) const;
double smin_[PhaseUsage::MaxNumPhases];
double smax_[PhaseUsage::MaxNumPhases];
private:
PhaseUsage phase_usage; // A copy of the outer class' phase_usage_.
UniformTableLinear<double> krw_;
UniformTableLinear<double> krow_;
UniformTableLinear<double> pcow_;
UniformTableLinear<double> krg_;
UniformTableLinear<double> krog_;
UniformTableLinear<double> pcog_;
double krocw_; // = krow_(s_wc)
};
std::vector<SatFuncSet> satfuncset_;
std::vector<int> cell_to_func_; // = SATNUM - 1
const SatFuncSet& funcForCell(const int cell) const;
};