From d87c1252af702394243f7c8f86116362e93a4c8d Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 7 Mar 2011 15:45:55 +0000 Subject: [PATCH] PDRFoam: Updated to compile SP --- .../combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index c4444bcfd0..7f4aa91722 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -73,7 +73,7 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const const volSymmTensorField& CT = mesh.lookupObject("CT"); const volScalarField& Nv = mesh.lookupObject("Nv"); - const volSymmTensorField& nsv = + const volSymmTensorField& nsv = mesh.lookupObject("nsv"); tmp tN @@ -130,13 +130,13 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4)) ); - const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), 1e-4))); + const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), scalar(1e-4)))); const scalarField cellWidth(pow(mesh.V(), 1.0/3.0)); const scalarField upLocal(uPrimeCoef_*sqrt((U & CT & U)*cellWidth)); - const scalarField deltaUp(upLocal*(max(1.0, pow(nr, 0.5)) - 1.0)); + const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0)); up.internalField() += deltaUp;