Skip to content

Commit

Permalink
LiveOilPvt: put initFromState in separate compile unit
Browse files Browse the repository at this point in the history 
thus encapsulating EclipseState, Schedule and TableManager
  • Loading branch information
@akva2
akva2 committed Dec 22, 2022
1 parent fc6f6e7 commit 857c5c4
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 164 deletions.
1 change: 1 addition & 0 deletions CMakeLists_files.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ if(ENABLE_ECL_INPUT)
src/opm/material/fluidsystems/blackoilpvt/DryGasPvt.cpp
src/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.cpp
src/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.cpp
src/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.cpp
)


Expand Down
171 changes: 7 additions & 164 deletions opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
#include <opm/material/common/UniformXTabulated2DFunction.hpp>
#include <opm/material/common/Tabulated1DFunction.hpp>

namespace Opm {

#if HAVE_ECL_INPUT
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/Schedule/OilVaporizationProperties.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
class EclipseState;
class Schedule;
class SimpleTable;
#endif

namespace Opm {
/*!
* \brief This class represents the Pressure-Volume-Temperature relations of the oil phas
* with dissolved gas.
Expand Down Expand Up @@ -88,170 +88,13 @@ class LiveOilPvt
/*!
* \brief Initialize the oil parameters via the data specified by the PVTO ECL keyword.
*/
void initFromState(const EclipseState& eclState, const Schedule& schedule)
{
const auto& pvtoTables = eclState.getTableManager().getPvtoTables();
const auto& densityTable = eclState.getTableManager().getDensityTable();

assert(pvtoTables.size() == densityTable.size());

size_t numRegions = pvtoTables.size();
setNumRegions(numRegions);

for (unsigned regionIdx = 0; regionIdx < numRegions; ++ regionIdx) {
Scalar rhoRefO = densityTable[regionIdx].oil;
Scalar rhoRefG = densityTable[regionIdx].gas;
Scalar rhoRefW = densityTable[regionIdx].water;

setReferenceDensities(regionIdx, rhoRefO, rhoRefG, rhoRefW);
}

// initialize the internal table objects
for (unsigned regionIdx = 0; regionIdx < numRegions; ++ regionIdx) {
const auto& pvtoTable = pvtoTables[regionIdx];

const auto& saturatedTable = pvtoTable.getSaturatedTable();
assert(saturatedTable.numRows() > 1);

auto& oilMu = oilMuTable_[regionIdx];
auto& satOilMu = saturatedOilMuTable_[regionIdx];
auto& invOilB = inverseOilBTable_[regionIdx];
auto& invSatOilB = inverseSaturatedOilBTable_[regionIdx];
auto& gasDissolutionFac = saturatedGasDissolutionFactorTable_[regionIdx];
std::vector<Scalar> invSatOilBArray;
std::vector<Scalar> satOilMuArray;

// extract the table for the gas dissolution and the oil formation volume factors
for (unsigned outerIdx = 0; outerIdx < saturatedTable.numRows(); ++ outerIdx) {
Scalar Rs = saturatedTable.get("RS", outerIdx);
Scalar BoSat = saturatedTable.get("BO", outerIdx);
Scalar muoSat = saturatedTable.get("MU", outerIdx);

satOilMuArray.push_back(muoSat);
invSatOilBArray.push_back(1.0/BoSat);

invOilB.appendXPos(Rs);
oilMu.appendXPos(Rs);

assert(invOilB.numX() == outerIdx + 1);
assert(oilMu.numX() == outerIdx + 1);

const auto& underSaturatedTable = pvtoTable.getUnderSaturatedTable(outerIdx);
size_t numRows = underSaturatedTable.numRows();
for (unsigned innerIdx = 0; innerIdx < numRows; ++ innerIdx) {
Scalar po = underSaturatedTable.get("P", innerIdx);
Scalar Bo = underSaturatedTable.get("BO", innerIdx);
Scalar muo = underSaturatedTable.get("MU", innerIdx);

invOilB.appendSamplePoint(outerIdx, po, 1.0/Bo);
oilMu.appendSamplePoint(outerIdx, po, muo);
}
}

// update the tables for the formation volume factor and for the gas
// dissolution factor of saturated oil
{
const auto& tmpPressureColumn = saturatedTable.getColumn("P");
const auto& tmpGasSolubilityColumn = saturatedTable.getColumn("RS");

invSatOilB.setXYContainers(tmpPressureColumn, invSatOilBArray);
satOilMu.setXYContainers(tmpPressureColumn, satOilMuArray);
gasDissolutionFac.setXYContainers(tmpPressureColumn, tmpGasSolubilityColumn);
}

updateSaturationPressure_(regionIdx);
// make sure to have at least two sample points per Rs value
for (unsigned xIdx = 0; xIdx < invOilB.numX(); ++xIdx) {
// a single sample point is definitely needed
assert(invOilB.numY(xIdx) > 0);

// everything is fine if the current table has two or more sampling points
// for a given mole fraction
if (invOilB.numY(xIdx) > 1)
continue;

// find the master table which will be used as a template to extend the
// current line. We define master table as the first table which has values
// for undersaturated oil...
size_t masterTableIdx = xIdx + 1;
for (; masterTableIdx < saturatedTable.numRows(); ++masterTableIdx)
{
if (pvtoTable.getUnderSaturatedTable(masterTableIdx).numRows() > 1)
break;
}

if (masterTableIdx >= saturatedTable.numRows())
throw std::runtime_error("PVTO tables are invalid: The last table must exhibit at least one "
"entry for undersaturated oil!");

// extend the current table using the master table.
extendPvtoTable_(regionIdx,
xIdx,
pvtoTable.getUnderSaturatedTable(xIdx),
pvtoTable.getUnderSaturatedTable(masterTableIdx));
}
}

vapPar2_ = 0.0;
const auto& oilVap = schedule[0].oilvap();
if (oilVap.getType() == OilVaporizationProperties::OilVaporization::VAPPARS) {
vapPar2_ = oilVap.vap2();
}

initEnd();
}
void initFromState(const EclipseState& eclState, const Schedule& schedule);

private:
void extendPvtoTable_(unsigned regionIdx,
unsigned xIdx,
const SimpleTable& curTable,
const SimpleTable& masterTable)
{
std::vector<double> pressuresArray = curTable.getColumn("P").vectorCopy();
std::vector<double> oilBArray = curTable.getColumn("BO").vectorCopy();
std::vector<double> oilMuArray = curTable.getColumn("MU").vectorCopy();

auto& invOilB = inverseOilBTable_[regionIdx];
auto& oilMu = oilMuTable_[regionIdx];

for (unsigned newRowIdx = 1; newRowIdx < masterTable.numRows(); ++ newRowIdx) {
const auto& pressureColumn = masterTable.getColumn("P");
const auto& BOColumn = masterTable.getColumn("BO");
const auto& viscosityColumn = masterTable.getColumn("MU");

// compute the oil pressure for the new entry
Scalar diffPo = pressureColumn[newRowIdx] - pressureColumn[newRowIdx - 1];
Scalar newPo = pressuresArray.back() + diffPo;

// calculate the compressibility of the master table
Scalar B1 = BOColumn[newRowIdx];
Scalar B2 = BOColumn[newRowIdx - 1];
Scalar x = (B1 - B2)/( (B1 + B2)/2.0 );

// calculate the oil formation volume factor which exhibits the same
// compressibility for the new pressure
Scalar newBo = oilBArray.back()*(1.0 + x/2.0)/(1.0 - x/2.0);

// calculate the "viscosibility" of the master table
Scalar mu1 = viscosityColumn[newRowIdx];
Scalar mu2 = viscosityColumn[newRowIdx - 1];
Scalar xMu = (mu1 - mu2)/( (mu1 + mu2)/2.0 );

// calculate the oil formation volume factor which exhibits the same
// compressibility for the new pressure
Scalar newMuo = oilMuArray.back()*(1.0 + xMu/2)/(1.0 - xMu/2.0);

// append the new values to the arrays which we use to compute the additional
// values ...
pressuresArray.push_back(newPo);
oilBArray.push_back(newBo);
oilMuArray.push_back(newMuo);

// ... and register them with the internal table objects
invOilB.appendSamplePoint(xIdx, newPo, 1.0/newBo);
oilMu.appendSamplePoint(xIdx, newPo, newMuo);
}
}
const SimpleTable& masterTable);

public:
#endif // HAVE_ECL_INPUT
Expand Down
1 change: 1 addition & 0 deletions opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

#if HAVE_ECL_INPUT
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/input/eclipse/Schedule/OilVaporizationProperties.hpp>
#endif
Expand Down
Loading

0 comments on commit 857c5c4

Please sign in to comment.