Commit 91a54847 authored by Henry's avatar Henry
Browse files

Rename thermoBaffle -> thermalBaffle

parent 1ae61659
......@@ -6,7 +6,7 @@ set -x
wclean $makeType regionModel
wclean $makeType pyrolysisModels
wclean $makeType surfaceFilmModels
wclean $makeType thermoBaffleModels
wclean $makeType thermalBaffleModels
wclean $makeType regionCoupling
......
......@@ -6,7 +6,7 @@ set -x
wmake $makeType regionModel
wmake $makeType pyrolysisModels
wmake $makeType surfaceFilmModels
wmake $makeType thermoBaffleModels
wmake $makeType thermalBaffleModels
wmake $makeType regionCoupling
......
......@@ -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());
......
thermalBaffleModel/thermalBaffleModel.C
thermalBaffleModel/thermalBaffleModelNew.C
thermalBaffle/thermalBaffle.C
noThermo/noThermo.C
derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libthermalBaffleModels
......@@ -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
);
......
......@@ -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)
);
}
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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"