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

Merged.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-05-14 11:29:06 +02:00
commit a6034be47d
10 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,14 @@ namespace Opm
}
}
/// Densities of stock components at surface conditions.
/// \return Array of P density values.
const double* BlackoilPropertiesBasic::surfaceDensity() const
{
return pvt_.surfaceDensities();
}
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

5
opm/core/fluid/BlackoilPropertiesBasic.hpp
View File

@ -104,6 +104,7 @@ namespace Opm
double* dAdp) const;
/// Densities of stock components at reservoir conditions.
/// \param[in] n Number of data points.
/// \param[in] A Array of nP^2 values, where the P^2 values for a cell give the
/// matrix A = RB^{-1} which relates z to u by z = Au. The matrices
@ -114,6 +115,10 @@ namespace Opm
const double* A,
double* rho) const;
/// Densities of stock components at surface conditions.
/// \return Array of P density values.
virtual const double* surfaceDensity() const;
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

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

@ -213,6 +213,13 @@ namespace Opm
}
}
/// Densities of stock components at surface conditions.
/// \return Array of P density values.
const double* BlackoilPropertiesFromDeck::surfaceDensity() const
{
return pvt_.surfaceDensities();
}
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

5
opm/core/fluid/BlackoilPropertiesFromDeck.hpp
View File

@ -100,6 +100,7 @@ namespace Opm
double* dAdp) const;
/// Densities of stock components at reservoir conditions.
/// \param[in] n Number of data points.
/// \param[in] A Array of nP^2 values, where the P^2 values for a cell give the
/// matrix A = RB^{-1} which relates z to u by z = Au. The matrices
@ -110,6 +111,10 @@ namespace Opm
const double* A,
double* rho) const;
/// Densities of stock components at surface conditions.
/// \return Array of P density values.
virtual const double* surfaceDensity() const;
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

5
opm/core/fluid/BlackoilPropertiesInterface.hpp
View File

@ -91,6 +91,7 @@ namespace Opm
double* dAdp) const = 0;
/// Densities of stock components at reservoir conditions.
/// \param[in] n Number of data points.
/// \param[in] A Array of nP^2 values, where the P^2 values for a cell give the
/// matrix A = RB^{-1} which relates z to u by z = Au. The matrices
@ -101,6 +102,10 @@ namespace Opm
const double* A,
double* rho) const = 0;
/// Densities of stock components at surface conditions.
/// \return Array of P density values.
virtual const double* surfaceDensity() const = 0;
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

10
opm/core/fluid/IncompPropertiesBasic.cpp
View File

@ -115,6 +115,16 @@ namespace Opm
/// \return Array of P density values.
const double* IncompPropertiesBasic::density() const
{
// No difference between reservoir and surface densities
// modelled by this class.
return pvt_.surfaceDensities();
}
/// \return Array of P density values.
const double* IncompPropertiesBasic::surfaceDensity() const
{
// No difference between reservoir and surface densities
// modelled by this class.
return pvt_.surfaceDensities();
}

5
opm/core/fluid/IncompPropertiesBasic.hpp
View File

@ -92,9 +92,14 @@ namespace Opm
/// \return Array of P viscosity values.
virtual const double* viscosity() const;
/// Densities of fluid phases at reservoir conditions.
/// \return Array of P density values.
virtual const double* density() const;
/// Densities of fluid phases at surface conditions.
/// \return Array of P density values.
virtual const double* surfaceDensity() const;
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

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

@ -90,6 +90,12 @@ namespace Opm
return pvt_.reservoirDensities();
}
/// \return Array of P density values.
const double* IncompPropertiesFromDeck::surfaceDensity() const
{
return pvt_.surfaceDensities();
}
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

5
opm/core/fluid/IncompPropertiesFromDeck.hpp
View File

@ -78,9 +78,14 @@ namespace Opm
/// \return Array of P viscosity values.
virtual const double* viscosity() const;
/// Densities of fluid phases at reservoir conditions.
/// \return Array of P density values.
virtual const double* density() const;
/// Densities of fluid phases at surface conditions.
/// \return Array of P density values.
virtual const double* surfaceDensity() const;
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.

13
opm/core/fluid/IncompPropertiesInterface.hpp
View File

@ -62,9 +62,22 @@ namespace Opm
/// \return Array of P viscosity values.
virtual const double* viscosity() const = 0;
/// Densities of fluid phases at surface conditions.
/// \return Array of P density values.
virtual const double* density() const = 0;
/// Densities of fluid phases at surface conditions.
/// Note: a reasonable question to ask is why there can be
/// different densities at surface and reservoir conditions,
/// when the phases are assumed incompressible. The answer is
/// that even if we approximate the phases as being
/// incompressible during simulation, the density difference
/// between surface and reservoir may be larger. For accurate
/// reporting and using data given in terms of surface values,
/// we need to handle this difference.
/// \return Array of P density values.
virtual const double* surfaceDensity() const = 0;
/// \param[in] n Number of data points.
/// \param[in] s Array of nP saturation values.
/// \param[in] cells Array of n cell indices to be associated with the s values.