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

#7400 Make proper methods of helper functions.

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-02-26 09:38:10 +01:00 committed by Magne Sjaastad
parent 36b9f084c0
commit 023bb062b5
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.cpp
View File

@ -336,7 +336,7 @@ bool RimStimPlanModelPressureCalculator::extractPressureDataFromTable( RiaDefine
return true; return true;
} }
std::set<int> findUniqueValues( const std::vector<double>& values ) std::set<int> RimStimPlanModelPressureCalculator::findUniqueValues( const std::vector<double>& values )
{ {
std::set<int> res; std::set<int> res;
for ( double v : values ) for ( double v : values )
@ -350,14 +350,10 @@ std::set<int> findUniqueValues( const std::vector<double>& values )
return res; return res;
} }
typedef std::pair<double, double> DepthValuePair;
typedef std::vector<DepthValuePair> DepthValuePairVector;
typedef std::map<int, DepthValuePairVector> EqlNumToDepthValuePairMap;
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs ) void RimStimPlanModelPressureCalculator::sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs )
{ {
std::sort( depthValuePairs.begin(), depthValuePairs.end() ); std::sort( depthValuePairs.begin(), depthValuePairs.end() );
depthValuePairs.erase( unique( depthValuePairs.begin(), depthValuePairs.end() ), depthValuePairs.end() ); depthValuePairs.erase( unique( depthValuePairs.begin(), depthValuePairs.end() ), depthValuePairs.end() );
@ -366,9 +362,9 @@ void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel, bool RimStimPlanModelPressureCalculator::buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel,
EqlNumToDepthValuePairMap& valuesPerEqlNum, EqlNumToDepthValuePairMap& valuesPerEqlNum,
const std::set<int>& presentEqlNums ) const std::set<int>& presentEqlNums )
{ {
RimEclipseCase* eclipseCase = stimPlanModel->eclipseCaseForProperty( RiaDefines::CurveProperty::EQLNUM ); RimEclipseCase* eclipseCase = stimPlanModel->eclipseCaseForProperty( RiaDefines::CurveProperty::EQLNUM );
@ -429,7 +425,9 @@ bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double interpolatePressure( const DepthValuePairVector& depthValuePairs, double depth, int eqlNum ) double RimStimPlanModelPressureCalculator::interpolatePressure( const DepthValuePairVector& depthValuePairs,
double depth,
int eqlNum )
{ {
std::vector<double> depths; std::vector<double> depths;
for ( auto dvp : depthValuePairs ) for ( auto dvp : depthValuePairs )

13
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPressureCalculator.h
View File

@ -63,4 +63,17 @@ protected:
const std::vector<double>& measuredDepthValues, const std::vector<double>& measuredDepthValues,
const std::vector<double>& tvDepthValues, const std::vector<double>& tvDepthValues,
std::vector<double>& values ) const; std::vector<double>& values ) const;
typedef std::pair<double, double> DepthValuePair;
typedef std::vector<DepthValuePair> DepthValuePairVector;
typedef std::map<int, DepthValuePairVector> EqlNumToDepthValuePairMap;
static void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs );
static bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel,
EqlNumToDepthValuePairMap& valuesPerEqlNum,
const std::set<int>& presentEqlNums );
static std::set<int> findUniqueValues( const std::vector<double>& values );
static double interpolatePressure( const DepthValuePairVector& depthValuePairs, double depth, int eqlNum );
}; };