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

Statistics calculation : Paralellized and avoided some memory reallocation

Browse Source 
p4#: 22012
This commit is contained in:
Jacob Støren
2013-06-27 00:45:50 +02:00
parent 4f7b3e703c
commit 7112589e33
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
View File

@@ -175,11 +175,11 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
{ {
RigGridBase* grid = m_destinationCase->grid(gridIdx); RigGridBase* grid = m_destinationCase->grid(gridIdx);
for (int i = 0; i < resultSpecification.size(); i++) for (int resSpecIdx = 0; resSpecIdx < resultSpecification.size(); resSpecIdx++)
{ {
RifReaderInterface::PorosityModelResultType poroModel = resultSpecification[i].m_poroModel; RifReaderInterface::PorosityModelResultType poroModel = resultSpecification[resSpecIdx].m_poroModel;
RimDefines::ResultCatType resultType = resultSpecification[i].m_resType; RimDefines::ResultCatType resultType = resultSpecification[resSpecIdx].m_resType;
QString resultName = resultSpecification[i].m_resVarName; QString resultName = resultSpecification[resSpecIdx].m_resVarName;
size_t activeCellCount = m_destinationCase->activeCellInfo(poroModel)->globalActiveCellCount(); size_t activeCellCount = m_destinationCase->activeCellInfo(poroModel)->globalActiveCellCount();
@@ -241,9 +241,11 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
} }
} }
std::vector<double> statParams(STAT_PARAM_COUNT, HUGE_VAL);
std::vector<double> values(sourceDataAccessList.size(), HUGE_VAL);
// Loop over the cells in the grid, get the case values, and calculate the cell statistics // Loop over the cells in the grid, get the case values, and calculate the cell statistics
#pragma omp parallel for schedule(dynamic) firstprivate(statParams, values)
for (size_t cellIdx = 0; cellIdx < grid->cellCount(); cellIdx++) for (int cellIdx = 0; static_cast<size_t>(cellIdx) < grid->cellCount(); cellIdx++)
{ {
size_t globalGridCellIdx = grid->globalGridCellIndex(cellIdx); size_t globalGridCellIdx = grid->globalGridCellIndex(cellIdx);
@@ -251,7 +253,7 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
{ {
// Extract the cell values from each of the cases and assemble them into one vector // Extract the cell values from each of the cases and assemble them into one vector
std::vector<double> values(sourceDataAccessList.size(), HUGE_VAL);
bool foundAnyValidValues = false; bool foundAnyValidValues = false;
for (size_t caseIdx = 0; caseIdx < sourceDataAccessList.size(); caseIdx++) for (size_t caseIdx = 0; caseIdx < sourceDataAccessList.size(); caseIdx++)
@@ -266,7 +268,7 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
} }
// Do the real statistics calculations // Do the real statistics calculations
std::vector<double> statParams(STAT_PARAM_COUNT, HUGE_VAL);
if (foundAnyValidValues) if (foundAnyValidValues)
{ {