Merge branch 'blender2.7'
[blender.git] / intern / elbeem / intern / solver_main.cpp
index 994839fe06d3020d44a0fe6d47c622fecacd9ff4..961bd44e08fdb90da5f6c251a0acfcb7e42ea3dc 100644 (file)
@@ -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, \