From d780409156e838e366f4da5126e6aeab44174d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 3 Apr 2019 01:36:52 +0200 Subject: Fix for GCC9 new OpenMP data sharing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 9 started implementing the OpenMP 4.0 and later behavior. When not using default clause or when using default(shared), this makes no difference, but if using default(none), previously the choice was not specify the const qualified variables on the construct at all, or specify in firstprivate clause. In GCC 9 as well as for OpenMP 4.0 compliance, those variables need to be specified on constructs in which they are used, either in shared or in firstprivate clause. Specifying them in firstprivate clause is one way to achieve compatibility with both older GCC versions and GCC 9, another option is to drop the default(none) clause. This patch thus drops the default(none) clause. See https://gcc.gnu.org/gcc-9/porting_to.html#ompdatasharing Signed-off-by: Robert-André Mauchin --- intern/elbeem/intern/solver_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index 68f7c04cd54..514087b6130 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev) GRID_REGION_INIT(); #if PARALLEL==1 const int gDebugLevel = ::gDebugLevel; -#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ +#pragma omp parallel num_threads(mNumOMPThreads) \ reduction(+: \ calcCurrentMass,calcCurrentVolume, \ calcCellsFilled,calcCellsEmptied, \ @@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids() GRID_REGION_INIT(); #if PARALLEL==1 const int gDebugLevel = ::gDebugLevel; -#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ +#pragma omp parallel num_threads(mNumOMPThreads) \ reduction(+: \ calcCurrentMass,calcCurrentVolume, \ calcCellsFilled,calcCellsEmptied, \ @@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit() GRID_REGION_INIT(); #if PARALLEL==1 const int gDebugLevel = ::gDebugLevel; -#pragma omp parallel default(none) num_threads(mNumOMPThreads) \ +#pragma omp parallel num_threads(mNumOMPThreads) \ reduction(+: \ calcCurrentMass,calcCurrentVolume, \ calcCellsFilled,calcCellsEmptied, \ -- cgit v1.2.3