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 /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2013-02-06 09:43:58 +00:00
parent 6ba4f9ceb7 0d91b161af
commit 9b401cdcec
58 changed files with 1237 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/regionModels/Allwclean
View File

@ -6,7 +6,7 @@ set -x
wclean $makeType regionModel
wclean $makeType pyrolysisModels
wclean $makeType surfaceFilmModels
wclean $makeType thermoBaffleModels
wclean $makeType thermalBaffleModels
wclean $makeType regionCoupling

2
src/regionModels/Allwmake
View File

@ -6,7 +6,7 @@ set -x
wmake $makeType regionModel
wmake $makeType pyrolysisModels
wmake $makeType surfaceFilmModels
wmake $makeType thermoBaffleModels
wmake $makeType thermalBaffleModels
wmake $makeType regionCoupling

4
src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,7 @@ makeDeltaCoeffs(scalarField& dc) const
const modelType& region1D =
patch().boundaryMesh().mesh().time().lookupObject<modelType>
(
"thermoBaffleProperties"
"thermalBaffleProperties"
);
dc = 2.0/(pp.thickness()/region1D.nLayers());

9
src/regionModels/thermalBaffleModels/Make/files Normal file
View File

@ -0,0 +1,9 @@
thermalBaffleModel/thermalBaffleModel.C
thermalBaffleModel/thermalBaffleModelNew.C
thermalBaffle/thermalBaffle.C
noThermo/noThermo.C
derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libthermalBaffleModels

0
src/regionModels/thermoBaffleModels/Make/options → src/regionModels/thermalBaffleModels/Make/options
View File

2
src/regionModels/thermoBaffleModels/derivedFvPatchFields/doc/thermoBaffleBoundaryConditionsDoc.H → src/regionModels/thermalBaffleModels/derivedFvPatchFields/doc/thermalBaffleBoundaryConditionsDoc.H
View File

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

