OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -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
Show Stats 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)

14
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@ -184,6 +184,8 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
//--------------------------------------------------------------------------------------------------
bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values)
{
bool result = false;
#pragma omp critical(critical_section_keywordData_double)
{
ecl_kw_type* kwData = ecl_file_iget_named_kw(ecl_file, RiaStringEncodingTools::toNativeEncoded(keyword).data(), static_cast<int>(fileKeywordOccurrence));
@ -197,10 +199,11 @@ bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QStri
ecl_kw_get_data_as_double(kwData, doubleData.data());
values->insert(values->end(), doubleData.begin(), doubleData.end());
return true;
result = true;
}
return false;
}
return result;
}
//--------------------------------------------------------------------------------------------------
@ -208,6 +211,8 @@ bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QStri
//--------------------------------------------------------------------------------------------------
bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<int>* values)
{
bool result = false;
#pragma omp critical(critical_section_keywordData_int)
{
ecl_kw_type* kwData = ecl_file_iget_named_kw(ecl_file, RiaStringEncodingTools::toNativeEncoded(keyword).data(), static_cast<int>(fileKeywordOccurrence));
@ -221,10 +226,11 @@ bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QStri
ecl_kw_get_memcpy_int_data(kwData, integerData.data());
values->insert(values->end(), integerData.begin(), integerData.end());
return true;
result = true;
}
return false;
}
return result;
}
//--------------------------------------------------------------------------------------------------