From 0f3f5773cbb3bbdce6be7f6d610ea5fc69930705 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 3 Jun 2011 10:48:20 +0100
Subject: [PATCH] STYLE: Minor code style changes
---
.../thermoBaffleModels/noThermo/noThermo.C | 10 ++++---
.../thermoBaffle2D/thermoBaffle2D.C | 11 +++++---
.../thermoBaffle2D/thermoBaffle2D.H | 2 ++
.../thermoBaffleModel/thermoBaffleModel.C | 26 +++++++++----------
.../thermoBaffleModel/thermoBaffleModel.H | 1 -
5 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
index 6f89110f5e1..32b8e32e040 100644
--- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
+++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
@@ -64,13 +64,12 @@ noThermo::~noThermo()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void noThermo::preEvolveRegion()
-{
-}
+{}
void noThermo::evolveRegion()
-{
-}
+{}
+
const tmp<volScalarField> noThermo::Cp() const
{
@@ -103,6 +102,7 @@ const volScalarField& noThermo::kappa() const
return volScalarField::null();
}
+
const volScalarField& noThermo::rho() const
{
FatalErrorIn("const volScalarField& noThermo::rho() const")
@@ -110,6 +110,7 @@ const volScalarField& noThermo::rho() const
return volScalarField::null();
}
+
const volScalarField& noThermo::K() const
{
FatalErrorIn("const volScalarField& noThermo::K() const")
@@ -117,6 +118,7 @@ const volScalarField& noThermo::K() const
return volScalarField::null();
}
+
const volScalarField& noThermo::T() const
{
FatalErrorIn("const volScalarField& noThermo::T() const")
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
index 1b066e40e26..0cf810afc12 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.C
@@ -131,7 +131,6 @@ void thermoBaffle2D::solveEnergy()
TEqn.solve();
thermo_->correct();
-
}
@@ -217,8 +216,7 @@ thermoBaffle2D::~thermoBaffle2D()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void thermoBaffle2D::preEvolveRegion()
-{
-}
+{}
void thermoBaffle2D::evolveRegion()
@@ -229,31 +227,37 @@ void thermoBaffle2D::evolveRegion()
}
}
+
const tmp<volScalarField> thermoBaffle2D::Cp() const
{
return thermo_->Cp();
}
+
const volScalarField& thermoBaffle2D::kappa() const
{
return thermo_->kappa();
}
+
const volScalarField& thermoBaffle2D::rho() const
{
return thermo_->rho();
}
+
const volScalarField& thermoBaffle2D::K() const
{
return thermo_->K();
}
+
const volScalarField& thermoBaffle2D::T() const
{
return T_;
}
+
void thermoBaffle2D::info() const
{
Info<< indent << "min/max(T) = " << min(T_).value() << ", "
@@ -275,6 +279,7 @@ void thermoBaffle2D::info() const
}
}
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // end namespace thermoBaffleModels
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
index d03682e09f8..c35cdc1640d 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
@@ -80,6 +80,7 @@ protected:
//- Number of non orthogonal correctors
label nNonOrthCorr_;
+
// Thermo properties
//- Solid thermo
@@ -88,6 +89,7 @@ protected:
//- Temperature / [K]
volScalarField& T_;
+
// Source term fields
//- Surface energy source / [J/m2/s]
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C
index 87883a2df24..901e8c16009 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C
+++ b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.C
@@ -74,7 +74,7 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
{
const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
- // Check if region mesh in oneD
+ // Check if region mesh in 1-D
label nTotalEdges = 0;
const label patchi = intCoupledPatchIDs_[0];
nTotalEdges = 2*nLayers_*rbm[patchi].nInternalEdges();
@@ -113,10 +113,10 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
FatalErrorIn
(
"thermoBaffleModel::thermoBaffleModel"
- "(\n"
- " const word& modelType,"
- " const fvMesh& mesh"
- ")\n"
+ "("
+ " const word&,"
+ " const fvMesh&"
+ ")"
) << "\n patch type '" << pp.type()
<< "' not type '"
<< directMappedVariableThicknessWallPolyPatch::typeName
@@ -129,10 +129,10 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
FatalErrorIn
(
"thermoBaffleModel::thermoBaffleModel"
- "(\n"
- " const word& modelType,"
- " const fvMesh& mesh"
- ")\n"
+ "("
+ " const word&,"
+ " const fvMesh&"
+ ")"
) << "\n patch type '" << pp.type()
<< "' not type '"
<< directMappedWallPolyPatch::typeName
@@ -161,8 +161,8 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
(
"thermoBaffleModel::thermoBaffleModel"
"("
- " const word& modelType,"
- " const fvMesh& mesh"
+ " const word&,"
+ " const fvMesh&"
")"
) << " coupled patches in thermoBaffle are " << nl
<< " different sizes from list thickness" << nl
@@ -188,7 +188,6 @@ thermoBaffleModel::thermoBaffleModel(const word& modelType, const fvMesh& mesh)
}
}
}
-
}
}
@@ -202,8 +201,7 @@ thermoBaffleModel::~thermoBaffleModel()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void thermoBaffleModel::preEvolveRegion()
-{
-}
+{}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
index 3d8dabc8766..1a20d9222b9 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
+++ b/src/regionModels/thermoBaffleModels/thermoBaffleModel/thermoBaffleModel.H
@@ -173,7 +173,6 @@ public:
//- Pre-evolve region
virtual void preEvolveRegion();
-
};
--
GitLab