Merge branch 'master' into greyAbsorption

This commit is contained in:
sergio
2011-02-22 11:56:44 +00:00
2 changed files with 7 additions and 2 deletions

View File

@ -116,7 +116,9 @@
&& runTime.timeIndex() > runTime.startTimeIndex() + 1 && runTime.timeIndex() > runTime.startTimeIndex() + 1
) )
{ {
rDeltaT = rDeltaT0*max(rDeltaT/rDeltaT0, 1.0 - rDeltaTDampingCoeff); rDeltaT =
rDeltaT0
*max(rDeltaT/rDeltaT0, scalar(1.0) - rDeltaTDampingCoeff);
Info<< "Damped flow time scale min/max = " Info<< "Damped flow time scale min/max = "
<< gMin(1/rDeltaT.internalField()) << gMin(1/rDeltaT.internalField())

View File

@ -49,7 +49,10 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
if if
( (
nParcelsToInject > 0 nParcelsToInject > 0
&& (nParcels - scalar(nParcelsToInject) > rnd.position(0.0, 1.0)) && (
nParcels - scalar(nParcelsToInject)
> rnd.position(scalar(0), scalar(1))
)
) )
{ {
++nParcelsToInject; ++nParcelsToInject;