Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

OpenCFD · Mar 11, 2015 · 511af4f · 511af4f
2 parents 06af2e1 + 0c74d94
commit 511af4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -35,7 +35,6 @@ EXE_LIBS = \
     -lcompressibleTurbulenceModels \
     -llagrangian \
     -llagrangianIntermediate \
-    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \

diff --git a/.../fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/.../fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -253,20 +253,18 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::setNewPosition
 {
     while (true)
     {
+        // Generate a position within eddy box
         if (localOnly)
         {
-            // Local position in eddy box
             p = cmptMultiply(rndGen_.sample01<vector>(), bounds_);
         }
         else
         {
-            p = vector::min;
             if (Pstream::master())
             {
-                // Local position in eddy box
                 p = cmptMultiply(rndGen_.sample01<vector>(), bounds_);
             }
-            reduce(p, maxOp<vector>());
+            Pstream::scatter(p);
         }
 
         // Snap point to inlet plane at x = 0