research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atmBoundaryLayer BC: update for SP compilation

Browse source 
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1496
This commit is contained in:
Henry 2015-01-23 13:09:47 +00:00
parent 8a7519fc14
commit 1f2f89f7c8
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
View file

@ -108,7 +108,9 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
forAll (Ustar_, i)
{
Ustar_[i] = kappa_*Uref_/(log((Href_ + z0_[i])/max(z0_[i] , 0.001)));
Ustar_[i] =
kappa_*Uref_
/(log((Href_ + z0_[i])/max(z0_[i] , scalar(0.001))));
}
z_ /= mag(z_);

10
src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
View file

@ -114,7 +114,9 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
forAll (Ustar_, i)
{
Ustar_[i] = kappa_*Uref_/(log((Href_ + z0_[i])/max(z0_[i] , 0.001)));
Ustar_[i] =
kappa_*Uref_
/(log((Href_ + z0_[i])/max(z0_[i] , scalar(0.001))));
}
const vectorField& c = patch().Cf();
@ -127,7 +129,11 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
{
Un[i] =
(Ustar_[i]/kappa_)
* log((coord[i] - zGround_[i] + z0_[i])/max(z0_[i], 0.001));
*log
(
(coord[i] - zGround_[i] + z0_[i])
/max(z0_[i], scalar(0.001))
);
}
else
{

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
View file

@ -111,7 +111,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
// Ensure direction vectors are normalized
z_ /= mag(z_);
Ustar_ = kappa_*Uref_/(log((Zref_ + z0_)/max(z0_, 0.001)));
Ustar_ = kappa_*Uref_/(log((Zref_ + z0_)/max(z0_, scalar(0.001))));
scalarField::operator=
(

4
src/turbulenceModels/incompressible/turbulenceModel/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
View file

@ -115,11 +115,11 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
n_ /= mag(n_);
z_ /= mag(z_);
Ustar_ = kappa_*Uref_/(log((Zref_ + z0_)/max(z0_, 0.001)));
Ustar_ = kappa_*Uref_/(log((Zref_ + z0_)/max(z0_, scalar(0.001))));
scalarField Un
(
(Ustar_/kappa_)
*log(((z_ & patch().Cf()) - zGround_ + z0_)/max(z0_, 0.001))
*log(((z_ & patch().Cf()) - zGround_ + z0_)/max(z0_, scalar(0.001)))
);
vectorField::operator=(n_*Un);