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

This commit is contained in:
mattijs
2013-12-20 16:42:20 +00:00
2 changed files with 20 additions and 13 deletions

View File

@ -273,26 +273,33 @@ void Foam::MPPICCloud<CloudType>::info()
tmp<volScalarField> alpha = this->theta();
Info<< " Min cell volume fraction = "
<< gMin(alpha().internalField()) << endl;
Info<< " Max cell volume fraction = "
<< gMax(alpha().internalField()) << endl;
const scalar alphaMin = gMin(alpha().internalField());
const scalar alphaMax = gMax(alpha().internalField());
label nOutside = 0;
Info<< " Min cell volume fraction = " << alphaMin << endl;
Info<< " Max cell volume fraction = " << alphaMax << endl;
forAllIter(typename CloudType, *this, iter)
if (alphaMax < SMALL)
{
typename CloudType::parcelType& p = iter();
const tetIndices tetIs(p.cell(), p.tetFace(), p.tetPt(), this->mesh());
nOutside += !tetIs.tet(this->mesh()).inside(p.position());
return;
}
reduce(nOutside, plusOp<label>());
scalar nMin = GREAT;
if (nOutside > 0)
forAll(this->mesh().cells(), cellI)
{
Info<< " Number of parcels outside tets = " << nOutside << endl;
const label n = this->cellOccupancy()[cellI].size();
const scalar nPack = n*alphaMax/alpha()[cellI];
if (n > 0 && nPack < nMin)
{
nMin = nPack;
}
}
reduce(nMin, minOp<scalar>());
Info<< " Min dense number of parcels = " << nMin << endl;
}

View File

@ -106,7 +106,7 @@ subModels
type patchInjection;
parcelBasisType fixed;
patchName upperInlet;
U0 (18.7939 6.8404 0);
U0 (18.7939 -6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
sizeDistribution