mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' into greyAbsorption
This commit is contained in:
@ -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())
|
||||||
|
|||||||
@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user