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

StatisticsContourMap: Refactor computeStatistics and move helpers to anonymous namespace

Browse Source 
Split computeStatistics() into computeStatisticsSharedGrid() and
computeStatisticsIndividualGrids(), and move findKLayersForFormations
and extractCaseResults to an anonymous namespace as free functions.
This commit is contained in:
Magne Sjaastad
2026-03-19 15:10:43 +01:00
parent 831751a903
commit b14e873fac
3 changed files with 232 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.h
+22 -1
View File
@@ -31,9 +31,16 @@
#include "cvfVector3.h"
#include <map>
#include <optional>
#include <utility>
#include <vector>
namespace caf
{
class ProgressInfo;
}
class RigContourMapGrid;
class RimEclipseCase;
class RimEclipseResultDefinition;
class RimEclipseCaseEnsemble;
@@ -62,11 +69,19 @@ public:
MAX
};
enum class GridImportMode
{
SHARED_GRID,
INDIVIDUAL_GRIDS
};
RimStatisticsContourMap();
void setEclipseCase( RimEclipseCase* eclipseCase );
RimEclipseCase* eclipseCase() const;
void setGridImportMode( GridImportMode mode );
QString ensembleName() const;
RigContourMapGrid* contourMapGrid() const;
@@ -100,9 +115,13 @@ protected:
void switchToSelectedSourceCase();
private:
using TimestepResultsMap = std::map<size_t, std::vector<std::vector<double>>>;
void computeStatistics();
void computeStatisticsSharedGrid( RigContourMapGrid* contourMapGrid, TimestepResultsMap& timestepResults, caf::ProgressInfo& progInfo );
void computeStatisticsIndividualGrids( RigContourMapGrid* contourMapGrid, TimestepResultsMap& timestepResults, caf::ProgressInfo& progInfo );
void onComputeStatisticsClicked();
void doStatisticsCalculation( std::map<size_t, std::vector<std::vector<double>>>& timestep_results );
void doStatisticsCalculation( TimestepResultsMap& timestep_results );
RimFormationNames* activeFormationNames() const;
std::vector<RimEclipseCase*> ensembleCases() const;
@@ -110,6 +129,7 @@ private:
std::vector<std::pair<int, int>> mapLocalToGlobalTimeSteps( std::vector<QDateTime> localDates ) const;
private:
caf::PdmField<double> m_boundingBoxExpPercent;
caf::PdmField<RimContourMapProjection::ResultAggregation> m_resultAggregation;
caf::PdmField<std::vector<int>> m_selectedTimeSteps;
@@ -119,6 +139,7 @@ private:
caf::PdmPtrField<RimEclipseCase*> m_primaryCase;
caf::PdmPtrArrayField<RimPolygon*> m_selectedPolygons;
caf::PdmField<caf::AppEnum<GridImportMode>> m_gridImportMode;
caf::PdmField<caf::AppEnum<RimContourMapResolutionTools::SamplingResolution>> m_resolution;
caf::PdmField<caf::AppEnum<RigFloodingSettings::FloodingType>> m_oilFloodingType;