Updated headers

This commit is contained in:
Henry
2012-07-03 14:00:21 +01:00
parent c1696f9cde
commit d21b61a883
28 changed files with 76 additions and 70 deletions

View File

@ -2,8 +2,8 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
-I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \
-I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude

View File

@ -37,11 +37,11 @@ Description
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RAS/RASModel/RASModel.H"
#include "nutkWallFunction/nutkWallFunctionFvPatchScalarField.H"
#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
#include "basicThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "mutkWallFunction/mutkWallFunctionFvPatchScalarField.H"
#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H"
#include "wallDist.H"
@ -55,7 +55,7 @@ void calcIncompressibleYPlus
volScalarField& yPlus
)
{
typedef incompressible::RASModels::nutkWallFunctionFvPatchScalarField
typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
wallFunctionPatchField;
#include "createPhi.H"
@ -107,7 +107,7 @@ void calcCompressibleYPlus
volScalarField& yPlus
)
{
typedef compressible::RASModels::mutkWallFunctionFvPatchScalarField
typedef compressible::RASModels::mutWallFunctionFvPatchScalarField
wallFunctionPatchField;
IOobject rhoHeader

View File

@ -27,10 +27,10 @@ License
#include "volFields.H"
#include "incompressible/RAS/RASModel/RASModel.H"
#include "nutkWallFunction/nutkWallFunctionFvPatchScalarField.H"
#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "mutkWallFunction/mutkWallFunctionFvPatchScalarField.H"
#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H"
#include "wallDist.H"
@ -92,7 +92,7 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
volScalarField& yPlus
)
{
typedef incompressible::RASModels::nutkWallFunctionFvPatchScalarField
typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
wallFunctionPatchField;
const incompressible::RASModel& model =
@ -150,7 +150,7 @@ void Foam::yPlusRAS::calcCompressibleYPlus
volScalarField& yPlus
)
{
typedef compressible::RASModels::mutkWallFunctionFvPatchScalarField
typedef compressible::RASModels::mutWallFunctionFvPatchScalarField
wallFunctionPatchField;
const compressible::RASModel& model =

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "htcConvFvPatchScalarField.H"
#include "convectiveHeatTransferFvPatchScalarField.H"
#include "RASModel.H"
#include "fvPatchFieldMapper.H"
#include "addToRunTimeSelectionTable.H"
@ -39,7 +39,8 @@ namespace RASModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
htcConvFvPatchScalarField::htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField::
convectiveHeatTransferFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -50,9 +51,10 @@ htcConvFvPatchScalarField::htcConvFvPatchScalarField
{}
htcConvFvPatchScalarField::htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField::
convectiveHeatTransferFvPatchScalarField
(
const htcConvFvPatchScalarField& ptf,
const convectiveHeatTransferFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -63,7 +65,8 @@ htcConvFvPatchScalarField::htcConvFvPatchScalarField
{}
htcConvFvPatchScalarField::htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField::
convectiveHeatTransferFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -75,9 +78,10 @@ htcConvFvPatchScalarField::htcConvFvPatchScalarField
{}
htcConvFvPatchScalarField::htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField::
convectiveHeatTransferFvPatchScalarField
(
const htcConvFvPatchScalarField& htcpsf
const convectiveHeatTransferFvPatchScalarField& htcpsf
)
:
fixedValueFvPatchScalarField(htcpsf),
@ -85,9 +89,10 @@ htcConvFvPatchScalarField::htcConvFvPatchScalarField
{}
htcConvFvPatchScalarField::htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField::
convectiveHeatTransferFvPatchScalarField
(
const htcConvFvPatchScalarField& htcpsf,
const convectiveHeatTransferFvPatchScalarField& htcpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -98,24 +103,25 @@ htcConvFvPatchScalarField::htcConvFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void htcConvFvPatchScalarField::updateCoeffs()
void convectiveHeatTransferFvPatchScalarField::updateCoeffs()
{
if (updated())
{
return;
}
const label patchI = patch().index();
const label patchi = patch().index();
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalarField alphaEffw(rasModel.alphaEff(patchI));
const scalarField& muw = rasModel.mu().boundaryField()[patchI];
const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
const vectorField& Uc = rasModel.U();
const vectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField& Tw = rasModel.thermo().T().boundaryField()[patchI];
const scalarField& pw = rasModel.thermo().p().boundaryField()[patchI];
const scalarField Cpw(rasModel.thermo().Cp(pw, Tw, patchI));
const turbulenceModel& turbModel =
db().lookupObject<turbulenceModel>("turbulenceModel");
const scalarField alphaEffw(turbModel.alphaEff(patchi));
const scalarField& muw = turbModel.mu().boundaryField()[patchi];
const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
const vectorField& Uc = turbModel.U();
const vectorField& Uw = turbModel.U().boundaryField()[patchi];
const scalarField& Tw = turbModel.thermo().T().boundaryField()[patchi];
const scalarField& pw = turbModel.thermo().p().boundaryField()[patchi];
const scalarField Cpw(turbModel.thermo().Cp(pw, Tw, patchi));
const scalarField kappaw(Cpw*alphaEffw);
const scalarField Pr(muw*Cpw/kappaw);
@ -141,7 +147,7 @@ void htcConvFvPatchScalarField::updateCoeffs()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void htcConvFvPatchScalarField::write(Ostream& os) const
void convectiveHeatTransferFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
os.writeKeyword("L") << L_ << token::END_STATEMENT << nl;
@ -154,7 +160,7 @@ void htcConvFvPatchScalarField::write(Ostream& os) const
makePatchTypeField
(
fvPatchScalarField,
htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -22,13 +22,13 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::compressible::RASModels::htcConvFvPatchScalarField
Foam::compressible::RASModels::convectiveHeatTransferFvPatchScalarField
Description
Convective heat transfer boundary condition
SourceFiles
htcConvFvPatchScalarField.C
convectiveHeatTransferFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
@ -47,10 +47,10 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
Class htcConvFvPatchScalarField Declaration
Class convectiveHeatTransferFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class htcConvFvPatchScalarField
class convectiveHeatTransferFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@ -65,20 +65,20 @@ protected:
public:
//- Runtime type information
TypeName("htcConvection");
TypeName("convectiveHeatTransfer");
// Constructors
//- Construct from patch and internal field
htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -86,20 +86,20 @@ public:
);
//- Construct by mapping given
// htcConvFvPatchScalarField
// convectiveHeatTransferFvPatchScalarField
// onto a new patch
htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField
(
const htcConvFvPatchScalarField&,
const convectiveHeatTransferFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField
(
const htcConvFvPatchScalarField&
const convectiveHeatTransferFvPatchScalarField&
);
//- Construct and return a clone
@ -107,14 +107,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new htcConvFvPatchScalarField(*this)
new convectiveHeatTransferFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
htcConvFvPatchScalarField
convectiveHeatTransferFvPatchScalarField
(
const htcConvFvPatchScalarField&,
const convectiveHeatTransferFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -126,7 +126,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new htcConvFvPatchScalarField(*this, iF)
new convectiveHeatTransferFvPatchScalarField(*this, iF)
);
}

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

View File

@ -28,7 +28,7 @@ boundaryField
}
wallFilm
{
type htcConvection;
type convectiveHeatTransfer;
L 1.0;
value uniform 0;
}