From 35d930ec0cfb774971b86ee2e3d495c1f6fc66e7 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 10 Jan 2018 09:10:30 +0000 Subject: [PATCH 1/4] COMP: mpi: const_cast because of incorrect mpi.h header. Fixes #697. --- src/Pstream/mpi/UPstream.C | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C index e92cb32582..7e09c89dde 100644 --- a/src/Pstream/mpi/UPstream.C +++ b/src/Pstream/mpi/UPstream.C @@ -495,13 +495,13 @@ void Foam::UPstream::allToAll ( MPI_Alltoallv ( - sendData, - sendSizes.begin(), - sendOffsets.begin(), + const_cast(sendData), + const_cast(sendSizes.begin()), + const_cast(sendOffsets.begin()), MPI_BYTE, recvData, - recvSizes.begin(), - recvOffsets.begin(), + const_cast(recvSizes.begin()), + const_cast(recvOffsets.begin()), MPI_BYTE, PstreamGlobals::MPICommunicators_[communicator] ) @@ -557,12 +557,12 @@ void Foam::UPstream::gather ( MPI_Gatherv ( - sendData, + const_cast(sendData), sendSize, MPI_BYTE, recvData, - recvSizes.begin(), - recvOffsets.begin(), + const_cast(recvSizes.begin()), + const_cast(recvOffsets.begin()), MPI_BYTE, 0, MPI_Comm(PstreamGlobals::MPICommunicators_[communicator]) @@ -616,9 +616,9 @@ void Foam::UPstream::scatter ( MPI_Scatterv ( - sendData, - sendSizes.begin(), - sendOffsets.begin(), + const_cast(sendData), + const_cast(sendSizes.begin()), + const_cast(sendOffsets.begin()), MPI_BYTE, recvData, recvSize, From 1510c0aeb5c014bb567dace0642ea98f1b1c68d8 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Thu, 11 Jan 2018 14:30:26 +0000 Subject: [PATCH 2/4] ENH: interIsoFoam - added linkage against wave modelling library --- applications/solvers/multiphase/interIsoFoam/Make/options | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/interIsoFoam/Make/options b/applications/solvers/multiphase/interIsoFoam/Make/options index cfe4a92072..21e9667b83 100644 --- a/applications/solvers/multiphase/interIsoFoam/Make/options +++ b/applications/solvers/multiphase/interIsoFoam/Make/options @@ -17,4 +17,5 @@ EXE_LIBS = \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ - -lsampling + -lsampling \ + -lwaveModels From 73ce0ccbeffc5605a8cefabcb7510c521d2cd942 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Thu, 11 Jan 2018 14:32:39 +0000 Subject: [PATCH 3/4] DOC: Documentation updates --- .../nutUBlendedWallFunctionFvPatchScalarField.H | 8 ++++---- .../ReynoldsAnalogy/ReynoldsAnalogy.H | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H index 67db5bf700..026ccf0a8d 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H +++ b/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 - uTau_v | friction velocity in the viscous region - uTau_l | friction velocity in the log region + u_\tau | friction velocity + u_{\tau,v} | friction velocity in the viscous region + u_{\tau,l} | friction velocity in the log region \endvartable diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H index 3265fb8be5..ac68ddfd80 100644 --- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.H +++ b/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 From 2ebcb74dd201e99dcd88fefcd23f4b4da3d7a2d7 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 17 Jan 2018 13:38:24 +0100 Subject: [PATCH 4/4] BUG: reconstructPar ignores writeLagrangianPositions (fixes #702) - The central InfoSwitch "writeLagrangianPositions" allows writing an additional Lagrangian "positions" file, but these were not being written by reconstructPar. These are now also written in reconstructPar if the central writeLagrangianPositions InfoSwitch is enabled. NOTES - "positions" are reconstructed from the processors "coordinates" file - decomposePar will not attempt to create or redistribute any "positions" files --- .../reconstructPar/reconstructPar.C | 6 +++--- .../reconstruct/reconstructLagrangianPositions.C | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C index 6b6e3bb535..d545d64233 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C +++ b/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(objects); faReconstructor.reconstructFaAreaFields(objects); faReconstructor.reconstructFaAreaFields(objects); - + faReconstructor.reconstructFaEdgeFields(objects); } else diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C index c8e8be4c5e..30622183ec 100644 --- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C +++ b/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>(lagrangianPositions).write(); + + // Force writing of "positions" too, if specified via the InfoSwitch + if (particle::writeLagrangianPositions) + { + IOPosition> + ( + lagrangianPositions, + IOPosition>::geometryType::POSITIONS + ).write(); + } }