diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H index 3f8ba982cf..c02fe6c11a 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H @@ -57,8 +57,8 @@ rDeltaT.dimensionedInternalField() = max ( 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), - fvc::surfaceSum(mag(rhoPhi))().dimensionedInternalField() - /((2*maxCo)*mesh.V()*rho.dimensionedInternalField()) + fvc::surfaceSum(mag(phi))().dimensionedInternalField() + /((2*maxCo)*mesh.V()) ); if (maxAlphaCo < maxCo) diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index 3de11eec4d..e374e1969a 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -457,8 +457,9 @@ int main(int argc, char *argv[]) } } - // Collect remote Cf and Sf on coarse mesh - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // Distribute local coarse Cf and Sf for shooting rays + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ List remoteCoarseCf(Pstream::nProcs()); List remoteCoarseSf(Pstream::nProcs()); @@ -468,19 +469,6 @@ int main(int argc, char *argv[]) remoteCoarseSf[Pstream::myProcNo()] = localCoarseSf; remoteCoarseAgg[Pstream::myProcNo()] = localAgg; - - // Collect remote Cf and Sf on fine mesh - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - List remoteFineCf(Pstream::nProcs()); - List remoteFineSf(Pstream::nProcs()); - - remoteCoarseCf[Pstream::myProcNo()] = localCoarseCf; - remoteCoarseSf[Pstream::myProcNo()] = localCoarseSf; - - // Distribute local coarse Cf and Sf for shooting rays - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Pstream::gatherList(remoteCoarseCf); Pstream::scatterList(remoteCoarseCf); Pstream::gatherList(remoteCoarseSf); diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index cc2dc1a415..5d9c5be4b2 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -177,22 +177,26 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels) scalar totProfile = returnReduce(profile, sumOp()); + int oldPrecision = Info().precision(4); + Info<< setw(8) << levelI << setw(8) << totNprocs << " " << setw(8) << totNCells/totNprocs << setw(8) << maxNCells << " " - << setw(8) << setprecision(4) << totFaceCellRatio/totNprocs - << setw(8) << setprecision(4) << maxFaceCellRatio + << setw(8) << totFaceCellRatio/totNprocs + << setw(8) << maxFaceCellRatio << " " << setw(8) << scalar(totNInt)/totNprocs << setw(8) << maxNInt << " " - << setw(8) << setprecision(4) << totRatio/totNprocs - << setw(8) << setprecision(4) << maxRatio - << setw(12) << setprecision(4) << totProfile/totNprocs + << setw(8) << totRatio/totNprocs + << setw(8) << maxRatio + << setw(12) << totProfile/totNprocs << nl; + + Info().precision(oldPrecision); } Info<< endl; } diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C index bd0e06166a..63268e6832 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,6 +37,49 @@ namespace Foam addToRunTimeSelectionTable(polyPatch, symmetryPlanePolyPatch, dictionary); } + +// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // + +void Foam::symmetryPlanePolyPatch::calcGeometry(PstreamBuffers&) +{ + if (n_ == vector::rootMax) + { + if (returnReduce(size(), sumOp