diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-07 12:24:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-07 12:24:28 +0300 |
| commit | e031ace3d1d06c8c55b22c64bffc2988fa1d4153 (patch) | |
| tree | 3d22624ee9cde951988784b3844db5dbd32aae43 /intern | |
| parent | c536b61961d73b87b420a2b904e448d06df822db (diff) | |
| parent | d780409156e838e366f4da5126e6aeab44174d62 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index 994839fe06d..961bd44e08f 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -384,7 +384,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, \ @@ -1129,7 +1129,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, \ @@ -1167,7 +1167,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, \ |