Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Mark Olesen
2018-07-23 21:18:43 +02:00
4 changed files with 36 additions and 19 deletions

View File

@ -70,14 +70,17 @@ void Foam::swirlFanVelocityFvPatchField::calcFanJump()
if (useRealRadius_) if (useRealRadius_)
{ {
const scalarField rMag(mag(patch().Cf() - origin_)); const vectorField& pCf = patch().Cf();
forAll (rMag, i)
forAll(pCf, i)
{ {
if (rMag[i] > rInner_ && rMag[i] < rOuter_) const scalar rMag = mag(pCf[i] - origin_);
if (rMag > rInner_ && rMag < rOuter_)
{ {
magTangU = magTangU[i] =
deltaP deltaP[i]
/rMag[i] /rMag
/fanEff_ /fanEff_
/(rpm_*constant::mathematical::pi/30.0); /(rpm_*constant::mathematical::pi/30.0);
} }
@ -95,6 +98,7 @@ void Foam::swirlFanVelocityFvPatchField::calcFanJump()
magTangU = magTangU =
deltaP/rEff_/fanEff_/(rpm_*constant::mathematical::pi/30.0); deltaP/rEff_/fanEff_/(rpm_*constant::mathematical::pi/30.0);
} }
// Calculate the tangential velocity // Calculate the tangential velocity
const vectorField tangentialVelocity(magTangU*tanDir); const vectorField tangentialVelocity(magTangU*tanDir);

View File

@ -32,36 +32,39 @@ Description
cyclic pressure jump condition and applies a transformation to U. cyclic pressure jump condition and applies a transformation to U.
The U-jump is specified with a swirl component as follows: The U-jump is specified with a swirl component as follows:
\verbatim
Utan = deltaP/rEff/fanEff/(rpm*pi/30.0); Utan = deltaP/rEff/fanEff/(rpm*pi/30.0);
where: where
deltaP : pressure drop across the cyclic. deltaP : pressure drop across the cyclic.
rEff : effective radius rEff : effective radius
fanEff : fan efficiency coefficient fanEff : fan efficiency coefficient
rmp : RPM of the fan rpm : RPM of the fan
\endverbatim
Alternatively an inner and outer radii can be used instead of rEff. The Alternatively an inner and outer radii can be used instead of rEff. The
Utan is as follow for r > rInner and r < rOuter Utan is as follow for r > rInner and r < rOuter
\verbatim
Utan = deltaP/r/fanEff/(rpm/pi/30.0); Utan = deltaP/r/fanEff/(rpm/pi/30.0);
where: where
r : p - origin, p is the face center r : p - origin, p is the face center
\endverbatim
Outside rInner and rOuter, Utan = 0. The input for this mode is: Outside rInner and rOuter, Utan = 0. The input for this mode is:
\verbatim
useRealRadius true; useRealRadius true;
rInner 0.005; rInner 0.005;
rOuter 0.01; rOuter 0.01;
\endverbatim
The radial velocity is zero in the present model. The radial velocity is zero in the present model.
Usage Usage
\table \table
Property | Description | Required | Default value Property | Description | Required | Default
patchType | underlying patch type should be \c cyclic| yes | patchType | underlying patch type should be \c cyclic| yes |
phi | flux field name | no | phi phi | flux field name | no | phi
rho | density field name | no | rho rho | density field name | no | rho
@ -91,7 +94,6 @@ Usage
} }
\endverbatim \endverbatim
SourceFiles SourceFiles
swirlFanVelocityFvPatchField.C swirlFanVelocityFvPatchField.C
@ -117,7 +119,6 @@ class swirlFanVelocityFvPatchField
{ {
// Private data // Private data
//- Name of the flux field //- Name of the flux field
const word phiName_; const word phiName_;
@ -178,7 +179,8 @@ public:
const dictionary& const dictionary&
); );
//- Construct by mapping given swirlFanVelocityFvPatchField onto a new patch //- Construct by mapping given swirlFanVelocityFvPatchField
//- onto a new patch
swirlFanVelocityFvPatchField swirlFanVelocityFvPatchField
( (
const swirlFanVelocityFvPatchField&, const swirlFanVelocityFvPatchField&,
@ -228,7 +230,7 @@ public:
virtual void updateCoeffs(); virtual void updateCoeffs();
//- Write //- Write
virtual void write(Ostream&) const; virtual void write(Ostream& os) const;
}; };

View File

@ -0,0 +1,11 @@
# An angled plane that extends beyond the geometry
o angledPlane
v -0.03 -0.08 -0.03
v -0.03 -0.08 0.03
v -0.07 -0.02 0.03
v -0.07 -0.02 -0.03
f 1 2 4
f 2 3 4
# EOF

View File

@ -52,7 +52,7 @@ runTimeModifiable true;
functions functions
{ {
#include "sampling" #include "sampling"
#include "samplingDebug" // #include "samplingDebug"
} }