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

#3253 Export Completions : Move return out of critical section

Browse Source
This commit is contained in:
Magne Sjaastad
2018-08-27 08:49:45 +02:00
parent 9e3a100bcc
commit 2755d2e313
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
View File

@@ -203,8 +203,7 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
std::vector<std::vector<RigCompletionData>> sharedComplForFracture(fractures.size());
// Temporarily commented out due to sync problems. Needs more analysis
//#pragma omp parallel for
#pragma omp parallel for
for (int i = 0; i < (int)fractures.size(); i++)
{
const RimFracture* fracture = fractures[i];
@@ -516,6 +515,7 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
allCompletionsForOneFracture.end(),
std::back_inserter(sharedComplForFracture[i]));
#pragma omp critical(critical_section_outputStreamForIntermediateResultsText)
if (outputStreamForIntermediateResultsText)
{
(*outputStreamForIntermediateResultsText)