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

This commit is contained in:
mattijs 2012-07-02 15:34:20 +01:00
commit f451fc5825
2 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
) const
{
return
(1.0/3.0)*pow(max(alpha, 1.0e-6)/alphaMax, -2.0/3.0)
(1.0/3.0)*pow(max(alpha, scalar(1.0e-6))/alphaMax, -2.0/3.0)
/(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
}

View File

@ -85,7 +85,7 @@ Foam::kineticTheoryModels::radialModels::SinclairJackson::g0prime
) const
{
return
(1.0/3.0)*pow(max(alpha, 1.0e-6)/alphaMax, -2.0/3.0)
(1.0/3.0)*pow(max(alpha, scalar(1.0e-6))/alphaMax, -2.0/3.0)
/(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0)));
}