diff --git a/src/regionModels/thermoBaffleModels/Make/files b/src/regionModels/thermoBaffleModels/Make/files
index 41bb7d03dbf7e66fe338a037ad5d9d853cdea598..2799f6460bebca2c19b0e967648f10a6f5985396 100644
--- a/src/regionModels/thermoBaffleModels/Make/files
+++ b/src/regionModels/thermoBaffleModels/Make/files
@@ -1,9 +1,9 @@
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
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
similarity index 86%
rename from src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
rename to src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
index 496765d321bc6c880aefa40584f7510aab321d88..799bac6dfc9ffc1b4340914ea132c597bca2ba59 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
@@ -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
);
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H
similarity index 86%
rename from src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
rename to src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H
index b32a0127c4aea39ee7eb3d22dffcee9a3d325ffc..a3fa62d442f90db9273606c051a316de2431ac1b 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.H
@@ -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)
);
}
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C
similarity index 89%
rename from src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
rename to src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C
index 39f2e4cc047e5eadb841d08426ff196795f88134..9044f71fa2090ba757e65ded440ebad24a2f27a4 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.C
@@ -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();
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H
similarity index 90%
rename from src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
rename to src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H
index 52f648f8d60a010968c95080110654506dd40be7..93fcf19fd605ec3f8ee822e76f4ce8a99de7eaa7 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffle.H
@@ -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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H b/src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffleI.H
similarity index 93%
rename from src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H
rename to src/regionModels/thermoBaffleModels/thermoBaffle/thermoBaffleI.H
index 22d675bbb53a3e586a92aa0580a94b4d783e5863..107274f65e87a0b577bfd81c1c744312afa07b42 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2DI.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle/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();
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files
index 8098341f4b13880b297c2468cd61ce438ce1d059..e089735210054addf0e20ed8016f93eb256c6d8c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/files
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files
@@ -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
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.C
similarity index 88%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.C
index 5d39d5e40f2f7c1210eda020510fd0bac7644d82..2d4f331e20200e85dd442001d659367956c505c7 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.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>::
-temperatureThermoBaffle1DFvPatchScalarField
+thermoBaffle1DFvPatchScalarField<solidType>::
+thermoBaffle1DFvPatchScalarField
(
- const temperatureThermoBaffle1DFvPatchScalarField& ptf,
+ const thermoBaffle1DFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
)
:
@@ -165,7 +165,7 @@ temperatureThermoBaffle1DFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::autoMap
+void thermoBaffle1DFvPatchScalarField<solidType>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -174,7 +174,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::autoMap
}
template<class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::rmap
+void thermoBaffle1DFvPatchScalarField<solidType>::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@@ -185,7 +185,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::rmap
template<class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
+void thermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
{
if (updated())
{
@@ -242,8 +242,8 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
);
mpp.map().distribute(nbrQDot);
- const temperatureThermoBaffle1DFvPatchScalarField& nbrField =
- refCast<const temperatureThermoBaffle1DFvPatchScalarField>
+ const thermoBaffle1DFvPatchScalarField& nbrField =
+ refCast<const thermoBaffle1DFvPatchScalarField>
(
nbrPatch.template lookupPatchField<volScalarField, scalar>(TName_)
);
@@ -347,7 +347,7 @@ void temperatureThermoBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
}
template <class solidType>
-void temperatureThermoBaffle1DFvPatchScalarField<solidType>::
+void thermoBaffle1DFvPatchScalarField<solidType>::
write(Ostream& os) const
{
mixedFvPatchScalarField::write(os);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H
similarity index 79%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H
index 8708bd125c4a30a301bd93ec50f6cdb423dbfb19..33a26f39fd924a34e90e74b42a2f471419add414 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarField.H
@@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::temperatureThermoBaffle1DFvPatchScalarField
+ Foam::thermoBaffle1DFvPatchScalarField
Description
Boundary which solves the 1D steady state heat transfer equation
through a baffle.
SourceFiles
- temperatureThermoBaffle1DFvPatchScalarField.C
+ thermoBaffle1DFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
-#ifndef temperatureThermoBaffle1DFvPatchScalarField_H
-#define temperatureThermoBaffle1DFvPatchScalarField_H
+#ifndef thermoBaffle1DFvPatchScalarField_H
+#define thermoBaffle1DFvPatchScalarField_H
#include "mixedFvPatchFields.H"
#include "autoPtr.H"
@@ -48,11 +48,11 @@ namespace compressible
{
/*---------------------------------------------------------------------------*\
- Class temperatureThermoBaffle1DFvPatchScalarField Declaration
+ Class thermoBaffle1DFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
template<class solidType>
-class temperatureThermoBaffle1DFvPatchScalarField
+class thermoBaffle1DFvPatchScalarField
:
public mixedFvPatchScalarField
{
@@ -77,20 +77,20 @@ class temperatureThermoBaffle1DFvPatchScalarField
public:
//- Runtime type information
- TypeName("compressible::temperatureThermoBaffle1D");
+ TypeName("compressible::thermoBaffle1D");
// Constructors
//- Construct from patch and internal field
- temperatureThermoBaffle1DFvPatchScalarField
+ thermoBaffle1DFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
- temperatureThermoBaffle1DFvPatchScalarField
+ thermoBaffle1DFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@@ -98,19 +98,19 @@ public:
);
//- Construct by mapping given
- // temperatureThermoBaffle1DFvPatchScalarField onto a new patch
- temperatureThermoBaffle1DFvPatchScalarField
+ // thermoBaffle1DFvPatchScalarField onto a new patch
+ thermoBaffle1DFvPatchScalarField
(
- const temperatureThermoBaffle1DFvPatchScalarField&,
+ const thermoBaffle1DFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- temperatureThermoBaffle1DFvPatchScalarField
+ thermoBaffle1DFvPatchScalarField
(
- const temperatureThermoBaffle1DFvPatchScalarField&
+ const thermoBaffle1DFvPatchScalarField&
);
//- Construct and return a clone
@@ -118,14 +118,14 @@ public:
{
return tmp<fvPatchScalarField>
(
- new temperatureThermoBaffle1DFvPatchScalarField(*this)
+ new thermoBaffle1DFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
- temperatureThermoBaffle1DFvPatchScalarField
+ thermoBaffle1DFvPatchScalarField
(
- const temperatureThermoBaffle1DFvPatchScalarField&,
+ const thermoBaffle1DFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@@ -137,7 +137,7 @@ public:
{
return tmp<fvPatchScalarField>
(
- new temperatureThermoBaffle1DFvPatchScalarField(*this, iF)
+ new thermoBaffle1DFvPatchScalarField(*this, iF)
);
}
@@ -176,7 +176,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "temperatureThermoBaffle1DFvPatchScalarField.C"
+# include "thermoBaffle1DFvPatchScalarField.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
similarity index 80%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
index cc4da7852c5ce7ea818b787d6c856f945cef3af2..2e180238f49c2ef735362b42ea90ce1bfb1c196c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "temperatureThermoBaffle1DFvPatchScalarFields.H"
+#include "thermoBaffle1DFvPatchScalarFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -38,28 +38,28 @@ namespace compressible
defineTemplateTypeNameAndDebugWithName
(
- constSolid_temperatureThermoBaffle1DFvPatchScalarField,
- "compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>",
+ constSolid_thermoBaffle1DFvPatchScalarField,
+ "compressible::thermoBaffle1D<hConstSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
- constSolid_temperatureThermoBaffle1DFvPatchScalarField
+ constSolid_thermoBaffle1DFvPatchScalarField
);
defineTemplateTypeNameAndDebugWithName
(
- expoSolid_temperatureThermoBaffle1DFvPatchScalarField,
- "compressible::temperatureThermoBaffle1D<hExponentialSolidThermoPhysics>",
+ expoSolid_thermoBaffle1DFvPatchScalarField,
+ "compressible::thermoBaffle1D<hExponentialSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
- expoSolid_temperatureThermoBaffle1DFvPatchScalarField
+ expoSolid_thermoBaffle1DFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H
similarity index 81%
rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H
index 428d54b827b0f515eb3bf19cafb3611d85686d7c..931aeaae0705ce1896bcc0e0224a4facdb618300 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureThermoBaffle1D/temperatureThermoBaffle1DFvPatchScalarFields.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermoBaffle1D/thermoBaffle1DFvPatchScalarFields.H
@@ -23,10 +23,10 @@ License
\*---------------------------------------------------------------------------*/
-#ifndef temperatureThermoBaffle1DFvPatchScalarFields_H
-#define temperatureThermoBaffle1DFvPatchScalarFields_H
+#ifndef thermoBaffle1DFvPatchScalarFields_H
+#define thermoBaffle1DFvPatchScalarFields_H
-#include "temperatureThermoBaffle1DFvPatchScalarField.H"
+#include "thermoBaffle1DFvPatchScalarField.H"
#include "solidThermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,15 +38,15 @@ namespace compressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
- typedef temperatureThermoBaffle1DFvPatchScalarField
+ typedef thermoBaffle1DFvPatchScalarField
<
hConstSolidThermoPhysics
- >constSolid_temperatureThermoBaffle1DFvPatchScalarField;
+ >constSolid_thermoBaffle1DFvPatchScalarField;
- typedef temperatureThermoBaffle1DFvPatchScalarField
+ typedef thermoBaffle1DFvPatchScalarField
<
hExponentialSolidThermoPhysics
- >expoSolid_temperatureThermoBaffle1DFvPatchScalarField;
+ >expoSolid_thermoBaffle1DFvPatchScalarField;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
index 8d2ca105a3bf5efe2a14122e4a2bfef63cfab51f..acabb40438089d19f6ad5839a27658f47686e44e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
@@ -21,7 +21,7 @@ active no;
regionName none;
-thermoBaffle2DCoeffs
+thermoBaffleCoeffs
{
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
index 5a0ae0bb51f06f02f3dab4341e773a4b360c987f..1931c502a6651751c53662583940d9fa2288860a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/baffleRegion/changeDictionaryDict
@@ -22,7 +22,7 @@ dictionaryReplacement
{
"region0_to.*"
{
- type compressible::temperatureThermoBaffle;
+ type compressible::thermoBaffle;
neighbourFieldName T;
kappa solidThermo;
kappaName none;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
index f379d7dd7cdb21d9381f4b88830fe2cbbc932a16..6146edeb2b4e31f407a9f35aa33175b0b03db2dc 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict
@@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle.*"
{
- type compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
+ type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
index 770264278fa467571d2c4e0ba0efadc5dbd7b54f..d2933855c572bd3905f6492bf15262190aa09d5d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffle
@@ -88,7 +88,7 @@ dictionaryReplacement
{
"baffle1Wall.*"
{
- type compressible::temperatureThermoBaffle1D<hConstSolidThermoPhysics>;
+ type compressible::thermoBaffle1D<hConstSolidThermoPhysics>;
baffleActivated yes;
thickness uniform 0.005; // thickness [m]
Qs uniform 100; // heat flux [W/m2]
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index eb661d3a35dcfdfcd80ede8ff9c12b7ae4849ba6..1cbf29f10c6a875fde7c0af7161fc6d80d682be4 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -91,7 +91,7 @@ dictionaryReplacement
"region0_to.*"
{
- type compressible::temperatureThermoBaffle;
+ type compressible::thermoBaffle;
// Coupled BC.
neighbourFieldName T;
@@ -99,11 +99,11 @@ dictionaryReplacement
kappaName none;
// Thermo baffle model
- thermoBaffleModel thermoBaffle2D;
+ thermoBaffleModel thermoBaffle;
regionName baffleRegion;
infoOutput no;
active yes;
- thermoBaffle2DCoeffs
+ thermoBaffleCoeffs
{
}