44
src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C → src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffleFvPatchScalarField.H"
#include "thermalBaffleFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -35,8 +35,8 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField::
thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -49,10 +49,10 @@ thermoBaffleFvPatchScalarField
{}
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField::
thermalBaffleFvPatchScalarField
(
const thermoBaffleFvPatchScalarField& ptf,
const thermalBaffleFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -71,8 +71,8 @@ thermoBaffleFvPatchScalarField
{}
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField::
thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -88,8 +88,8 @@ thermoBaffleFvPatchScalarField
{
FatalErrorIn
(
"thermoBaffleFvPatchScalarField::"
"thermoBaffleFvPatchScalarField\n"
"thermalBaffleFvPatchScalarField::"
"thermalBaffleFvPatchScalarField\n"
"(\n"
" const fvPatch& p,\n"
" const DimensionedField<scalar, volMesh>& iF,\n"
@ -110,7 +110,7 @@ thermoBaffleFvPatchScalarField
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
typedef regionModels::thermoBaffleModels::thermoBaffleModel baffle;
typedef regionModels::thermalBaffleModels::thermalBaffleModel baffle;
if
(
@ -127,10 +127,10 @@ thermoBaffleFvPatchScalarField
}
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField::
thermalBaffleFvPatchScalarField
(
const thermoBaffleFvPatchScalarField& ptf,
const thermalBaffleFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -144,7 +144,7 @@ thermoBaffleFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void thermoBaffleFvPatchScalarField::autoMap
void thermalBaffleFvPatchScalarField::autoMap
(
const fvPatchFieldMapper& m
)
@ -153,7 +153,7 @@ void thermoBaffleFvPatchScalarField::autoMap
}
void thermoBaffleFvPatchScalarField::rmap
void thermalBaffleFvPatchScalarField::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@ -163,7 +163,7 @@ void thermoBaffleFvPatchScalarField::rmap
}
void thermoBaffleFvPatchScalarField::updateCoeffs()
void thermalBaffleFvPatchScalarField::updateCoeffs()
{
if (this->updated())
{
@ -181,7 +181,7 @@ void thermoBaffleFvPatchScalarField::updateCoeffs()
}
void thermoBaffleFvPatchScalarField::write(Ostream& os) const
void thermalBaffleFvPatchScalarField::write(Ostream& os) const
{
turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write(os);
@ -189,9 +189,9 @@ void thermoBaffleFvPatchScalarField::write(Ostream& os) const
if (thisMesh.name() == polyMesh::defaultRegion && owner_)
{
word thermoModel = dict_.lookup("thermoBaffleModel");
word thermoModel = dict_.lookup("thermalBaffleModel");
os.writeKeyword("thermoBaffleModel")
os.writeKeyword("thermalBaffleModel")
<< thermoModel
<< token::END_STATEMENT << nl;
@ -227,7 +227,7 @@ void thermoBaffleFvPatchScalarField::write(Ostream& os) const
makePatchTypeField
(
fvPatchScalarField,
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField
);

44
src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H → src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::thermoBaffleFvPatchScalarField
Foam::thermalBaffleFvPatchScalarField
Group
grpThermoBoundaryConditions
@ -56,11 +56,11 @@ Description
// Thermo baffle model
thermoBaffleModel thermoBaffle;
thermalBaffleModel thermalBaffle;
regionName baffleRegion;
infoOutput yes;
active yes;
thermoBaffleCoeffs
thermalBaffleCoeffs
{
}
@ -112,20 +112,20 @@ Description
SeeAlso
Foam::turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
Foam::regionModels::thermoBaffleModels::thermoBaffleModel
Foam::regionModels::thermalBaffleModels::thermalBaffleModel
SourceFiles
thermoBaffleFvPatchScalarField.C
thermalBaffleFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef thermoBaffleFvPatchScalarField_H
#define thermoBaffleFvPatchScalarField_H
#ifndef thermalBaffleFvPatchScalarField_H
#define thermalBaffleFvPatchScalarField_H
#include "autoPtr.H"
#include "regionModel.H"
#include "thermoBaffleModel.H"
#include "thermalBaffleModel.H"
#include "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -137,10 +137,10 @@ namespace compressible
{
/*---------------------------------------------------------------------------*\
Class thermoBaffleFvPatchScalarField Declaration
Class thermalBaffleFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class thermoBaffleFvPatchScalarField
class thermalBaffleFvPatchScalarField
:
public turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
{
@ -150,7 +150,7 @@ class thermoBaffleFvPatchScalarField
bool owner_;
//- Thermal baffle
autoPtr<regionModels::thermoBaffleModels::thermoBaffleModel> baffle_;
autoPtr<regionModels::thermalBaffleModels::thermalBaffleModel> baffle_;
//- Dictionary
dictionary dict_;
@ -159,20 +159,20 @@ class thermoBaffleFvPatchScalarField
public:
//- Runtime type information
TypeName("compressible::thermoBaffle");
TypeName("compressible::thermalBaffle");
// Constructors
//- Construct from patch and internal field
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -180,10 +180,10 @@ public:
);
//- Construct by mapping given
// thermoBaffleFvPatchScalarField onto a new patch
thermoBaffleFvPatchScalarField
// thermalBaffleFvPatchScalarField onto a new patch
thermalBaffleFvPatchScalarField
(
const thermoBaffleFvPatchScalarField&,
const thermalBaffleFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
@ -195,14 +195,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new thermoBaffleFvPatchScalarField(*this)
new thermalBaffleFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
thermoBaffleFvPatchScalarField
thermalBaffleFvPatchScalarField
(
const thermoBaffleFvPatchScalarField&,
const thermalBaffleFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -214,7 +214,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new thermoBaffleFvPatchScalarField(*this, iF)
new thermalBaffleFvPatchScalarField(*this, iF)
);
}

14
src/regionModels/thermoBaffleModels/noThermo/noThermo.C → src/regionModels/thermalBaffleModels/noThermo/noThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,15 +33,15 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noThermo, 0);
addToRunTimeSelectionTable(thermoBaffleModel, noThermo, mesh);
addToRunTimeSelectionTable(thermoBaffleModel, noThermo, dictionary);
addToRunTimeSelectionTable(thermalBaffleModel, noThermo, mesh);
addToRunTimeSelectionTable(thermalBaffleModel, noThermo, dictionary);
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@ -55,7 +55,7 @@ bool noThermo::read()
noThermo::noThermo(const word& modelType, const fvMesh& mesh)
:
thermoBaffleModel(mesh)
thermalBaffleModel(mesh)
{}
@ -66,7 +66,7 @@ noThermo::noThermo
const dictionary& dict
)
:
thermoBaffleModel(modelType, mesh, dict)
thermalBaffleModel(modelType, mesh, dict)
{}
@ -157,7 +157,7 @@ const solidThermo& noThermo::thermo() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam

10
src/regionModels/thermoBaffleModels/noThermo/noThermo.H → src/regionModels/thermalBaffleModels/noThermo/noThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,7 +35,7 @@ SourceFiles
#ifndef noThermo_H
#define noThermo_H
#include "thermoBaffleModel.H"
#include "thermalBaffleModel.H"
#include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +44,7 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
/*---------------------------------------------------------------------------*\
@ -53,7 +53,7 @@ namespace thermoBaffleModels
class noThermo
:
public thermoBaffleModel
public thermalBaffleModel
{
private:
@ -139,7 +139,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam

54
src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C → src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffle.H"
#include "thermalBaffle.H"
#include "fvm.H"
#include "fvcDiv.H"
@ -39,37 +39,37 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(thermoBaffle, 0);
defineTypeNameAndDebug(thermalBaffle, 0);
addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle, mesh);
addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle, dictionary);
addToRunTimeSelectionTable(thermalBaffleModel, thermalBaffle, mesh);
addToRunTimeSelectionTable(thermalBaffleModel, thermalBaffle, dictionary);
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
bool thermoBaffle::read()
bool thermalBaffle::read()
{
this->solution().lookup("nNonOrthCorr") >> nNonOrthCorr_;
return regionModel1D::read();
}
bool thermoBaffle::read(const dictionary& dict)
bool thermalBaffle::read(const dictionary& dict)
{
this->solution().lookup("nNonOrthCorr") >> nNonOrthCorr_;
return regionModel1D::read(dict);
}
void thermoBaffle::solveEnergy()
void thermalBaffle::solveEnergy()
{
if (debug)
{
Info<< "thermoBaffle::solveEnergy()" << endl;
Info<< "thermalBaffle::solveEnergy()" << endl;
}
const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
@ -157,14 +157,14 @@ void thermoBaffle::solveEnergy()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
thermoBaffle::thermoBaffle
thermalBaffle::thermalBaffle
(
const word& modelType,
const fvMesh& mesh,
const dictionary& dict
)
:
thermoBaffleModel(modelType, mesh, dict),
thermalBaffleModel(modelType, mesh, dict),
nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))),
thermo_(solidThermo::New(regionMesh(), dict)),
h_(thermo_->he()),
@ -218,13 +218,13 @@ thermoBaffle::thermoBaffle
}
thermoBaffle::thermoBaffle
thermalBaffle::thermalBaffle
(
const word& modelType,
const fvMesh& mesh
)
:
thermoBaffleModel(modelType, mesh),
thermalBaffleModel(modelType, mesh),
nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))),
thermo_(solidThermo::New(regionMesh())),
h_(thermo_->he()),
@ -279,13 +279,13 @@ thermoBaffle::thermoBaffle
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
thermoBaffle::~thermoBaffle()
thermalBaffle::~thermalBaffle()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void thermoBaffle::init()
void thermalBaffle::init()
{
if (oneD_ && !constantThickness_)
{
@ -294,7 +294,7 @@ void thermoBaffle::init()
if (Qsb!= thickness_.size())
{
FatalErrorIn("thermoBaffle::init()")
FatalErrorIn("thermalBaffle::init()")
<< "the boundary field of Qs is "
<< Qsb << " and " << nl
<< "the field 'thickness' is " << thickness_.size() << nl
@ -304,11 +304,11 @@ void thermoBaffle::init()
}
void thermoBaffle::preEvolveRegion()
void thermalBaffle::preEvolveRegion()
{}
void thermoBaffle::evolveRegion()
void thermalBaffle::evolveRegion()
{
for (int nonOrth=0; nonOrth<=nNonOrthCorr_; nonOrth++)
{
@ -317,43 +317,43 @@ void thermoBaffle::evolveRegion()
}
const tmp<volScalarField> thermoBaffle::Cp() const
const tmp<volScalarField> thermalBaffle::Cp() const
{
return thermo_->Cp();
}
const volScalarField& thermoBaffle::kappaRad() const
const volScalarField& thermalBaffle::kappaRad() const
{
return radiation_->absorptionEmission().a();
}
const volScalarField& thermoBaffle::rho() const
const volScalarField& thermalBaffle::rho() const
{
return thermo_->rho();
}
const volScalarField& thermoBaffle::kappa() const
const volScalarField& thermalBaffle::kappa() const
{
return thermo_->kappa();
}
const volScalarField& thermoBaffle::T() const
const volScalarField& thermalBaffle::T() const
{
return thermo_->T();
}
const solidThermo& thermoBaffle::thermo() const
const solidThermo& thermalBaffle::thermo() const
{
return thermo_;
}
void thermoBaffle::info() const
void thermalBaffle::info() const
{
const labelList& coupledPatches = intCoupledPatchIDs();
@ -375,7 +375,7 @@ void thermoBaffle::info() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // end namespace thermoBaffleModels
} // end namespace thermalBaffleModels
} // end namespace regionModels
} // end namespace Foam

40
src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H → src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,21 +22,21 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::thermoBaffle
Foam::thermalBaffle
Description
2D thermal baffle
SourceFiles
thermoBaffle.C
thermoBaffleI.H
thermalBaffle.C
thermalBaffleI.H
\*---------------------------------------------------------------------------*/
#ifndef thermoBaffle_H
#define thermoBaffle_H
#ifndef thermalBaffle_H
#define thermalBaffle_H
#include "thermoBaffleModel.H"
#include "thermalBaffleModel.H"
#include "volFieldsFwd.H"
@ -46,29 +46,29 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
/*---------------------------------------------------------------------------*\
Class thermoBaffle Declaration
Class thermalBaffle Declaration
\*---------------------------------------------------------------------------*/
class thermoBaffle
class thermalBaffle
:
public thermoBaffleModel
public thermalBaffleModel
{
private:
// Private member functions
//- Disallow default bitwise copy construct
thermoBaffle(const thermoBaffle&);
thermalBaffle(const thermalBaffle&);
//- Disallow default bitwise assignment
void operator=(const thermoBaffle&);
void operator=(const thermalBaffle&);
//- Initialize thermoBaffle
//- Initialize thermalBaffle
void init();
@ -124,16 +124,16 @@ protected:
public:
//- Runtime type information
TypeName("thermoBaffle");
TypeName("thermalBaffle");
// Constructors
//- Construct from components
thermoBaffle(const word& modelType, const fvMesh& mesh);
thermalBaffle(const word& modelType, const fvMesh& mesh);
//- Construct from components and dict
thermoBaffle
thermalBaffle
(
const word& modelType,
const fvMesh& mesh,
@ -142,7 +142,7 @@ public:
//- Destructor
virtual ~thermoBaffle();
virtual ~thermalBaffle();
// Member Functions
@ -205,13 +205,13 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoBaffleI.H"
#include "thermalBaffleI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffleI.H → src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffleI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffle.H"
#include "thermalBaffle.H"
#include "zeroGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -33,12 +33,12 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
inline tmp<scalarField> thermoBaffle::he
inline tmp<scalarField> thermalBaffle::he
(
const scalarField& p,
const scalarField& T,
@ -49,7 +49,7 @@ inline tmp<scalarField> thermoBaffle::he
}
inline tmp<volScalarField> thermoBaffle::he() const
inline tmp<volScalarField> thermalBaffle::he() const
{
return thermo_->he();
}
@ -57,7 +57,7 @@ inline tmp<volScalarField> thermoBaffle::he() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam

46
src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C → src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffleModel.H"
#include "thermalBaffleModel.H"
#include "fvMesh.H"
#include "mappedVariableThicknessWallPolyPatch.H"
#include "wedgePolyPatch.H"
@ -34,33 +34,33 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(thermoBaffleModel, 0);
defineRunTimeSelectionTable(thermoBaffleModel, mesh);
defineRunTimeSelectionTable(thermoBaffleModel, dictionary);
defineTypeNameAndDebug(thermalBaffleModel, 0);
defineRunTimeSelectionTable(thermalBaffleModel, mesh);
defineRunTimeSelectionTable(thermalBaffleModel, dictionary);
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
bool thermoBaffleModel::read()
bool thermalBaffleModel::read()
{
regionModel1D::read();
return true;
}
bool thermoBaffleModel::read(const dictionary& dict)
bool thermalBaffleModel::read(const dictionary& dict)
{
regionModel1D::read(dict);
return true;
}
void thermoBaffleModel::init()
void thermalBaffleModel::init()
{
if (active_)
{
@ -116,7 +116,7 @@ void thermoBaffleModel::init()
{
FatalErrorIn
(
"thermoBaffleModel::thermoBaffleModel"
"thermalBaffleModel::thermalBaffleModel"
"("
" const word&,"
" const fvMesh&"
@ -133,7 +133,7 @@ void thermoBaffleModel::init()
{
FatalErrorIn
(
"thermoBaffleModel::thermoBaffleModel"
"thermalBaffleModel::thermalBaffleModel"
"("
" const word&,"
" const fvMesh&"
@ -164,12 +164,12 @@ void thermoBaffleModel::init()
{
FatalErrorIn
(
"thermoBaffleModel::thermoBaffleModel"
"thermalBaffleModel::thermalBaffleModel"
"("
" const word&,"
" const fvMesh&"
")"
) << " coupled patches in thermoBaffle are " << nl
) << " coupled patches in thermalBaffle are " << nl
<< " different sizes from list thickness" << nl
<< exit(FatalError);
}
@ -199,7 +199,7 @@ void thermoBaffleModel::init()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
thermoBaffleModel::thermoBaffleModel(const fvMesh& mesh)
thermalBaffleModel::thermalBaffleModel(const fvMesh& mesh)
:
regionModel1D(mesh),
thickness_(),
@ -209,7 +209,7 @@ thermoBaffleModel::thermoBaffleModel(const fvMesh& mesh)
{}
thermoBaffleModel::thermoBaffleModel
thermalBaffleModel::thermalBaffleModel
(
const word& modelType,
const fvMesh& mesh,
@ -217,7 +217,7 @@ thermoBaffleModel::thermoBaffleModel
)
:
regionModel1D(mesh, "thermoBaffle", modelType, dict, true),
regionModel1D(mesh, "thermalBaffle", modelType, dict, true),
thickness_(),
delta_("delta", dimLength, 0.0),
oneD_(false),
@ -227,9 +227,13 @@ thermoBaffleModel::thermoBaffleModel
}
thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
thermalBaffleModel::thermalBaffleModel
(
const word& modelType,
const fvMesh& mesh
)
:
regionModel1D(mesh, "thermoBaffle", modelType),
regionModel1D(mesh, "thermalBaffle", modelType),
thickness_(),
delta_("delta", dimLength, 0.0),
oneD_(false),
@ -241,19 +245,19 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
thermoBaffleModel::~thermoBaffleModel()
thermalBaffleModel::~thermalBaffleModel()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void thermoBaffleModel::preEvolveRegion()
void thermalBaffleModel::preEvolveRegion()
{}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam

40
src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H → src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,17 +22,17 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::thermoBaffleModel
Foam::thermalBaffleModel
Description
SourceFiles
thermoBaffleModel.C
thermalBaffleModel.C
\*---------------------------------------------------------------------------*/
#ifndef thermoBaffleModel_H
#define thermoBaffleModel_H
#ifndef thermalBaffleModel_H
#define thermalBaffleModel_H
#include "runTimeSelectionTables.H"
#include "scalarIOField.H"
@ -49,14 +49,14 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
/*---------------------------------------------------------------------------*\
Class thermoBaffleModel Declaration
Class thermalBaffleModel Declaration
\*---------------------------------------------------------------------------*/
class thermoBaffleModel
class thermalBaffleModel
:
public regionModel1D
{
@ -65,10 +65,10 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
thermoBaffleModel(const thermoBaffleModel&);
thermalBaffleModel(const thermalBaffleModel&);
//- Disallow default bitwise assignment
void operator=(const thermoBaffleModel&);
void operator=(const thermalBaffleModel&);
//- Initialize thermal Baffle
void init();
@ -103,7 +103,7 @@ protected:
public:
//- Runtime type information
TypeName("thermoBaffleModel");
TypeName("thermalBaffleModel");
// Declare runtime constructor selection tables
@ -111,7 +111,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
thermoBaffleModel,
thermalBaffleModel,
mesh,
(
const word& modelType,
@ -123,7 +123,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
thermoBaffleModel,
thermalBaffleModel,
dictionary,
(
const word& modelType,
@ -137,13 +137,13 @@ public:
// Constructors
//- Construct null from mesh
thermoBaffleModel(const fvMesh& mesh);
thermalBaffleModel(const fvMesh& mesh);
//- Construct from type name and mesh
thermoBaffleModel(const word& modelType, const fvMesh& mesh);
thermalBaffleModel(const word& modelType, const fvMesh& mesh);
//- Construct from type name and mesh and dict
thermoBaffleModel
thermalBaffleModel
(
const word& modelType,
const fvMesh& mesh,
@ -154,10 +154,10 @@ public:
// Selectors
//- Return a reference to the selected model
static autoPtr<thermoBaffleModel> New(const fvMesh& mesh);
static autoPtr<thermalBaffleModel> New(const fvMesh& mesh);
//- Return a reference to the selected model using dictionary
static autoPtr<thermoBaffleModel> New
static autoPtr<thermalBaffleModel> New
(
const fvMesh& mesh,
const dictionary& dict
@ -165,7 +165,7 @@ public:
//- Destructor
virtual ~thermoBaffleModel();
virtual ~thermalBaffleModel();
// Member Functions
@ -227,7 +227,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam

38
src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModelNew.C → src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C
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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffleModel.H"
#include "thermalBaffleModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -31,20 +31,20 @@ namespace Foam
{
namespace regionModels
{
namespace thermoBaffleModels
namespace thermalBaffleModels
{
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
autoPtr<thermoBaffleModel> thermoBaffleModel::New(const fvMesh& mesh)
autoPtr<thermalBaffleModel> thermalBaffleModel::New(const fvMesh& mesh)
{
word modelType;
{
IOdictionary thermoBafflePropertiesDict
IOdictionary thermalBafflePropertiesDict
(
IOobject
(
"thermoBaffleProperties",
"thermalBaffleProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
@ -53,7 +53,7 @@ autoPtr<thermoBaffleModel> thermoBaffleModel::New(const fvMesh& mesh)
)
);
thermoBafflePropertiesDict.lookup("thermoBaffleModel") >> modelType;
thermalBafflePropertiesDict.lookup("thermalBaffleModel") >> modelType;
}
Info<< "Selecting baffle model " << modelType << endl;
@ -64,25 +64,25 @@ autoPtr<thermoBaffleModel> thermoBaffleModel::New(const fvMesh& mesh)
if (cstrIter == meshConstructorTablePtr_->end())
{
FatalErrorIn("thermoBaffleModel::New(const fvMesh&)")
<< "Unknown thermoBaffleModel type " << modelType
FatalErrorIn("thermalBaffleModel::New(const fvMesh&)")
<< "Unknown thermalBaffleModel type " << modelType
<< nl << nl
<< "Valid thermoBaffleModel types are:" << nl
<< "Valid thermalBaffleModel types are:" << nl
<< meshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<thermoBaffleModel>(cstrIter()(modelType, mesh));
return autoPtr<thermalBaffleModel>(cstrIter()(modelType, mesh));
}
autoPtr<thermoBaffleModel> thermoBaffleModel::New
autoPtr<thermalBaffleModel> thermalBaffleModel::New
(
const fvMesh& mesh,
const dictionary& dict
)
{
word modelType = dict.lookup("thermoBaffleModel");
word modelType = dict.lookup("thermalBaffleModel");
Info<< "Selecting baffle model " << modelType << endl;
@ -92,21 +92,23 @@ autoPtr<thermoBaffleModel> thermoBaffleModel::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn("thermoBaffleModel::New(const fvMesh&, const dictionary&)")
<< "Unknown thermoBaffleModel type " << modelType
FatalErrorIn
(
"thermalBaffleModel::New(const fvMesh&, const dictionary&)"
) << "Unknown thermalBaffleModel type " << modelType
<< nl << nl
<< "Valid thermoBaffleModel types are:" << nl
<< "Valid thermalBaffleModel types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<thermoBaffleModel>(cstrIter()(modelType, mesh, dict));
return autoPtr<thermalBaffleModel>(cstrIter()(modelType, mesh, dict));
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace thermoBaffleModels
} // End namespace thermalBaffleModels
} // End namespace regionModels
} // End namespace Foam

9
src/regionModels/thermoBaffleModels/Make/files
View File

@ -1,9 +0,0 @@
thermoBaffleModel/thermoBaffleModel.C
thermoBaffleModel/thermoBaffleModelNew.C
thermoBaffle/thermoBaffle.C
noThermo/noThermo.C
derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libthermoBaffleModels

2
src/thermophysicalModels/basic/Make/files
View File

@ -14,6 +14,4 @@ derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C
derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libfluidThermophysicalModels

94
src/thermophysicalModels/basic/basicThermo/basicThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,6 +24,14 @@ License
\*---------------------------------------------------------------------------*/
#include "basicThermo.H"
#include "zeroGradientFvPatchFields.H"
#include "fixedEnergyFvPatchScalarField.H"
#include "gradientEnergyFvPatchScalarField.H"
#include "mixedEnergyFvPatchScalarField.H"
#include "fixedJumpFvPatchFields.H"
#include "fixedJumpAMIFvPatchFields.H"
#include "energyJumpFvPatchScalarField.H"
#include "energyJumpAMIFvPatchScalarField.H"
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
@ -36,6 +44,84 @@ namespace Foam
const Foam::word Foam::basicThermo::dictName("thermophysicalProperties");
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
Foam::wordList Foam::basicThermo::heBoundaryBaseTypes()
{
const volScalarField::GeometricBoundaryField& tbf =
this->T_.boundaryField();
wordList hbt(tbf.size(), word::null);
forAll(tbf, patchi)
{
if (isA<fixedJumpFvPatchScalarField>(tbf[patchi]))
{
const fixedJumpFvPatchScalarField& pf =
dynamic_cast<const fixedJumpFvPatchScalarField&>(tbf[patchi]);
hbt[patchi] = pf.interfaceFieldType();
}
else if (isA<fixedJumpAMIFvPatchScalarField>(tbf[patchi]))
{
const fixedJumpAMIFvPatchScalarField& pf =
dynamic_cast<const fixedJumpAMIFvPatchScalarField&>
(
tbf[patchi]
);
hbt[patchi] = pf.interfaceFieldType();
}
}
return hbt;
}
Foam::wordList Foam::basicThermo::heBoundaryTypes()
{
const volScalarField::GeometricBoundaryField& tbf =
this->T_.boundaryField();
wordList hbt = tbf.types();
forAll(tbf, patchi)
{
if (isA<fixedValueFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = fixedEnergyFvPatchScalarField::typeName;
}
else if
(
isA<zeroGradientFvPatchScalarField>(tbf[patchi])
|| isA<fixedGradientFvPatchScalarField>(tbf[patchi])
)
{
hbt[patchi] = gradientEnergyFvPatchScalarField::typeName;
}
else if (isA<mixedFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = mixedEnergyFvPatchScalarField::typeName;
}
else if (isA<fixedJumpFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = energyJumpFvPatchScalarField::typeName;
}
else if (isA<fixedJumpAMIFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = energyJumpAMIFvPatchScalarField::typeName;
}
else if (tbf[patchi].type() == "energyRegionCoupledFvPatchScalarField")
{
hbt[patchi] = "energyRegionCoupledFvPatchScalarField";
}
}
return hbt;
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::volScalarField& Foam::basicThermo::lookupOrConstruct
@ -395,6 +481,12 @@ const Foam::volScalarField& Foam::basicThermo::T() const
}
Foam::volScalarField& Foam::basicThermo::T()
{
return T_;
}
const Foam::volScalarField& Foam::basicThermo::alpha() const
{
return alpha_;

17
src/thermophysicalModels/basic/basicThermo/basicThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,6 +77,9 @@ protected:
//- Should the dpdt term be included in the enthalpy equation
Switch dpdt_;
// Protected Member Functions
//- Construct as copy (not implemented)
basicThermo(const basicThermo&);
@ -86,6 +89,14 @@ protected:
const char* name
) const;
//- Return the enthalpy/internal energy field boundary types
// by interrogating the temperature field boundary types
wordList heBoundaryTypes();
//- Return the enthalpy/internal energy field boundary base types
// by interrogating the temperature field boundary types
wordList heBoundaryBaseTypes();
public:
@ -314,6 +325,10 @@ public:
//- Temperature [K]
virtual const volScalarField& T() const;
//- Temperature [K]
// Non-const access allowed for transport equations
virtual volScalarField& T();
//- Heat capacity at constant pressure [J/kg/K]
virtual tmp<volScalarField> Cp() const = 0;

85
src/thermophysicalModels/basic/heThermo/heThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,94 +24,11 @@ License
\*---------------------------------------------------------------------------*/
#include "heThermo.H"
#include "zeroGradientFvPatchFields.H"
#include "fixedEnergyFvPatchScalarField.H"
#include "gradientEnergyFvPatchScalarField.H"
#include "mixedEnergyFvPatchScalarField.H"
#include "fixedJumpFvPatchFields.H"
#include "fixedJumpAMIFvPatchFields.H"
#include "energyJumpFvPatchScalarField.H"
#include "energyJumpAMIFvPatchScalarField.H"
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
template<class BasicThermo, class MixtureType>
Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryBaseTypes()
{
const volScalarField::GeometricBoundaryField& tbf =
this->T_.boundaryField();
wordList hbt(tbf.size(), word::null);
forAll(tbf, patchi)
{
if (isA<fixedJumpFvPatchScalarField>(tbf[patchi]))
{
const fixedJumpFvPatchScalarField& pf =
dynamic_cast<const fixedJumpFvPatchScalarField&>(tbf[patchi]);
hbt[patchi] = pf.interfaceFieldType();
}
else if (isA<fixedJumpAMIFvPatchScalarField>(tbf[patchi]))
{
const fixedJumpAMIFvPatchScalarField& pf =
dynamic_cast<const fixedJumpAMIFvPatchScalarField&>
(
tbf[patchi]
);
hbt[patchi] = pf.interfaceFieldType();
}
}
return hbt;
}
template<class BasicThermo, class MixtureType>
Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryTypes()
{
const volScalarField::GeometricBoundaryField& tbf =
this->T_.boundaryField();
wordList hbt = tbf.types();
forAll(tbf, patchi)
{
if (isA<fixedValueFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = fixedEnergyFvPatchScalarField::typeName;
}
else if
(
isA<zeroGradientFvPatchScalarField>(tbf[patchi])
|| isA<fixedGradientFvPatchScalarField>(tbf[patchi])
)
{
hbt[patchi] = gradientEnergyFvPatchScalarField::typeName;
}
else if (isA<mixedFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = mixedEnergyFvPatchScalarField::typeName;
}
else if (isA<fixedJumpFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = energyJumpFvPatchScalarField::typeName;
}
else if (isA<fixedJumpAMIFvPatchScalarField>(tbf[patchi]))
{
hbt[patchi] = energyJumpAMIFvPatchScalarField::typeName;
}
else if (tbf[patchi].type() == "energyRegionCoupledFvPatchScalarField")
{
hbt[patchi] = "energyRegionCoupledFvPatchScalarField";
}
}
return hbt;
}
template<class BasicThermo, class MixtureType>
void Foam::heThermo<BasicThermo, MixtureType>::
heBoundaryCorrection(volScalarField& h)

10
src/thermophysicalModels/basic/heThermo/heThermo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -64,14 +64,6 @@ protected:
// Enthalpy/Internal energy
//- Return the enthalpy/internal energy field boundary types
// by interrogating the temperature field boundary types
wordList heBoundaryTypes();
//- Return the enthalpy/internal energy field boundary base types
// by interrogating the temperature field boundary types
wordList heBoundaryBaseTypes();
//- Correct the enthalpy/internal energy field boundaries
void heBoundaryCorrection(volScalarField& he);

4
src/turbulenceModels/compressible/turbulenceModel/Make/files
View File

@ -4,10 +4,10 @@ laminar/laminar.C
derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel

44
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.C → src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -39,8 +39,8 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class solidType>
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField<solidType>::
thermalBaffle1DFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -56,10 +56,10 @@ thermoBaffle1DFvPatchScalarField
template<class solidType>
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField<solidType>::
thermalBaffle1DFvPatchScalarField
(
const thermoBaffle1DFvPatchScalarField& ptf,
const thermalBaffle1DFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@ -75,8 +75,8 @@ thermoBaffle1DFvPatchScalarField
template<class solidType>
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField<solidType>::
thermalBaffle1DFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -94,8 +94,8 @@ thermoBaffle1DFvPatchScalarField
{
FatalErrorIn
(
"thermoBaffle1DFvPatchScalarField::"
"thermoBaffle1DFvPatchScalarField"
"thermalBaffle1DFvPatchScalarField::"
"thermalBaffle1DFvPatchScalarField"
"("
"const fvPatch&,\n"
"const DimensionedField<scalar, volMesh>&, "
@ -130,10 +130,10 @@ thermoBaffle1DFvPatchScalarField
template<class solidType>
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField<solidType>::
thermalBaffle1DFvPatchScalarField
(
const thermoBaffle1DFvPatchScalarField& ptf
const thermalBaffle1DFvPatchScalarField& ptf
)
:
mixedFvPatchScalarField(ptf),
@ -146,10 +146,10 @@ thermoBaffle1DFvPatchScalarField
template<class solidType>
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField<solidType>::
thermalBaffle1DFvPatchScalarField
(
const thermoBaffle1DFvPatchScalarField& ptf,
const thermalBaffle1DFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
)
:
@ -165,7 +165,7 @@ thermoBaffle1DFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class solidType>
void thermoBaffle1DFvPatchScalarField<solidType>::autoMap
void thermalBaffle1DFvPatchScalarField<solidType>::autoMap
(
const fvPatchFieldMapper& m
)
@ -174,7 +174,7 @@ void thermoBaffle1DFvPatchScalarField<solidType>::autoMap
}
template<class solidType>
void thermoBaffle1DFvPatchScalarField<solidType>::rmap
void thermalBaffle1DFvPatchScalarField<solidType>::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@ -185,7 +185,7 @@ void thermoBaffle1DFvPatchScalarField<solidType>::rmap
template<class solidType>
void thermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
{
if (updated())
{
@ -242,8 +242,8 @@ void thermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
);
mpp.map().distribute(nbrQDot);
const thermoBaffle1DFvPatchScalarField& nbrField =
refCast<const thermoBaffle1DFvPatchScalarField>
const thermalBaffle1DFvPatchScalarField& nbrField =
refCast<const thermalBaffle1DFvPatchScalarField>
(
nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_)
);
@ -347,7 +347,7 @@ void thermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
}
template <class solidType>
void thermoBaffle1DFvPatchScalarField<solidType>::
void thermalBaffle1DFvPatchScalarField<solidType>::
write(Ostream& os) const
{
mixedFvPatchScalarField::write(os);

40
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H → src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::thermoBaffle1DFvPatchScalarField
Foam::thermalBaffle1DFvPatchScalarField
Description
Boundary which solves the 1D steady state heat transfer equation
through a baffle.
SourceFiles
thermoBaffle1DFvPatchScalarField.C
thermalBaffle1DFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef thermoBaffle1DFvPatchScalarField_H
#define thermoBaffle1DFvPatchScalarField_H
#ifndef thermalBaffle1DFvPatchScalarField_H
#define thermalBaffle1DFvPatchScalarField_H
#include "mixedFvPatchFields.H"
#include "autoPtr.H"
@ -48,11 +48,11 @@ namespace compressible
{
/*---------------------------------------------------------------------------*\
Class thermoBaffle1DFvPatchScalarField Declaration
Class thermalBaffle1DFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
template<class solidType>
class thermoBaffle1DFvPatchScalarField
class thermalBaffle1DFvPatchScalarField
:
public mixedFvPatchScalarField
{
@ -77,20 +77,20 @@ class thermoBaffle1DFvPatchScalarField
public:
//- Runtime type information
TypeName("compressible::thermoBaffle1D");
TypeName("compressible::thermalBaffle1D");
// Constructors
//- Construct from patch and internal field
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@ -98,19 +98,19 @@ public:
);
//- Construct by mapping given
// thermoBaffle1DFvPatchScalarField onto a new patch
thermoBaffle1DFvPatchScalarField
// thermalBaffle1DFvPatchScalarField onto a new patch
thermalBaffle1DFvPatchScalarField
(
const thermoBaffle1DFvPatchScalarField&,
const thermalBaffle1DFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField
(
const thermoBaffle1DFvPatchScalarField&
const thermalBaffle1DFvPatchScalarField&
);
//- Construct and return a clone
@ -118,14 +118,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new thermoBaffle1DFvPatchScalarField(*this)
new thermalBaffle1DFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
thermoBaffle1DFvPatchScalarField
thermalBaffle1DFvPatchScalarField
(
const thermoBaffle1DFvPatchScalarField&,
const thermalBaffle1DFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@ -137,7 +137,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new thermoBaffle1DFvPatchScalarField(*this, iF)
new thermalBaffle1DFvPatchScalarField(*this, iF)
);
}
@ -176,7 +176,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "thermoBaffle1DFvPatchScalarField.C"
# include "thermalBaffle1DFvPatchScalarField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

16
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C → src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffle1DFvPatchScalarFields.H"
#include "thermalBaffle1DFvPatchScalarFields.H"
#include "addToRunTimeSelectionTable.H"
@ -38,28 +38,28 @@ namespace compressible
defineTemplateTypeNameAndDebugWithName
(
constSolid_thermoBaffle1DFvPatchScalarField,
"compressible::thermoBaffle1D<hConstSolidThermoPhysics>",
constSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hConstSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
constSolid_thermoBaffle1DFvPatchScalarField
constSolid_thermalBaffle1DFvPatchScalarField
);
defineTemplateTypeNameAndDebugWithName
(
expoSolid_thermoBaffle1DFvPatchScalarField,
"compressible::thermoBaffle1D<hExponentialSolidThermoPhysics>",
expoSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hExponentialSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
expoSolid_thermoBaffle1DFvPatchScalarField
expoSolid_thermalBaffle1DFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

16
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H → src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,10 +23,10 @@ License
\*---------------------------------------------------------------------------*/
#ifndef thermoBaffle1DFvPatchScalarFields_H
#define thermoBaffle1DFvPatchScalarFields_H
#ifndef thermalBaffle1DFvPatchScalarFields_H
#define thermalBaffle1DFvPatchScalarFields_H
#include "thermoBaffle1DFvPatchScalarField.H"
#include "thermalBaffle1DFvPatchScalarField.H"
#include "solidThermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -38,15 +38,15 @@ namespace compressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
typedef thermoBaffle1DFvPatchScalarField
typedef thermalBaffle1DFvPatchScalarField
<
hConstSolidThermoPhysics
>constSolid_thermoBaffle1DFvPatchScalarField;
>constSolid_thermalBaffle1DFvPatchScalarField;
typedef thermoBaffle1DFvPatchScalarField
typedef thermalBaffle1DFvPatchScalarField
<
hExponentialSolidThermoPhysics
>expoSolid_thermoBaffle1DFvPatchScalarField;
>expoSolid_thermalBaffle1DFvPatchScalarField;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C → src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -26,8 +26,7 @@ License
#include "wallHeatTransferFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "basicThermo.H"
#include "turbulenceModel.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -149,19 +148,19 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
return;
}
const basicThermo& thermo = basicThermo::lookupThermo(*this);
const label patchi = patch().index();
const compressible::turbulenceModel& turbModel =
db().lookupObject<compressible::turbulenceModel>
(
"turbulenceModel"
);
const scalarField& pw = thermo.p().boundaryField()[patchi];
const scalarField& Tw = thermo.T().boundaryField()[patchi];
const scalarField Cpw(thermo.Cp(pw, Tw, patchi));
const label patchi = patch().index();
valueFraction() =
1.0/
(
1.0
+ Cpw*thermo.alpha().boundaryField()[patchi]
*patch().deltaCoeffs()/alphaWall_
+ turbModel.kappaEff(patchi)*patch().deltaCoeffs()/alphaWall_
);
mixedFvPatchScalarField::updateCoeffs();

2
src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H → src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
View File

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