OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

DeadOilConstCompr: Re-adjust Whitespace and Comments

Browse Source 
No functional changes.
This commit is contained in:
Bård Skaflestad 2018-11-13 22:39:13 +01:00
parent 3c3dfb3dc1
commit 5167299797
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLPvtOil.cpp vendored
View File

@ -211,12 +211,12 @@ public:
} }
private: private:
double po_ref_ { 1.0 }; double po_ref_ { 1.0 };
double fvf_ { 1.0 }; // B double fvf_ { 1.0 }; // B
double visc_ { 1.0 }; // mu double visc_ { 1.0 }; // mu
double Co_ { 1.0 }; double Co_ { 1.0 };
double cv_ { 0.0 }; // Cv double cv_ { 0.0 }; // Cv
double rhoS_ { 0.0 }; double rhoS_ { 0.0 };
double recipFvf(const double po) const double recipFvf(const double po) const
{ {
@ -254,20 +254,20 @@ private:
}; };
DeadOilConstCompr::DeadOilConstCompr(ElemIt xBegin, DeadOilConstCompr::DeadOilConstCompr(ElemIt xBegin,
ElemIt xEnd, ElemIt xEnd,
const ConvertUnits& convert, const ConvertUnits& convert,
std::vector<ElemIt>& colIt) std::vector<ElemIt>& colIt)
{ {
// Recall: Table is // Recall: Table is
// //
// [ Po, Bo, Co, mu_o, Cv ] // [ Po, Bo, Co, mu_o, Cv ]
// //
// xBegin is Pw, colIt is remaining four columns. // xBegin is Po, colIt is remaining four columns.
this->fvf_ = convert.column[0](*colIt[0]); // Bo this->fvf_ = convert.column[0](*colIt[0]); // Bo
this->Co_ = convert.column[1](*colIt[1]); // Co this->Co_ = convert.column[1](*colIt[1]); // Co
this->visc_ = convert.column[2](*colIt[2]); // mu_o this->visc_ = convert.column[2](*colIt[2]); // mu_o
this->cv_ = convert.column[3](*colIt[3]); // Cw - Cv this->cv_ = convert.column[3](*colIt[3]); // Cv
// Honour requirement that constructor advances column iterators. // Honour requirement that constructor advances column iterators.
const auto N = std::distance(xBegin, xEnd); const auto N = std::distance(xBegin, xEnd);
@ -289,7 +289,6 @@ DeadOilConstCompr::DeadOilConstCompr(ElemIt xBegin,
} }
} }
// ===================================================================== // =====================================================================
class DeadOil : public PVxOBase class DeadOil : public PVxOBase
@ -416,7 +415,7 @@ private:
namespace { namespace {
std::vector<std::unique_ptr<PVxOBase>> std::vector<std::unique_ptr<PVxOBase>>
createDeadOil(const ::Opm::ECLPropTableRawData& raw, createDeadOil(const ::Opm::ECLPropTableRawData& raw,
const bool const_compr, const bool const_compr,
const int usys) const int usys)
{ {
using PVTInterp = std::unique_ptr<PVxOBase>; using PVTInterp = std::unique_ptr<PVxOBase>;
@ -513,7 +512,7 @@ namespace {
std::vector<std::unique_ptr<PVxOBase>> std::vector<std::unique_ptr<PVxOBase>>
createPVTFunction(const ::Opm::ECLPropTableRawData& raw, createPVTFunction(const ::Opm::ECLPropTableRawData& raw,
const bool const_compr, const bool const_compr,
const int usys) const int usys)
{ {
if (raw.numPrimary == 0) { if (raw.numPrimary == 0) {
@ -622,7 +621,7 @@ private:
Opm::ECLPVT::Oil::Impl:: Opm::ECLPVT::Oil::Impl::
Impl(const ECLPropTableRawData& raw, Impl(const ECLPropTableRawData& raw,
const int usys, const int usys,
const bool const_compr, const bool const_compr,
std::vector<double> rhoS) std::vector<double> rhoS)
: eval_(createPVTFunction(raw, const_compr, usys)) : eval_(createPVTFunction(raw, const_compr, usys))
, rhoS_(std::move(rhoS)) , rhoS_(std::move(rhoS))