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

Flux Calculator: Use 'phaseSaturation' Result Set Query

Browse Source 
This simplifies the implementation of the 'phaseProperties' member
function and, in particular, restores the original code symmetry
amongst the individual phase cases.
This commit is contained in:
Bård Skaflestad
2018-11-13 22:59:53 +01:00
parent c15432d1b2
commit daa6604e3d
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLFluxCalc.cpp vendored
View File

@@ -18,16 +18,20 @@
*/ */
#include <opm/utility/ECLFluxCalc.hpp> #include <opm/utility/ECLFluxCalc.hpp>
#include <opm/utility/ECLPvtCommon.hpp> #include <opm/utility/ECLPvtCommon.hpp>
#include <opm/utility/ECLUnitHandling.hpp>
#include <opm/utility/ECLSaturationFunc.hpp> #include <opm/utility/ECLSaturationFunc.hpp>
#include <opm/utility/ECLUnitHandling.hpp>
#include <opm/utility/imported/Units.hpp> #include <opm/utility/imported/Units.hpp>
#include <algorithm> #include <algorithm>
#include <cstddef>
#include <exception> #include <exception>
#include <functional> #include <functional>
#include <iterator> #include <iterator>
#include <stdexcept> #include <stdexcept>
#include <string>
#include <utility> #include <utility>
#include <ert/ecl/ecl_kw_magic.h> #include <ert/ecl/ecl_kw_magic.h>
@@ -174,7 +178,6 @@ namespace {
}; };
} }
} }
} // Anonymous } // Anonymous
namespace Opm namespace Opm
@@ -342,41 +345,18 @@ namespace Opm
// Allocate space for storing the cell values. // Allocate space for storing the cell values.
dyn_data.density.assign(this->graph_.numCells(), 0.0); dyn_data.density.assign(this->graph_.numCells(), 0.0);
// Extract phase saturation.
dyn_data.saturation =
::Opm::phaseSaturation(this->graph_, rstrt, phase);
switch (phase) { switch (phase) {
case ECLPhaseIndex::Aqua: case ECLPhaseIndex::Aqua:
dyn_data.saturation = this->graph_.rawLinearisedCellData<double>(rstrt, "SWAT");
return this->watPVT(std::move(dyn_data)); return this->watPVT(std::move(dyn_data));
case ECLPhaseIndex::Liquid: case ECLPhaseIndex::Liquid:
dyn_data.saturation = this->graph_.rawLinearisedCellData<double>(rstrt, "SOIL"); return this->oilPVT(rstrt, std::move(dyn_data));
if (!dyn_data.saturation.empty()) {
return this->oilPVT(rstrt, std::move(dyn_data));
} else {
// SOIL vector not provided. Compute from SWAT and/or SGAS.
// may read two times
auto sw = this->graph_.rawLinearisedCellData<double>(rstrt, "SWAT");
auto sg = this->graph_.rawLinearisedCellData<double>(rstrt, "SGAS");
std::vector<double>& so = dyn_data.saturation;
so.assign(this->graph_.numCells(), 1.0);
auto adjust_So_for_other_phase =
[&so](const std::vector<double>& s)
{
std::transform(std::begin(so), std::end(so),
std::begin(s) ,
std::begin(so), std::minus<double>());
};
if (sg.size() == this->graph_.numCells()) {
adjust_So_for_other_phase(sg);
}
if (sw.size() == this->graph_.numCells()) {
adjust_So_for_other_phase(sw);
}
return this->oilPVT(rstrt, std::move(dyn_data));
}
case ECLPhaseIndex::Vapour: case ECLPhaseIndex::Vapour:
dyn_data.saturation = this->graph_.rawLinearisedCellData<double>(rstrt, "SGAS");
return this->gasPVT(rstrt, std::move(dyn_data)); return this->gasPVT(rstrt, std::move(dyn_data));
} }