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

Renamed class SinglePvtDead -> SinglePvtDeadSpline.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-08-27 14:00:12 +02:00
parent 1c0a67cfed
commit c920c83c76
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -51,7 +51,7 @@ opm/core/fluid/RockFromDeck.cpp \
opm/core/fluid/SaturationPropsBasic.cpp \ opm/core/fluid/SaturationPropsBasic.cpp \
opm/core/fluid/SaturationPropsFromDeck.cpp \ opm/core/fluid/SaturationPropsFromDeck.cpp \
opm/core/fluid/blackoil/BlackoilPvtProperties.cpp \ opm/core/fluid/blackoil/BlackoilPvtProperties.cpp \
opm/core/fluid/blackoil/SinglePvtDead.cpp \ opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp \
opm/core/fluid/blackoil/SinglePvtInterface.cpp \ opm/core/fluid/blackoil/SinglePvtInterface.cpp \
opm/core/fluid/blackoil/SinglePvtLiveGas.cpp \ opm/core/fluid/blackoil/SinglePvtLiveGas.cpp \
opm/core/fluid/blackoil/SinglePvtLiveOil.cpp \ opm/core/fluid/blackoil/SinglePvtLiveOil.cpp \
@ -151,7 +151,7 @@ opm/core/fluid/SimpleFluid2p.hpp \
opm/core/fluid/blackoil/BlackoilPhases.hpp \ opm/core/fluid/blackoil/BlackoilPhases.hpp \
opm/core/fluid/blackoil/BlackoilPvtProperties.hpp \ opm/core/fluid/blackoil/BlackoilPvtProperties.hpp \
opm/core/fluid/blackoil/SinglePvtConstCompr.hpp \ opm/core/fluid/blackoil/SinglePvtConstCompr.hpp \
opm/core/fluid/blackoil/SinglePvtDead.hpp \ opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp \
opm/core/fluid/blackoil/SinglePvtInterface.hpp \ opm/core/fluid/blackoil/SinglePvtInterface.hpp \
opm/core/fluid/blackoil/SinglePvtLiveGas.hpp \ opm/core/fluid/blackoil/SinglePvtLiveGas.hpp \
opm/core/fluid/blackoil/SinglePvtLiveOil.hpp \ opm/core/fluid/blackoil/SinglePvtLiveOil.hpp \

6
opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
View File

