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

#4195 Grid Cross Plot: Adjustments

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-12 22:49:31 +01:00
parent 0527fd8030
commit 75688703d4
7 changed files with 225 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/ReservoirDataModel/RigEquil.cpp
View File

@@ -29,8 +29,8 @@ RigEquil::RigEquil(double datumDepth,
double waterOilContactCapillaryPressure,
double gasOilContactDepth,
double gasOilContactCapillaryPressure,
bool liveOilInitConstantRs,
bool wetGasInitConstantRv,
int liveOilInitConstantRs,
int wetGasInitConstantRv,
int initializationTargetAccuracy)
: datum_depth(datumDepth)
, datum_depth_ps(datumDepthPressure)
@@ -74,12 +74,12 @@ double RigEquil::gasOilContactCapillaryPressure() const
return this->gas_oil_contact_capillary_pressure;
}
bool RigEquil::liveOilInitConstantRs() const
int RigEquil::liveOilInitConstantRs() const
{
return this->live_oil_init_proc;
}
bool RigEquil::wetGasInitConstantRv() const
int RigEquil::wetGasInitConstantRv() const
{
return this->wet_gas_init_proc;
}
@@ -89,6 +89,32 @@ int RigEquil::initializationTargetAccuracy() const
return this->init_target_accuracy;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigEquil RigEquil::defaultObject()
{
double datumDepth = 0.0;
double datuDepthPressure = 0.0;
double waterOilContactDepth = 0.0;
double waterOilContactCapillaryPressure = 0.0;
double gasOilContactDepth = 0.0;
double gasOilContactCapillaryPressure = 0.0;
int liveOilInitConstantRs = -1;
int wetGasInitConstantRv = -1;
int initializationTargetAccuracy = -5;
return RigEquil(datumDepth,
datuDepthPressure,
waterOilContactDepth,
waterOilContactCapillaryPressure,
gasOilContactDepth,
gasOilContactCapillaryPressure,
liveOilInitConstantRs,
wetGasInitConstantRv,
initializationTargetAccuracy);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -100,8 +126,8 @@ RigEquil RigEquil::parseString(const QString& keywordData)
double waterOilContactCapillaryPressure = 0.0;
double gasOilContactDepth = 0.0;
double gasOilContactCapillaryPressure = 0.0;
bool liveOilInitConstantRs = false;
bool wetGasInitConstantRv = false;
int liveOilInitConstantRs = 0;
int wetGasInitConstantRv = 0;
int initializationTargetAccuracy = -5;
QString line(keywordData);
@@ -135,11 +161,11 @@ RigEquil RigEquil::parseString(const QString& keywordData)
}
if (items.size() > 6)
{
liveOilInitConstantRs = items.at(6).toInt() > 0 ? true : false;
liveOilInitConstantRs = items.at(6).toInt();
}
if (items.size() > 7)
{
wetGasInitConstantRv = items.at(7).toInt() > 0 ? true : false;
wetGasInitConstantRv = items.at(7).toInt();
}
if (items.size() > 8)
{