BUG: Changing min(z0, 0.001) to max(zo, 0.001)

This commit is contained in:
Sergio Ferraris
2011-10-19 10:04:31 +01:00
parent f76cbf52e6
commit 1f42aad419
5 changed files with 10 additions and 9 deletions

View File

@ -86,7 +86,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
z_(dict.lookup("z")), z_(dict.lookup("z")),
z0_(readScalar(dict.lookup("z0"))), z0_(readScalar(dict.lookup("z0"))),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
zGround_(readScalar(dict.lookup("zGround"))) zGround_("zGround", dict, p.size())
{ {
if (mag(z_) < SMALL) if (mag(z_) < SMALL)
{ {

View File

@ -90,7 +90,7 @@ class atmBoundaryLayerInletEpsilonFvPatchScalarField
const scalar kappa_; const scalar kappa_;
//- Minimum corrdinate value in z direction //- Minimum corrdinate value in z direction
const scalar zGround_; const scalarField zGround_;
public: public:

View File

@ -115,7 +115,7 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
n_ /= mag(n_); n_ /= mag(n_);
z_ /= mag(z_); z_ /= mag(z_);
Ustar_ = kappa_*Uref_/(log((Href_ + z0_)/min(z0_ , 0.001))); Ustar_ = kappa_*Uref_/(log((Href_ + z0_)/max(z0_ , 0.001)));
evaluate(); evaluate();
} }
@ -150,9 +150,11 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
forAll(coord, i) forAll(coord, i)
{ {
if ((coord[i] - zGround_) < Href_) if ((coord[i] - zGround_[i]) < Href_)
{ {
Un[i] = (Ustar_/kappa_)*log((coord[i] - zGround_ + z0_)/z0_); Un[i] =
(Ustar_/kappa_)
* log((coord[i] - zGround_[i] + z0_)/max(z0_, 0.001));
} }
else else
{ {
@ -181,8 +183,7 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
<< Uref_ << token::END_STATEMENT << nl; << Uref_ << token::END_STATEMENT << nl;
os.writeKeyword("Href") os.writeKeyword("Href")
<< Href_ << token::END_STATEMENT << nl; << Href_ << token::END_STATEMENT << nl;
os.writeKeyword("zGround") zGround_.writeEntry("zGround", os) ;
<< zGround_ << token::END_STATEMENT << nl;
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -113,7 +113,7 @@ class atmBoundaryLayerInletVelocityFvPatchVectorField
const scalar Href_; const scalar Href_;
//- Minimum corrdinate value in z direction //- Minimum corrdinate value in z direction
const scalar zGround_; const scalarField zGround_;
public: public:

View File

@ -13,5 +13,5 @@ z0 0.1;
turbulentKE 1.3; turbulentKE 1.3;
windDirection (1 0 0); windDirection (1 0 0);
zDirection (0 0 1); zDirection (0 0 1);
zGround 935.0; zGround uniform 935.0;
// ************************************************************************* // // ************************************************************************* //