@ -20,7 +20,7 @@
#include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp> #include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
#include <opm/core/fluid/blackoil/SinglePvtDead.hpp> #include <opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp>
#include <opm/core/fluid/blackoil/SinglePvtLiveOil.hpp> #include <opm/core/fluid/blackoil/SinglePvtLiveOil.hpp>
#include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp> #include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp>
#include <opm/core/fluid/blackoil/SinglePvtConstCompr.hpp> #include <opm/core/fluid/blackoil/SinglePvtConstCompr.hpp>
@ -78,7 +78,7 @@ namespace Opm
// Oil PVT // Oil PVT
if (phase_usage_.phase_used[Liquid]) { if (phase_usage_.phase_used[Liquid]) {
if (deck.hasField("PVDO")) { if (deck.hasField("PVDO")) {
props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtDead(deck.getPVDO().pvdo_)); props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtDeadSpline(deck.getPVDO().pvdo_));
} else if (deck.hasField("PVTO")) { } else if (deck.hasField("PVTO")) {
props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtLiveOil(deck.getPVTO().pvto_)); props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtLiveOil(deck.getPVTO().pvto_));
} else if (deck.hasField("PVCDO")) { } else if (deck.hasField("PVCDO")) {
@ -90,7 +90,7 @@ namespace Opm
// Gas PVT // Gas PVT
if (phase_usage_.phase_used[Vapour]) { if (phase_usage_.phase_used[Vapour]) {
if (deck.hasField("PVDG")) { if (deck.hasField("PVDG")) {
props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtDead(deck.getPVDG().pvdg_)); props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtDeadSpline(deck.getPVDG().pvdg_));
} else if (deck.hasField("PVTG")) { } else if (deck.hasField("PVTG")) {
props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtLiveGas(deck.getPVTG().pvtg_)); props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtLiveGas(deck.getPVTG().pvtg_));
} else { } else {

50
opm/core/fluid/blackoil/SinglePvtDead.cpp → opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <opm/core/fluid/blackoil/SinglePvtDead.hpp> #include <opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp>
#include <opm/core/utility/buildUniformMonotoneTable.hpp> #include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <algorithm> #include <algorithm>
@ -34,7 +34,7 @@ namespace Opm
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
/// Constructor /// Constructor
SinglePvtDead::SinglePvtDead(const table_t& pvd_table) SinglePvtDeadSpline::SinglePvtDeadSpline(const table_t& pvd_table)
{ {
const int region_number = 0; const int region_number = 0;
if (pvd_table.size() != 1) { if (pvd_table.size() != 1) {
@ -64,16 +64,16 @@ namespace Opm
} }
// Destructor // Destructor
SinglePvtDead::~SinglePvtDead() SinglePvtDeadSpline::~SinglePvtDeadSpline()
{ {
} }
void SinglePvtDead::mu(const int n, void SinglePvtDeadSpline::mu(const int n,
const double* p, const double* p,
const double* /*z*/, const double* /*z*/,
double* output_mu) const double* output_mu) const
{ {
// #pragma omp parallel for // #pragma omp parallel for
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
@ -81,10 +81,10 @@ namespace Opm
} }
} }
void SinglePvtDead::B(const int n, void SinglePvtDeadSpline::B(const int n,
const double* p, const double* p,
const double* /*z*/, const double* /*z*/,
double* output_B) const double* output_B) const
{ {
// #pragma omp parallel for // #pragma omp parallel for
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
@ -92,11 +92,11 @@ namespace Opm
} }
} }
void SinglePvtDead::dBdp(const int n, void SinglePvtDeadSpline::dBdp(const int n,
const double* p, const double* p,
const double* /*z*/, const double* /*z*/,
double* output_B, double* output_B,
double* output_dBdp) const double* output_dBdp) const
{ {
B(n, p, 0, output_B); B(n, p, 0, output_B);
// #pragma omp parallel for // #pragma omp parallel for
@ -107,19 +107,19 @@ namespace Opm
} }
void SinglePvtDead::R(const int n, void SinglePvtDeadSpline::R(const int n,
const double* /*p*/, const double* /*p*/,
const double* /*z*/, const double* /*z*/,
double* output_R) const double* output_R) const
{ {
std::fill(output_R, output_R + n, 0.0); std::fill(output_R, output_R + n, 0.0);
} }
void SinglePvtDead::dRdp(const int n, void SinglePvtDeadSpline::dRdp(const int n,
const double* /*p*/, const double* /*p*/,
const double* /*z*/, const double* /*z*/,
double* output_R, double* output_R,
double* output_dRdp) const double* output_dRdp) const
{ {
std::fill(output_R, output_R + n, 0.0); std::fill(output_R, output_R + n, 0.0);
std::fill(output_dRdp, output_dRdp + n, 0.0); std::fill(output_dRdp, output_dRdp + n, 0.0);

12
opm/core/fluid/blackoil/SinglePvtDead.hpp → opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp
View File

@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPM_SINGLEPVTDEAD_HEADER_INCLUDED #ifndef OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED
#define OPM_SINGLEPVTDEAD_HEADER_INCLUDED #define OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp> #include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
@ -33,13 +33,13 @@ namespace Opm
/// are expected to be of size n and n*num_phases, respectively. /// are expected to be of size n and n*num_phases, respectively.
/// Output arrays shall be of size n, and must be valid before /// Output arrays shall be of size n, and must be valid before
/// calling the method. /// calling the method.
class SinglePvtDead : public SinglePvtInterface class SinglePvtDeadSpline : public SinglePvtInterface
{ {
public: public:
typedef std::vector<std::vector<std::vector<double> > > table_t; typedef std::vector<std::vector<std::vector<double> > > table_t;
SinglePvtDead(const table_t& pvd_table); SinglePvtDeadSpline(const table_t& pvd_table);
virtual ~SinglePvtDead(); virtual ~SinglePvtDeadSpline();
/// Viscosity as a function of p and z. /// Viscosity as a function of p and z.
virtual void mu(const int n, virtual void mu(const int n,
@ -80,5 +80,5 @@ namespace Opm
} }
#endif // OPM_SINGLEPVTDEAD_HEADER_INCLUDED #endif // OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED