zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry
2010-06-28 11:49:08 +01:00
parent 3e5c744969 b39a77a989
commit 344fba92af
6 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
View File

@ -61,7 +61,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
flowRate_(ptf.flowRate_),
phiName_(ptf.phiName_),
rhoName_(ptf.rhoName_)
rhoName_(ptf.rhoName_),
rpm_(ptf.rpm_)
{}

15
src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H
View File

@ -73,16 +73,16 @@ class swirlFlowRateInletVelocityFvPatchVectorField
// Private data
//- Inlet integral flow rate
scalar flowRate_;
const scalar flowRate_;
//- Name of the flux transporting the field
word phiName_;
const word phiName_;
//- Name of the density field used to normalize the mass flux
word rhoName_;
const word rhoName_;
//- RPM
scalar rpm_;
const scalar rpm_;
public:
@ -164,19 +164,12 @@ public:
return flowRate_;
}
//- Return reference to the flux to allow adjustment
scalar& flowRate()
{
return flowRate_;
}
//- Update the coefficients associated with the patch field
virtual void updateCoeffs();
//- Write
virtual void write(Ostream&) const;
};

12
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
View File

@ -78,19 +78,19 @@ class atmBoundaryLayerInletEpsilonFvPatchScalarField
// Private data
//- Frictional velocity
scalar Ustar_;
const scalar Ustar_;
//- Direction of the z-coordinate
vector z_;
//- Surface roughness lenght
scalar z0_;
const scalar z0_;
//- Von Karman constant
scalar kappa_;
const scalar kappa_;
//- Minimum corrdinate value in z direction
scalar zGround_;
const scalar zGround_;
public:
@ -158,13 +158,13 @@ public:
// Member functions
//- Return max value
scalar& Ustar()
scalar Ustar() const
{
return Ustar_;
}
//- Return z direction
vector& z()
const vector& z() const
{
return z_;
}

10
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
View File

@ -101,19 +101,19 @@ class atmBoundaryLayerInletVelocityFvPatchVectorField
vector z_;
//- Surface roughness lenght
scalar z0_;
const scalar z0_;
//- Von Karman constant
scalar kappa_;
const scalar kappa_;
//- Reference velocity
scalar Uref_;
const scalar Uref_;
//- Reference hight
scalar Href_;
const scalar Href_;
//- Minimum corrdinate value in z direction
scalar zGround_;
const scalar zGround_;
public:

18
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
View File

@ -38,8 +38,7 @@ namespace incompressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
fixedShearStressFvPatchVectorField::
fixedShearStressFvPatchVectorField
fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF
@ -50,8 +49,7 @@ fixedShearStressFvPatchVectorField
{}
fixedShearStressFvPatchVectorField::
fixedShearStressFvPatchVectorField
fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
@ -65,8 +63,7 @@ fixedShearStressFvPatchVectorField
}
fixedShearStressFvPatchVectorField::
fixedShearStressFvPatchVectorField
fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
(
const fixedShearStressFvPatchVectorField& ptf,
const fvPatch& p,
@ -79,8 +76,7 @@ fixedShearStressFvPatchVectorField
{}
fixedShearStressFvPatchVectorField::
fixedShearStressFvPatchVectorField
fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
(
const fixedShearStressFvPatchVectorField& ptf
)
@ -90,8 +86,7 @@ fixedShearStressFvPatchVectorField
{}
fixedShearStressFvPatchVectorField::
fixedShearStressFvPatchVectorField
fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
(
const fixedShearStressFvPatchVectorField& ptf,
const DimensionedField<vector, volMesh>& iF
@ -119,7 +114,7 @@ void fixedShearStressFvPatchVectorField::updateCoeffs()
const vectorField Ui = Uw.patchInternalField();
vector tauHat = tau0_/mag(tau0_);
vector tauHat = tau0_/(mag(tau0_) + ROOTVSMALL);
const scalarField& ry = patch().deltaCoeffs();
@ -161,4 +156,5 @@ makePatchTypeField
} // End namespace incompressible
} // End namespace Foam
// ************************************************************************* //

3
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H
View File

@ -56,7 +56,7 @@ class fixedShearStressFvPatchVectorField
// Private data
//- Constant shear stress
vector tau0_;
const vector tau0_;
public:
@ -140,6 +140,7 @@ public:
} // End namespace incompressible
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif