diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C index 4f934e43d40ec453d243b243200dcc42896da705..10ac331363c8f4217b4b382b075ac2f722b846e7 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C @@ -1818,6 +1818,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute // What to send to neighbouring domains // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + bool oldParRun = UPstream::parRun(); + UPstream::parRun() = false; + forAll(nSendCells[Pstream::myProcNo()], recvProc) { if @@ -1966,6 +1969,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute } + UPstream::parRun() = oldParRun; + + // Start sending&receiving from buffers pBufs.finishedSends(); @@ -2064,6 +2070,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute // Receive and add what was sent // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + oldParRun = UPstream::parRun(); + UPstream::parRun() = false; + forAll(nSendCells, sendProc) { // Did processor sendProc send anything to me? @@ -2371,6 +2380,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute } } + UPstream::parRun() = oldParRun; // Print a bit. if (debug) diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C index fe0643c1951bf15056fdf64f6f46039ba560a6f8..165b8c4d5567f8b8e52eaeae8e731e8e3d50e8c5 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C @@ -134,7 +134,7 @@ void Foam::surfaceInterpolation::makeWeights() const { if (debug) { - Info<< "surfaceInterpolation::makeWeights() : " + Pout<< "surfaceInterpolation::makeWeights() : " << "Constructing weighting factors for face interpolation" << endl; } @@ -188,7 +188,7 @@ void Foam::surfaceInterpolation::makeWeights() const if (debug) { - Info<< "surfaceInterpolation::makeWeights() : " + Pout<< "surfaceInterpolation::makeWeights() : " << "Finished constructing weighting factors for face interpolation" << endl; } @@ -199,7 +199,7 @@ void Foam::surfaceInterpolation::makeDeltaCoeffs() const { if (debug) { - Info<< "surfaceInterpolation::makeDeltaCoeffs() : " + Pout<< "surfaceInterpolation::makeDeltaCoeffs() : " << "Constructing differencing factors array for face gradient" << endl; } @@ -244,7 +244,7 @@ void Foam::surfaceInterpolation::makeNonOrthDeltaCoeffs() const { if (debug) { - Info<< "surfaceInterpolation::makeNonOrthDeltaCoeffs() : " + Pout<< "surfaceInterpolation::makeNonOrthDeltaCoeffs() : " << "Constructing differencing factors array for face gradient" << endl; } @@ -306,7 +306,7 @@ void Foam::surfaceInterpolation::makeNonOrthCorrectionVectors() const { if (debug) { - Info<< "surfaceInterpolation::makeNonOrthCorrectionVectors() : " + Pout<< "surfaceInterpolation::makeNonOrthCorrectionVectors() : " << "Constructing non-orthogonal correction vectors" << endl; } @@ -377,7 +377,7 @@ void Foam::surfaceInterpolation::makeNonOrthCorrectionVectors() const if (debug) { - Info<< "surfaceInterpolation::makeNonOrthCorrectionVectors() : " + Pout<< "surfaceInterpolation::makeNonOrthCorrectionVectors() : " << "Finished constructing non-orthogonal correction vectors" << endl; } diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U index eaf5e4ac3646a709a6355a49e05986fb4f5408ea..69ad6faa274315f25b2e1da51f4011e96a8cfc75 100755 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U @@ -37,7 +37,7 @@ boundaryField burner { type flowRateInletVelocity; - flowRate 0.001294; //60kW C3H8 + flowRate constant 0.001294; //60kW C3H8 value uniform (0 0 0); } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution index a0e2c8dc969288d325789c54ffc6177de9f880ce..3835a468dde1e228eee55f9d6144099a20407b36 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution @@ -71,6 +71,7 @@ solvers nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; + maxIter 20; } G @@ -99,7 +100,7 @@ relaxationFactors equations { "(U|k).*" 1; - "(C3H8|O2|H2O|CO2|hs).*" 0.9; + "(CH4|O2|H2O|CO2|hs).*" 0.9; } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes index 227b8f0ef6bb5450ec548d1b0e81119315050718..17ab97ec96f710289707b41e5dff527729aaa89c 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes @@ -31,6 +31,7 @@ divSchemes div(phi,K) Gauss upwind; div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; div(R) Gauss linear; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes index 0e755452dd4e3e0314e4c66dac54e0663a6e6c39..cf4192a4ded2621c7ce0c8a8decb8856148af637 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes @@ -31,6 +31,7 @@ divSchemes div(phi,K) Gauss upwind; div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; div(R) Gauss linear; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes index ceba5ec0aa4ee77c425733d0219817e918241c59..7f3767d179336695ed70bb0a9ab904eff005998b 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes @@ -31,6 +31,7 @@ divSchemes div(phi,K) Gauss upwind; div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; div(R) Gauss linear; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes index ceba5ec0aa4ee77c425733d0219817e918241c59..7f3767d179336695ed70bb0a9ab904eff005998b 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes @@ -31,6 +31,7 @@ divSchemes div(phi,K) Gauss upwind; div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; div(R) Gauss linear;