OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

#13124 Show SWAT/SGAS instead of Saturation

Browse Source
This commit is contained in:
Magne Sjaastad
2025-11-05 09:06:53 +01:00
parent a693aa6d09
commit 7e7e7e0528
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ReservoirDataModel/RigFlowDiagDefines.h
+3
View File
@@ -46,6 +46,9 @@ struct RelPermCurve
IMBIBITION
};
bool isWaterCurve() const { return ( ident == KRW || ident == KROW || ident == PCOW ); }
bool isGasCurve() const { return ( ident == KRG || ident == KROG || ident == PCOG ); }
Ident ident;
std::string name;
EpsMode epsMode;
ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
+10 -24
View File
@@ -643,30 +643,10 @@ QString RiuRelativePermeabilityPlotPanel::determineXAxisTitleFromCurveCollection
bool sawWater = false;
bool sawGas = false;
for ( RigFlowDiagDefines::RelPermCurve curve : curveArr )
for ( const RigFlowDiagDefines::RelPermCurve& curve : curveArr )
{
switch ( curve.ident )
{
case RigFlowDiagDefines::RelPermCurve::KRW:
sawWater = true;
break;
case RigFlowDiagDefines::RelPermCurve::KROW:
sawWater = true;
break;
case RigFlowDiagDefines::RelPermCurve::PCOW:
sawWater = true;
break;
case RigFlowDiagDefines::RelPermCurve::KRG:
sawGas = true;
break;
case RigFlowDiagDefines::RelPermCurve::KROG:
sawGas = true;
break;
case RigFlowDiagDefines::RelPermCurve::PCOG:
sawGas = true;
break;
}
if ( curve.isWaterCurve() ) sawWater = true;
if ( curve.isGasCurve() ) sawGas = true;
}
QString title = "";
@@ -792,7 +772,13 @@ QString RiuRelativePermeabilityPlotPanel::asciiDataForUiSelectedCurves() const
if ( icurve > 0 ) outTxt += "\t";
const RigFlowDiagDefines::RelPermCurve& curve = selectedCurves[icurve];
outTxt += "Saturation";
if ( curve.isWaterCurve() )
outTxt += "SWAT";
else if ( curve.isGasCurve() )
outTxt += "SGAS";
else
outTxt += "Saturation";
outTxt += "\t";
outTxt += curve.name.c_str();
}