Merge remote-tracking branch 'origin/master' into develop

applications/solvers/multiphase/interIsoFoam/Make/options

@@ -17,4 +17,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lsampling
+    -lsampling \
+    -lwaveModels

applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -728,7 +728,7 @@ int main(int argc, char *argv[])
             )
             {
                 Info << "Reconstructing FA fields" << nl << endl;
-                
+
                 faMesh aMesh(mesh);
 
                 processorFaMeshes procFaMeshes(procMeshes.meshes());
@@ -748,7 +748,7 @@ int main(int argc, char *argv[])
                     .reconstructFaAreaFields<sphericalTensor>(objects);
                 faReconstructor.reconstructFaAreaFields<symmTensor>(objects);
                 faReconstructor.reconstructFaAreaFields<tensor>(objects);
-                
+
                 faReconstructor.reconstructFaEdgeFields<scalar>(objects);
             }
             else

src/Pstream/mpi/UPstream.C

@@ -495,13 +495,13 @@ void Foam::UPstream::allToAll
         (
             MPI_Alltoallv
             (
-                sendData,
+                const_cast<char*>(sendData),
-                sendSizes.begin(),
+                const_cast<int*>(sendSizes.begin()),
-                sendOffsets.begin(),
+                const_cast<int*>(sendOffsets.begin()),
                 MPI_BYTE,
                 recvData,
-                recvSizes.begin(),
+                const_cast<int*>(recvSizes.begin()),
-                recvOffsets.begin(),
+                const_cast<int*>(recvOffsets.begin()),
                 MPI_BYTE,
                 PstreamGlobals::MPICommunicators_[communicator]
             )
@@ -557,12 +557,12 @@ void Foam::UPstream::gather
         (
             MPI_Gatherv
             (
-                sendData,
+                const_cast<char*>(sendData),
                 sendSize,
                 MPI_BYTE,
                 recvData,
-                recvSizes.begin(),
+                const_cast<int*>(recvSizes.begin()),
-                recvOffsets.begin(),
+                const_cast<int*>(recvOffsets.begin()),
                 MPI_BYTE,
                 0,
                 MPI_Comm(PstreamGlobals::MPICommunicators_[communicator])
@@ -616,9 +616,9 @@ void Foam::UPstream::scatter
         (
             MPI_Scatterv
             (
-                sendData,
+                const_cast<char*>(sendData),
-                sendSizes.begin(),
+                const_cast<int*>(sendSizes.begin()),
-                sendOffsets.begin(),
+                const_cast<int*>(sendOffsets.begin()),
                 MPI_BYTE,
                 recvData,
                 recvSize,

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H

@@ -33,14 +33,14 @@ Description
     log region contributions.
 
         \f[
-            uTau = (uTau_v^n + uTau_l^n)^(1/n)
+            u_\tau = (u_{\tau,v}^n + u_{\tau,l}^n)^{1/n}
         \f]
 
     where
     \vartable
-        uTau    | friction velocity
+        u_\tau     | friction velocity
-        uTau_v  | friction velocity in the viscous region
+        u_{\tau,v} | friction velocity in the viscous region
-        uTau_l  | friction velocity in the log region
+        u_{\tau,l} | friction velocity in the log region
     \endvartable
 
 

src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H

@@ -37,7 +37,7 @@ Description
     as:
 
     \f[
-        h = 0.5 \rho_\infty \C_{p,\infty} |U_{\infty}| C_f
+        h = 0.5 \rho_\infty C_{p,\infty} |U_{\infty}| C_f
     \f]
 
 Usage

src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ void Foam::reconstructLagrangianPositions
 
             // Inverting sign if necessary and subtracting 1 from
             // faceProcAddressing
-            label mappedTetFace = mag(faceMap[ppi.tetFace()]) - 1;
+            const label mappedTetFace = mag(faceMap[ppi.tetFace()]) - 1;
 
             lagrangianPositions.append
             (
@@ -77,6 +77,16 @@ void Foam::reconstructLagrangianPositions
     }
 
     IOPosition<Cloud<passiveParticle>>(lagrangianPositions).write();
+
+    // Force writing of "positions" too, if specified via the InfoSwitch
+    if (particle::writeLagrangianPositions)
+    {
+        IOPosition<Cloud<passiveParticle>>
+        (
+            lagrangianPositions,
+            IOPosition<Cloud<passiveParticle>>::geometryType::POSITIONS
+        ).write();
+    }
 }