zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andy
2011-11-23 11:40:23 +00:00
parent 26d429da0b 5e35cd79a2
commit 240709f3d3
8 changed files with 23 additions and 8 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;
}

2
tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
View File

@ -37,7 +37,7 @@ boundaryField
burner
{
type flowRateInletVelocity;
flowRate 0.001294; //60kW C3H8
flowRate constant 0.001294; //60kW C3H8
value uniform (0 0 0);
}

3
tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
View File

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

1
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
View File

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

1
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
View File

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

1
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
View File

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

1
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
View File

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