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

Use index to map to EQUILNUM

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-14 18:27:32 +01:00
parent 75688703d4
commit 78940795a8
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp
View File

@@ -164,10 +164,10 @@ QList<caf::PdmOptionItemInfo> RimPlotAxisAnnotation::calculateValueOptions(const
} }
else if (fieldNeedingOptions == &m_equilNum) else if (fieldNeedingOptions == &m_equilNum)
{ {
for (const auto& eq : equilItems()) for (int i = 0; i < equilItems().size(); i++)
{ {
QString uiText = QString("%1").arg(eq.liveOilInitConstantRs()); QString uiText = QString("%1").arg(i+1);
options.push_back(caf::PdmOptionItemInfo(uiText, eq.liveOilInitConstantRs())); options.push_back(caf::PdmOptionItemInfo(uiText, i));
} }
} }
@@ -200,12 +200,11 @@ void RimPlotAxisAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigEquil RimPlotAxisAnnotation::selectedItem() const RigEquil RimPlotAxisAnnotation::selectedItem() const
{ {
for (auto eq : equilItems()) int index = m_equilNum() -1;
if (index < equilItems().size())
{ {
if (eq.liveOilInitConstantRs() == m_equilNum()) return equilItems()[index];
{
return eq;
}
} }
return RigEquil::defaultObject(); return RigEquil::defaultObject();

16
ApplicationCode/ReservoirDataModel/RigEquil.cpp
View File

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

16
ApplicationCode/ReservoirDataModel/RigEquil.h
View File

@@ -34,8 +34,8 @@ public:
double waterOilContactCapillaryPressure, double waterOilContactCapillaryPressure,
double gasOilContactDepth, double gasOilContactDepth,
double gasOilContactCapillaryPressure, double gasOilContactCapillaryPressure,
int liveOilInitConstantRs, bool liveOilInitConstantRs,
int wetGasInitConstantRv, bool wetGasInitConstantRv,
int initializationTargetAccuracy); int initializationTargetAccuracy);
double datumDepth() const; double datumDepth() const;
@@ -45,9 +45,9 @@ public:
double gasOilContactDepth() const; double gasOilContactDepth() const;
double gasOilContactCapillaryPressure() const; double gasOilContactCapillaryPressure() const;
int liveOilInitConstantRs() const; bool liveOilInitConstantRs() const;
int wetGasInitConstantRv() const; bool wetGasInitConstantRv() const;
int initializationTargetAccuracy() const; int initializationTargetAccuracy() const;
static RigEquil defaultObject(); static RigEquil defaultObject();
static RigEquil parseString(const QString& keywordData); static RigEquil parseString(const QString& keywordData);
@@ -60,7 +60,7 @@ private:
double gas_oil_contact_depth; double gas_oil_contact_depth;
double gas_oil_contact_capillary_pressure; double gas_oil_contact_capillary_pressure;
int live_oil_init_proc; bool live_oil_init_proc;
int wet_gas_init_proc; bool wet_gas_init_proc;
int init_target_accuracy; int init_target_accuracy;
}; };