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

Merge dev into feature-analysis-plots-initial

Browse Source
This commit is contained in:
Jacob Støren
2020-03-31 13:13:47 +02:00
parent 8167167bc9 ead29ef70f
commit adb06f229c
288 changed files with 44732 additions and 2326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@@ -323,10 +323,21 @@ void RimWellAllocationPlot::updateFromWell()
curveDepthValues.insert( curveDepthValues.begin(), curveDepthValues[0] );
accFlow.insert( accFlow.begin(), 0.0 );
if ( brIdx == 0 && !accFlow.empty() ) // Add fictitious point to 0 for first branch
if ( m_flowType == ACCUMULATED && brIdx == 0 && !accFlow.empty() ) // Add fictitious point to -1 for
// first branch
{
accFlow.push_back( accFlow.back() );
curveDepthValues.push_back( 0.0 );
curveDepthValues.push_back( -1.0 );
}
// Shift the "bars" to make connection number tick at the midpoint of the constant value
// when showing in flow rate
if ( m_flowType == INFLOW )
{
for ( double& connNum : curveDepthValues )
{
connNum += 0.5;
}
}
}
else if ( depthType == RiaDefines::PSEUDO_LENGTH || depthType == RiaDefines::TRUE_VERTICAL_DEPTH )
@@ -676,6 +687,14 @@ int RimWellAllocationPlot::timeStep()
return m_timeStep();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellAllocationPlot::FlowType RimWellAllocationPlot::flowType()
{
return m_flowType();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h
View File

@@ -81,6 +81,7 @@ public:
caf::PdmObject* plotLegend();
RimEclipseResultCase* rimCase();
int timeStep();
FlowType flowType();
QString wellName() const;

2
ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
View File

@@ -119,7 +119,7 @@ QString RimWellFlowRateCurve::wellLogChannelUiName() const
//--------------------------------------------------------------------------------------------------
QString RimWellFlowRateCurve::wellLogChannelUnits() const
{
return RiaWellLogUnitTools::noUnitString();
return RiaWellLogUnitTools<double>::noUnitString();
}
//--------------------------------------------------------------------------------------------------