OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in some capPress() implementations (calling wrong function). Doc fix.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-01-27 11:42:05 +01:00
parent ae98a1c9c3
commit a00e8bba3e
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ namespace Opm
double* pc,
double* dpcds) const
{
satprops_.relperm(n, s, pc, dpcds);
satprops_.capPress(n, s, pc, dpcds);
}

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

@@ -122,7 +122,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dkr_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
virtual void relperm(const int n,
const double* s,
const int* cells,
@@ -138,7 +138,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dpc_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
virtual void capPress(const int n,
const double* s,
const int* cells,

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

@@ -222,7 +222,7 @@ namespace Opm
double* pc,
double* dpcds) const
{
satprops_.relperm(n, s, pc, dpcds);
satprops_.capPress(n, s, pc, dpcds);
}

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

@@ -118,7 +118,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dkr_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
virtual void relperm(const int n,
const double* s,
const int* cells,
@@ -134,7 +134,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dpc_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
virtual void capPress(const int n,
const double* s,
const int* cells,

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

@@ -109,7 +109,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dkr_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
virtual void relperm(const int n,
const double* s,
const int* cells,
@@ -125,7 +125,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dpc_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
virtual void capPress(const int n,
const double* s,
const int* cells,

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

@@ -106,7 +106,7 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dkr_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
void IncompPropertiesBasic::relperm(const int n,
const double* s,
const int* /*cells*/,
@@ -125,14 +125,14 @@ namespace Opm
/// array must be valid before calling.
/// The P^2 derivative matrix is
/// m_{ij} = \frac{dpc_i}{ds^j},
/// and is output in Fortran order (m_00 m_10 m_20 m01 ...)
/// and is output in Fortran order (m_00 m_10 m_20 m_01 ...)
void IncompPropertiesBasic::capPress(const int n,
const double* s,
const int* /*cells*/,
double* pc,
double* dpcds) const
{
satprops_.relperm(n, s, pc, dpcds);
satprops_.capPress(n, s, pc, dpcds);
}