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

Upgraded opm-flowdiagnostics-applications to cf8a5d2381776a8887d61f825b40f03b1d1cc4b0

Browse Source
This commit is contained in:
Jacob Støren
2017-12-05 13:50:26 +01:00
parent 899a226a38
commit 2a3f82875c
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ResInsightVersion.cmake
View File

@@ -14,7 +14,7 @@ set(ERT_GITHUB_SHA "2e36798b43daf18c112b91aa3febbf2fccd4a95f")
set(OPM_FLOWDIAGNOSTICS_SHA "7e2be931d430796ed42efcfb5c6b67a8d5962f7f")
# https://github.com/OPM/opm-flowdiagnostics-applications
set(OPM_FLOWDIAGNOSTICS_APPLICATIONS_SHA "cd614100f3d5b8fcf1fd783e929630f11251682e")
set(OPM_FLOWDIAGNOSTICS_APPLICATIONS_SHA "cf8a5d2381776a8887d61f825b40f03b1d1cc4b0")
# https://github.com/OPM/opm-parser/blob/master/opm/parser/eclipse/Units/Units.hpp
# This file was moved from opm-core to opm-parser october 2016

44
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLPvtCurveCollection.cpp vendored
View File

@@ -168,11 +168,11 @@ namespace {
if (phase == Opm::ECLPhaseIndex::Liquid) {
// Oil FVF. First column is pressure, second column is Bo.
const auto& cvrt_x = Opm::ECLUnits::Convert::Pressure()
.from(usysFrom).to(usysTo);
auto cvrt_x = Opm::ECLUnits::Convert::Pressure();
cvrt_x.from(usysFrom).to(usysTo);
const auto& cvrt_y = Opm::ECLUnits::Convert::OilFVF()
.from(usysFrom).to(usysTo);
auto cvrt_y = Opm::ECLUnits::Convert::OilFVF();
cvrt_y.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}
@@ -183,20 +183,20 @@ namespace {
//
// Immiscible case identified by curve.size() <= 1.
const auto& cvrt_y = Opm::ECLUnits::Convert::GasFVF()
.from(usysFrom).to(usysTo);
auto cvrt_y = Opm::ECLUnits::Convert::GasFVF();
cvrt_y.from(usysFrom).to(usysTo);
if (curve.size() <= 1) {
// Immiscible Gas FVF. First column is Pg.
const auto& cvrt_x = Opm::ECLUnits::Convert::Pressure()
.from(usysFrom).to(usysTo);
auto cvrt_x = Opm::ECLUnits::Convert::Pressure();
cvrt_x.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}
// Miscible Gas FVF. First column is Rv.
const auto& cvrt_x = Opm::ECLUnits::Convert::VaporisedOilGasRatio()
.from(usysFrom).to(usysTo);
auto cvrt_x = Opm::ECLUnits::Convert::VaporisedOilGasRatio();
cvrt_x.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}
@@ -212,22 +212,22 @@ namespace {
// This is the viscosity curve. Second column is always viscosity
// irrespective of phase or miscible/immiscible fluids.
const auto& cvrt_y = Opm::ECLUnits::Convert::Viscosity()
.from(usysFrom).to(usysTo);
auto cvrt_y = Opm::ECLUnits::Convert::Viscosity();
cvrt_y.from(usysFrom).to(usysTo);
if ((phase == Opm::ECLPhaseIndex::Liquid) || (curve.size() <= 1)) {
// Graph is oil viscosity or immiscible gas viscosity. First
// column is pressure.
const auto& cvrt_x = Opm::ECLUnits::Convert::Pressure()
.from(usysFrom).to(usysTo);
auto cvrt_x = Opm::ECLUnits::Convert::Pressure();
cvrt_x.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}
// Miscible Gas viscosity. First column is Rv (vapourised oil/gas
// ratio).
const auto& cvrt_x = Opm::ECLUnits::Convert::VaporisedOilGasRatio()
.from(usysFrom).to(usysTo);
auto cvrt_x = Opm::ECLUnits::Convert::VaporisedOilGasRatio();
cvrt_x.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}
@@ -242,23 +242,23 @@ namespace {
(phase == Opm::ECLPhaseIndex::Vapour));
// First column is pressure (Po or Pg).
const auto& cvrt_x = Opm::ECLUnits::Convert::Pressure()
.from(usysFrom).to(usysTo);
auto cvrt_x = Opm::ECLUnits::Convert::Pressure();
cvrt_x.from(usysFrom).to(usysTo);
// Second column is Rs or Rv depending on 'phase'.
if (phase == Opm::ECLPhaseIndex::Liquid) {
// Saturated state curve for miscible oil. Second column is Rs
// (dissolved gas/oil ratio).
const auto& cvrt_y = Opm::ECLUnits::Convert::
DissolvedGasOilRatio().from(usysFrom).to(usysTo);
auto cvrt_y = Opm::ECLUnits::Convert::DissolvedGasOilRatio();
cvrt_y.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}
// Saturated state curve for miscible gas. Second column is Rv
// (vapourised oil/gas ratio).
const auto& cvrt_y = Opm::ECLUnits::Convert::
VaporisedOilGasRatio().from(usysFrom).to(usysTo);
auto cvrt_y = Opm::ECLUnits::Convert::VaporisedOilGasRatio();
cvrt_y.from(usysFrom).to(usysTo);
return convertCurve(std::move(curve), cvrt_x, cvrt_y);
}