From c920c83c76bf0559712d79dde23f6372bd06c2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 27 Aug 2012 14:00:12 +0200 Subject: [PATCH] Renamed class SinglePvtDead -> SinglePvtDeadSpline. --- Makefile.am | 4 +- .../fluid/blackoil/BlackoilPvtProperties.cpp | 6 +-- ...glePvtDead.cpp => SinglePvtDeadSpline.cpp} | 50 +++++++++---------- ...glePvtDead.hpp => SinglePvtDeadSpline.hpp} | 12 ++--- 4 files changed, 36 insertions(+), 36 deletions(-) rename opm/core/fluid/blackoil/{SinglePvtDead.cpp => SinglePvtDeadSpline.cpp} (68%) rename opm/core/fluid/blackoil/{SinglePvtDead.hpp => SinglePvtDeadSpline.hpp} (90%) diff --git a/Makefile.am b/Makefile.am index 712d7c65..c30a6544 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ opm/core/fluid/RockFromDeck.cpp \ opm/core/fluid/SaturationPropsBasic.cpp \ opm/core/fluid/SaturationPropsFromDeck.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/SinglePvtLiveGas.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/BlackoilPvtProperties.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/SinglePvtLiveGas.hpp \ opm/core/fluid/blackoil/SinglePvtLiveOil.hpp \ diff --git a/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp b/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp index 9fdaf445..c86724eb 100644 --- a/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp +++ b/opm/core/fluid/blackoil/BlackoilPvtProperties.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -78,7 +78,7 @@ namespace Opm // Oil PVT if (phase_usage_.phase_used[Liquid]) { 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")) { props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtLiveOil(deck.getPVTO().pvto_)); } else if (deck.hasField("PVCDO")) { @@ -90,7 +90,7 @@ namespace Opm // Gas PVT if (phase_usage_.phase_used[Vapour]) { 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")) { props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtLiveGas(deck.getPVTG().pvtg_)); } else { diff --git a/opm/core/fluid/blackoil/SinglePvtDead.cpp b/opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp similarity index 68% rename from opm/core/fluid/blackoil/SinglePvtDead.cpp rename to opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp index 3d1a2740..c8e06656 100644 --- a/opm/core/fluid/blackoil/SinglePvtDead.cpp +++ b/opm/core/fluid/blackoil/SinglePvtDeadSpline.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include @@ -34,7 +34,7 @@ namespace Opm //------------------------------------------------------------------------- /// Constructor - SinglePvtDead::SinglePvtDead(const table_t& pvd_table) + SinglePvtDeadSpline::SinglePvtDeadSpline(const table_t& pvd_table) { const int region_number = 0; if (pvd_table.size() != 1) { @@ -64,16 +64,16 @@ namespace Opm } // Destructor - SinglePvtDead::~SinglePvtDead() + SinglePvtDeadSpline::~SinglePvtDeadSpline() { } - void SinglePvtDead::mu(const int n, - const double* p, - const double* /*z*/, - double* output_mu) const + void SinglePvtDeadSpline::mu(const int n, + const double* p, + const double* /*z*/, + double* output_mu) const { // #pragma omp parallel for for (int i = 0; i < n; ++i) { @@ -81,10 +81,10 @@ namespace Opm } } - void SinglePvtDead::B(const int n, - const double* p, - const double* /*z*/, - double* output_B) const + void SinglePvtDeadSpline::B(const int n, + const double* p, + const double* /*z*/, + double* output_B) const { // #pragma omp parallel for for (int i = 0; i < n; ++i) { @@ -92,11 +92,11 @@ namespace Opm } } - void SinglePvtDead::dBdp(const int n, - const double* p, - const double* /*z*/, - double* output_B, - double* output_dBdp) const + void SinglePvtDeadSpline::dBdp(const int n, + const double* p, + const double* /*z*/, + double* output_B, + double* output_dBdp) const { B(n, p, 0, output_B); // #pragma omp parallel for @@ -107,19 +107,19 @@ namespace Opm } - void SinglePvtDead::R(const int n, - const double* /*p*/, - const double* /*z*/, - double* output_R) const + void SinglePvtDeadSpline::R(const int n, + const double* /*p*/, + const double* /*z*/, + double* output_R) const { std::fill(output_R, output_R + n, 0.0); } - void SinglePvtDead::dRdp(const int n, - const double* /*p*/, - const double* /*z*/, - double* output_R, - double* output_dRdp) const + void SinglePvtDeadSpline::dRdp(const int n, + const double* /*p*/, + const double* /*z*/, + double* output_R, + double* output_dRdp) const { std::fill(output_R, output_R + n, 0.0); std::fill(output_dRdp, output_dRdp + n, 0.0); diff --git a/opm/core/fluid/blackoil/SinglePvtDead.hpp b/opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp similarity index 90% rename from opm/core/fluid/blackoil/SinglePvtDead.hpp rename to opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp index 137e2e30..588ae554 100644 --- a/opm/core/fluid/blackoil/SinglePvtDead.hpp +++ b/opm/core/fluid/blackoil/SinglePvtDeadSpline.hpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#ifndef OPM_SINGLEPVTDEAD_HEADER_INCLUDED -#define OPM_SINGLEPVTDEAD_HEADER_INCLUDED +#ifndef OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED +#define OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED #include @@ -33,13 +33,13 @@ namespace Opm /// are expected to be of size n and n*num_phases, respectively. /// Output arrays shall be of size n, and must be valid before /// calling the method. - class SinglePvtDead : public SinglePvtInterface + class SinglePvtDeadSpline : public SinglePvtInterface { public: typedef std::vector > > table_t; - SinglePvtDead(const table_t& pvd_table); - virtual ~SinglePvtDead(); + SinglePvtDeadSpline(const table_t& pvd_table); + virtual ~SinglePvtDeadSpline(); /// Viscosity as a function of p and z. virtual void mu(const int n, @@ -80,5 +80,5 @@ namespace Opm } -#endif // OPM_SINGLEPVTDEAD_HEADER_INCLUDED +#endif // OPM_SINGLEPVTDEADSPLINE_HEADER_INCLUDED