Commit e9a26d79 authored by sergio's avatar sergio
Browse files

ENH: Renaming temperatureThermoBaffle to thermoBaffle

     thermoBaffle2D to thermoBaffle
     temperatureThermoBaffle1D to thermoBaffle1D
parent dc2418eb
thermoBaffleModel/thermoBaffleModel.C
thermoBaffleModel/thermoBaffleModelNew.C
thermoBaffle2D/thermoBaffle2D.C
thermoBaffle/thermoBaffle.C
noThermo/noThermo.C
derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libthermoBaffleModels
......@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "temperatureThermoBaffleFvPatchScalarField.H"
#include "thermoBaffleFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -36,8 +36,8 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
temperatureThermoBaffleFvPatchScalarField::
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
......@@ -50,10 +50,10 @@ temperatureThermoBaffleFvPatchScalarField
{}
temperatureThermoBaffleFvPatchScalarField::
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
(
const temperatureThermoBaffleFvPatchScalarField& ptf,
const thermoBaffleFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
......@@ -72,8 +72,8 @@ temperatureThermoBaffleFvPatchScalarField
{}
temperatureThermoBaffleFvPatchScalarField::
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
......@@ -89,8 +89,8 @@ temperatureThermoBaffleFvPatchScalarField
{
FatalErrorIn
(
"temperatureThermoBaffleFvPatchScalarField::"
"temperatureThermoBaffleFvPatchScalarField\n"
"thermoBaffleFvPatchScalarField::"
"thermoBaffleFvPatchScalarField\n"
"(\n"
" const fvPatch& p,\n"
" const DimensionedField<scalar, volMesh>& iF,\n"
......@@ -128,10 +128,10 @@ temperatureThermoBaffleFvPatchScalarField
}
temperatureThermoBaffleFvPatchScalarField::
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField::
thermoBaffleFvPatchScalarField
(
const temperatureThermoBaffleFvPatchScalarField& ptf,
const thermoBaffleFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
)
:
......@@ -145,7 +145,7 @@ temperatureThermoBaffleFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void temperatureThermoBaffleFvPatchScalarField::autoMap
void thermoBaffleFvPatchScalarField::autoMap
(
const fvPatchFieldMapper& m
)
......@@ -154,7 +154,7 @@ void temperatureThermoBaffleFvPatchScalarField::autoMap
}
void temperatureThermoBaffleFvPatchScalarField::rmap
void thermoBaffleFvPatchScalarField::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
......@@ -164,7 +164,7 @@ void temperatureThermoBaffleFvPatchScalarField::rmap
}
void temperatureThermoBaffleFvPatchScalarField::updateCoeffs()
void thermoBaffleFvPatchScalarField::updateCoeffs()
{
if (this->updated())
{
......@@ -186,7 +186,7 @@ void temperatureThermoBaffleFvPatchScalarField::updateCoeffs()
}
void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
void thermoBaffleFvPatchScalarField::write(Ostream& os) const
{
turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write(os);
......@@ -217,10 +217,10 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
os.writeKeyword("thermoType");
os << dict_.subDict("thermoType") << nl;
os.writeKeyword("mixture");
os << dict_.subDict("mixture") << nl;
os.writeKeyword("radiation");
os << dict_.subDict("radiation") << nl;
}
......@@ -232,7 +232,7 @@ void temperatureThermoBaffleFvPatchScalarField::write(Ostream& os) const
makePatchTypeField
(
fvPatchScalarField,
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField
);
......
......@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::temperatureThermoBaffleFvPatchScalarField
Foam::thermoBaffleFvPatchScalarField
Group
grpThermoBoundaryConditions
......@@ -56,11 +56,11 @@ Description
// Thermo baffle model
thermoBaffleModel thermoBaffle2D;
thermoBaffleModel thermoBaffle;
regionName baffleRegion;
infoOutput yes;
active yes;
thermoBaffle2DCoeffs
thermoBaffleCoeffs
{
}
......@@ -115,12 +115,12 @@ SeeAlso
Foam::regionModels::thermoBaffleModels::thermoBaffleModel
SourceFiles
temperatureThermoBaffleFvPatchScalarField.C
thermoBaffleFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
#ifndef temperatureThermoBaffleFvPatchScalarField_H
#define temperatureThermoBaffleFvPatchScalarField_H
#ifndef thermoBaffleFvPatchScalarField_H
#define thermoBaffleFvPatchScalarField_H
#include "autoPtr.H"
......@@ -137,10 +137,10 @@ namespace compressible
{
/*---------------------------------------------------------------------------*\
Class temperatureThermoBaffleFvPatchScalarField Declaration
Class thermoBaffleFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
class temperatureThermoBaffleFvPatchScalarField
class thermoBaffleFvPatchScalarField
:
public turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
{
......@@ -159,20 +159,20 @@ class temperatureThermoBaffleFvPatchScalarField
public:
//- Runtime type information
TypeName("compressible::temperatureThermoBaffle");
TypeName("compressible::thermoBaffle");
// Constructors
//- Construct from patch and internal field
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
......@@ -180,10 +180,10 @@ public:
);
//- Construct by mapping given
// temperatureThermoBaffleFvPatchScalarField onto a new patch
temperatureThermoBaffleFvPatchScalarField
// thermoBaffleFvPatchScalarField onto a new patch
thermoBaffleFvPatchScalarField
(
const temperatureThermoBaffleFvPatchScalarField&,
const thermoBaffleFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
......@@ -195,14 +195,14 @@ public:
{
return tmp<fvPatchScalarField>
(
new temperatureThermoBaffleFvPatchScalarField(*this)
new thermoBaffleFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
temperatureThermoBaffleFvPatchScalarField
thermoBaffleFvPatchScalarField
(
const temperatureThermoBaffleFvPatchScalarField&,
const thermoBaffleFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
......@@ -214,7 +214,7 @@ public:
{
return tmp<fvPatchScalarField>
(
new temperatureThermoBaffleFvPatchScalarField(*this, iF)
new thermoBaffleFvPatchScalarField(*this, iF)
);
}
......
......@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffle2D.H"
#include "thermoBaffle.H"
#include "fvm.H"
#include "fvcDiv.H"
......@@ -44,32 +44,32 @@ namespace thermoBaffleModels
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(thermoBaffle2D, 0);
defineTypeNameAndDebug(thermoBaffle, 0);
addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle2D, mesh);
addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle2D, dictionary);
addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle, mesh);
addToRunTimeSelectionTable(thermoBaffleModel, thermoBaffle, dictionary);
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
bool thermoBaffle2D::read()
bool thermoBaffle::read()
{
this->solution().lookup("nNonOrthCorr") >> nNonOrthCorr_;
return regionModel1D::read();
}
bool thermoBaffle2D::read(const dictionary& dict)
bool thermoBaffle::read(const dictionary& dict)
{
this->solution().lookup("nNonOrthCorr") >> nNonOrthCorr_;
return regionModel1D::read(dict);
}
void thermoBaffle2D::solveEnergy()
void thermoBaffle::solveEnergy()
{
if (debug)
{
Info<< "thermoBaffle2D::solveEnergy()" << endl;
Info<< "thermoBaffle::solveEnergy()" << endl;
}
const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
......@@ -157,7 +157,7 @@ void thermoBaffle2D::solveEnergy()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
thermoBaffle2D::thermoBaffle2D
thermoBaffle::thermoBaffle
(
const word& modelType,
const fvMesh& mesh,
......@@ -218,7 +218,7 @@ thermoBaffle2D::thermoBaffle2D
}
thermoBaffle2D::thermoBaffle2D
thermoBaffle::thermoBaffle
(
const word& modelType,
const fvMesh& mesh
......@@ -279,13 +279,13 @@ thermoBaffle2D::thermoBaffle2D
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
thermoBaffle2D::~thermoBaffle2D()
thermoBaffle::~thermoBaffle()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void thermoBaffle2D::init()
void thermoBaffle::init()
{
if (oneD_ && !constantThickness_)
{
......@@ -294,7 +294,7 @@ void thermoBaffle2D::init()
if (Qsb!= thickness_.size())
{
FatalErrorIn("thermoBaffle2D::init()")
FatalErrorIn("thermoBaffle::init()")
<< "the boundary field of Qs is "
<< Qsb << " and " << nl
<< "the field 'thickness' is " << thickness_.size() << nl
......@@ -304,11 +304,11 @@ void thermoBaffle2D::init()
}
void thermoBaffle2D::preEvolveRegion()
void thermoBaffle::preEvolveRegion()
{}
void thermoBaffle2D::evolveRegion()
void thermoBaffle::evolveRegion()
{
for (int nonOrth=0; nonOrth<=nNonOrthCorr_; nonOrth++)
{
......@@ -317,43 +317,43 @@ void thermoBaffle2D::evolveRegion()
}
const tmp<volScalarField> thermoBaffle2D::Cp() const
const tmp<volScalarField> thermoBaffle::Cp() const
{
return thermo_->Cp();
}
const volScalarField& thermoBaffle2D::kappaRad() const
const volScalarField& thermoBaffle::kappaRad() const
{
return radiation_->absorptionEmission().a();
}
const volScalarField& thermoBaffle2D::rho() const
const volScalarField& thermoBaffle::rho() const
{
return thermo_->rho();
}
const volScalarField& thermoBaffle2D::kappa() const
const volScalarField& thermoBaffle::kappa() const
{
return thermo_->kappa();
}
const volScalarField& thermoBaffle2D::T() const
const volScalarField& thermoBaffle::T() const
{
return thermo_->T();
}
const solidThermo& thermoBaffle2D::thermo() const
const solidThermo& thermoBaffle::thermo() const
{
return thermo_;
}
void thermoBaffle2D::info() const
void thermoBaffle::info() const
{
const labelList& coupledPatches = intCoupledPatchIDs();
......
......@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::thermoBaffle2D
Foam::thermoBaffle
Description
2D thermal baffle
SourceFiles
thermoBaffle2D.C
thermoBaffle2DI.H
thermoBaffle.C
thermoBaffleI.H
\*---------------------------------------------------------------------------*/
#ifndef thermoBaffle2D_H
#define thermoBaffle2D_H
#ifndef thermoBaffle_H
#define thermoBaffle_H
#include "thermoBaffleModel.H"
#include "volFieldsFwd.H"
......@@ -51,10 +51,10 @@ namespace thermoBaffleModels
/*---------------------------------------------------------------------------*\
Class thermoBaffle2D Declaration
Class thermoBaffle Declaration
\*---------------------------------------------------------------------------*/
class thermoBaffle2D
class thermoBaffle
:
public thermoBaffleModel
{
......@@ -63,12 +63,12 @@ private:
// Private member functions
//- Disallow default bitwise copy construct
thermoBaffle2D(const thermoBaffle2D&);
thermoBaffle(const thermoBaffle&);
//- Disallow default bitwise assignment
void operator=(const thermoBaffle2D&);
void operator=(const thermoBaffle&);
//- Initialize thermoBaffle2D
//- Initialize thermoBaffle
void init();
......@@ -124,16 +124,16 @@ protected:
public:
//- Runtime type information
TypeName("thermoBaffle2D");
TypeName("thermoBaffle");
// Constructors
//- Construct from components
thermoBaffle2D(const word& modelType, const fvMesh& mesh);
thermoBaffle(const word& modelType, const fvMesh& mesh);
//- Construct from components and dict
thermoBaffle2D
thermoBaffle
(
const word& modelType,
const fvMesh& mesh,
......@@ -142,7 +142,7 @@ public:
//- Destructor
virtual ~thermoBaffle2D();
virtual ~thermoBaffle();
// Member Functions
......@@ -211,7 +211,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "thermoBaffle2DI.H"
#include "thermoBaffleI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoBaffle2D.H"
#include "thermoBaffle.H"
#include "zeroGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -38,7 +38,7 @@ namespace thermoBaffleModels
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
inline tmp<scalarField> thermoBaffle2D::he
inline tmp<scalarField> thermoBaffle::he
(
const scalarField& p,
const scalarField& T,
......@@ -49,7 +49,7 @@ inline tmp<scalarField> thermoBaffle2D::he
}
inline tmp<volScalarField> thermoBaffle2D::he() const
inline tmp<volScalarField> thermoBaffle::he() const
{
return thermo_->he();
}
......
......@@ -4,7 +4,7 @@ laminar/laminar.C
derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C
derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
......
......@@ -39,8 +39,8 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class solidType>
temperatureThermoBaffle1DFvPatchScalarField<solidType>::
temperatureThermoBaffle1DFvPatchScalarField
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
......@@ -56,10 +56,10 @@ temperatureThermoBaffle1DFvPatchScalarField
template<class solidType>
temperatureThermoBaffle1DFvPatchScalarField<solidType>::
temperatureThermoBaffle1DFvPatchScalarField
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
(
const temperatureThermoBaffle1DFvPatchScalarField& ptf,
const thermoBaffle1DFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
......@@ -75,8 +75,8 @@ temperatureThermoBaffle1DFvPatchScalarField
template<class solidType>
temperatureThermoBaffle1DFvPatchScalarField<solidType>::
temperatureThermoBaffle1DFvPatchScalarField
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
......@@ -94,8 +94,8 @@ temperatureThermoBaffle1DFvPatchScalarField
{
FatalErrorIn
(
"temperatureThermoBaffle1DFvPatchScalarField::"
"temperatureThermoBaffle1DFvPatchScalarField"
"thermoBaffle1DFvPatchScalarField::"
"thermoBaffle1DFvPatchScalarField"
"("
"const fvPatch&,\n"
"const DimensionedField<scalar, volMesh>&, "
......@@ -130,10 +130,10 @@ temperatureThermoBaffle1DFvPatchScalarField
template<class solidType>
temperatureThermoBaffle1DFvPatchScalarField<solidType>::
temperatureThermoBaffle1DFvPatchScalarField
thermoBaffle1DFvPatchScalarField<solidType>::
thermoBaffle1DFvPatchScalarField
(
const temperatureThermoBaffle1DFvPatchScalarField& ptf
const thermoBaffle1DFvPatchScalarField& ptf
)
:
mixedFvPatchScalarField(ptf),
......@@ -146,10 +146,10 @@ temperatureThermoBaffle1DFvPatchScalarField
template<class solidType>
temperatureThermoBaffle1DFvPatchScalarField<solidType>::