From 94897015d6766bf9fb9db229bf762ac7368cf914 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 29 Dec 2014 11:12:29 +0000
Subject: [PATCH] externalWallHeatFluxTemperature: Combined logic into a single
switch
---
...allHeatFluxTemperatureFvPatchScalarField.C | 59 +++++++++----------
...allHeatFluxTemperatureFvPatchScalarField.H | 1 +
2 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index d3f8099ddfe..e6470981e61 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -33,26 +33,27 @@ License
namespace Foam
{
+ template<>
+ const char*
+ NamedEnum
+ <
+ externalWallHeatFluxTemperatureFvPatchScalarField::operationMode,
+ 3
+ >::names[] =
+ {
+ "fixed_heat_flux",
+ "fixed_heat_transfer_coefficient",
+ "unknown"
+ };
-template<>
-const char*
-NamedEnum
-<externalWallHeatFluxTemperatureFvPatchScalarField::operationMode, 3>::names[]=
-{
- "fixed_heat_flux",
- "fixed_heat_transfer_coefficient",
- "unknown"
-};
+} // End namespace Foam
-const NamedEnum
+const Foam::NamedEnum
<
- externalWallHeatFluxTemperatureFvPatchScalarField::operationMode, 3
->
-externalWallHeatFluxTemperatureFvPatchScalarField::operationModeNames;
+ Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationMode,
+ 3
+> Foam::externalWallHeatFluxTemperatureFvPatchScalarField::operationModeNames;
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -260,6 +261,10 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
{
case fixedHeatFlux:
{
+ refGrad() = (q_ + Qr)/kappa(Tp);
+ refValue() = 0.0;
+ valueFraction() = 0.0;
+
break;
}
case fixedHeatTransferCoeff:
@@ -277,6 +282,13 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
}
}
hp = 1.0/(1.0/h_ + totalSolidRes);
+
+ Qr /= Tp;
+ refGrad() = 0.0;
+ refValue() = hp*Ta_/(hp - Qr);
+ valueFraction() =
+ (hp - Qr)/((hp - Qr) + kappa(Tp)*patch().deltaCoeffs());
+
break;
}
default:
@@ -290,21 +302,6 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
}
}
- if (mode_ == fixedHeatFlux)
- {
- refGrad() = (q_ + Qr)/kappa(Tp);
- refValue() = 0.0;
- valueFraction() = 0.0;
- }
- else if (mode_ == fixedHeatTransferCoeff)
- {
- Qr /= Tp;
- refGrad() = 0.0;
- refValue() = hp*Ta_/(hp - Qr);
- valueFraction() =
- (hp - Qr)/((hp - Qr) + kappa(Tp)*patch().deltaCoeffs());
- }
-
mixedFvPatchScalarField::updateCoeffs();
if (debug)
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index 911a5549d3f..ad4bc5fd8b4 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -120,6 +120,7 @@ public:
fixedHeatTransferCoeff,
unknown
};
+
static const NamedEnum<operationMode, 3> operationModeNames;
--
GitLab