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 Minor refactoring: remove duplication.

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-02-24 19:54:44 +01:00 committed by Magne Sjaastad
parent 5c5b9e7f34
commit 36b9f084c0
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@
#include "RimStimPlanModel.h" #include "RimStimPlanModel.h"
#include "RimStimPlanModelCalculator.h" #include "RimStimPlanModelCalculator.h"
#include "RimStimPlanModelTemplate.h" #include "RimStimPlanModelTemplate.h"
#include "RimStimPlanModelWellLogCalculator.h"
#include <limits> #include <limits>
@ -362,24 +363,6 @@ void sortAndRemoveDuplicates( DepthValuePairVector& depthValuePairs )
depthValuePairs.erase( unique( depthValuePairs.begin(), depthValuePairs.end() ), depthValuePairs.end() ); depthValuePairs.erase( unique( depthValuePairs.begin(), depthValuePairs.end() ), depthValuePairs.end() );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& loadResults( RigEclipseCaseData* caseData,
RiaDefines::PorosityModelType porosityModel,
RiaDefines::ResultCatType resultType,
const QString& propertyName )
{
// TODO: is this always enough?
auto resultData = caseData->results( porosityModel );
int timeStepIndex = 0;
RigEclipseResultAddress resultAddress( resultType, propertyName );
resultData->ensureKnownResultLoaded( resultAddress );
return caseData->results( porosityModel )->cellScalarResults( resultAddress, timeStepIndex );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -397,9 +380,15 @@ bool buildPressureTablesPerEqlNum( const RimStimPlanModel* stimPlanModel,
RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL; RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL;
const std::vector<double>& eqlNumValues = const std::vector<double>& eqlNumValues =
loadResults( caseData, porosityModel, RiaDefines::ResultCatType::STATIC_NATIVE, "EQLNUM" ); RimStimPlanModelWellLogCalculator::loadResults( caseData,
porosityModel,
RiaDefines::ResultCatType::STATIC_NATIVE,
"EQLNUM" );
const std::vector<double>& pressureValues = const std::vector<double>& pressureValues =
loadResults( caseData, porosityModel, RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PRESSURE" ); RimStimPlanModelWellLogCalculator::loadResults( caseData,
porosityModel,
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
"PRESSURE" );
if ( eqlNumValues.size() != pressureValues.size() ) if ( eqlNumValues.size() != pressureValues.size() )
{ {