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

Make it possible to exclude partial delta curves

Browse Source 
Make sure statistics curves are recomputed on flag change

When toggling "Discard Missing or Incomplete Realizations", make sure the statistics is recomputed and the ensemble plots updated.
This commit is contained in:
Magne Sjaastad
2024-11-15 12:37:22 +01:00
parent dbea0e2593
commit 9b6e441386
20 changed files with 184 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/UnitTests/RigTimeCurveHistoryMerger-Test.cpp
View File

@@ -56,7 +56,7 @@ TEST( RiaTimeHistoryCurveMergerTest, ExtractIntervalsWithSameTimeSteps )
RiaTimeHistoryCurveMerger interpolate;
interpolate.addCurveData( timeSteps, valuesA );
interpolate.addCurveData( timeSteps, valuesB );
interpolate.computeInterpolatedValues();
interpolate.computeInterpolatedValues( true );
auto interpolatedTimeSteps = interpolate.allXValues();
auto intervals = interpolate.validIntervalsForAllXValues();
@@ -84,7 +84,7 @@ TEST( RiaTimeHistoryCurveMergerTest, ExtractIntervalsWithSameTimeStepsOneComplet
RiaTimeHistoryCurveMerger interpolate;
interpolate.addCurveData( timeSteps, valuesA );
interpolate.addCurveData( timeSteps, valuesB );
interpolate.computeInterpolatedValues();
interpolate.computeInterpolatedValues( true );
auto interpolatedTimeSteps = interpolate.allXValues();
auto intervals = interpolate.validIntervalsForAllXValues();
@@ -112,7 +112,7 @@ TEST( RiaTimeHistoryCurveMergerTest, ExtractIntervalsWithSameTimeStepsBothComple
RiaTimeHistoryCurveMerger interpolate;
interpolate.addCurveData( timeSteps, valuesA );
interpolate.addCurveData( timeSteps, valuesB );
interpolate.computeInterpolatedValues();
interpolate.computeInterpolatedValues( true );
auto interpolatedTimeSteps = interpolate.allXValues();
auto intervals = interpolate.validIntervalsForAllXValues();
@@ -137,7 +137,7 @@ TEST( RiaTimeHistoryCurveMergerTest, OverlappintTimes )
RiaTimeHistoryCurveMerger interpolate;
interpolate.addCurveData( timeStepsA, valuesA );
interpolate.addCurveData( timeStepsB, valuesB );
interpolate.computeInterpolatedValues();
interpolate.computeInterpolatedValues( true );
EXPECT_EQ( 2, static_cast<int>( interpolate.curveCount() ) );
auto interpolatedTimeSteps = interpolate.allXValues();
@@ -154,7 +154,7 @@ TEST( RiaTimeHistoryCurveMergerTest, RobustUse )
{
{
RiaTimeHistoryCurveMerger curveMerger;
curveMerger.computeInterpolatedValues();
curveMerger.computeInterpolatedValues( true );
EXPECT_EQ( 0, static_cast<int>( curveMerger.allXValues().size() ) );
}
@@ -167,7 +167,7 @@ TEST( RiaTimeHistoryCurveMergerTest, RobustUse )
{
RiaTimeHistoryCurveMerger curveMerger;
curveMerger.addCurveData( timeStepsA, valuesA );
curveMerger.computeInterpolatedValues();
curveMerger.computeInterpolatedValues( true );
EXPECT_EQ( timeStepsA.size(), curveMerger.allXValues().size() );
EXPECT_EQ( timeStepsA.size(), curveMerger.interpolatedYValuesForAllXValues( 0 ).size() );
}
@@ -178,8 +178,8 @@ TEST( RiaTimeHistoryCurveMergerTest, RobustUse )
curveMerger.addCurveData( timeStepsB, valuesB );
// Execute interpolation twice is allowed
curveMerger.computeInterpolatedValues();
curveMerger.computeInterpolatedValues();
curveMerger.computeInterpolatedValues( true );
curveMerger.computeInterpolatedValues( true );
EXPECT_EQ( 8, static_cast<int>( curveMerger.allXValues().size() ) );
EXPECT_EQ( 8, static_cast<int>( curveMerger.interpolatedYValuesForAllXValues( 0 ).size() ) );
EXPECT_EQ( 8, static_cast<int>( curveMerger.interpolatedYValuesForAllXValues( 1 ).size() ) );
@@ -203,7 +203,7 @@ TEST( RiaTimeHistoryCurveMergerTest, NoTimeStepOverlap )
curveMerger.addCurveData( timeStepsB, valuesB );
// Execute interpolation twice is allowed
curveMerger.computeInterpolatedValues();
curveMerger.computeInterpolatedValues( true );
EXPECT_EQ( 8, static_cast<int>( curveMerger.allXValues().size() ) );
EXPECT_EQ( 0, static_cast<int>( curveMerger.validIntervalsForAllXValues().size() ) );
}