Merge branch 'master' into greyAbsorption

2011-02-22 11:56:44 +00:00 · 2011-02-22 11:56:44 +00:00 · ce22eec4a0
commit ce22eec4a0
parent 5bd56ebdaf 1d3a93554b
2 changed files with 7 additions and 2 deletions
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H
@ -116,7 +116,9 @@
     && 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 = "
            << gMin(1/rDeltaT.internalField())
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@ -49,7 +49,10 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
        if
        (
            nParcelsToInject > 0
-         && (nParcels - scalar(nParcelsToInject) > rnd.position(0.0, 1.0))
+         && (
+               nParcels - scalar(nParcelsToInject)
+             > rnd.position(scalar(0), scalar(1))
+            )
        )
        {
            ++nParcelsToInject;