zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergio Ferraris
2011-11-23 11:05:47 +00:00
parent a7c4badeee d33920e79c
commit 5e35cd79a2
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

@ -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)

12
src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
View File

@ -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;
}