From 24059d8139ef946984e7f262ba1272366e4daf5f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 24 May 2015 19:34:52 +0100
Subject: [PATCH] externalWallHeatFluxTemperature: Added support for relaxing
 the radiative contribution Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=1704

---
 ...allHeatFluxTemperatureFvPatchScalarField.C | 26 +++++++++++++++++--
 ...allHeatFluxTemperatureFvPatchScalarField.H |  6 +++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index d3f8099d..edd60c1a 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,6 +69,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     q_(p.size(), 0.0),
     h_(p.size(), 0.0),
     Ta_(p.size(), 0.0),
+    QrPrevious_(p.size()),
+    QrRelaxation_(1),
     QrName_("undefined-Qr"),
     thicknessLayers_(),
     kappaLayers_()
@@ -94,7 +96,9 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     q_(ptf.q_, mapper),
     h_(ptf.h_, mapper),
     Ta_(ptf.Ta_, mapper),
-    QrName_(ptf.QrName_),
+    QrPrevious_(ptf.QrPrevious_, mapper),
+    QrRelaxation_(ptf.QrRelaxation_),
+    QrName_(ptf.QrName_)
     thicknessLayers_(ptf.thicknessLayers_),
     kappaLayers_(ptf.kappaLayers_)
 {}
@@ -114,6 +118,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     q_(p.size(), 0.0),
     h_(p.size(), 0.0),
     Ta_(p.size(), 0.0),
+    QrPrevious_(p.size(), 0.0),
+    QrRelaxation_(dict.lookupOrDefault<scalar>("relaxation", 1)),
     QrName_(dict.lookupOrDefault<word>("Qr", "none")),
     thicknessLayers_(),
     kappaLayers_()
@@ -155,6 +161,11 @@ externalWallHeatFluxTemperatureFvPatchScalarField
 
     fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 
+    if (dict.found("QrPrevious"))
+    {
+        QrPrevious_ = scalarField("QrPrevious", dict, p.size());
+    }
+
     if (dict.found("refValue"))
     {
         // Full restart
@@ -184,6 +195,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     q_(tppsf.q_),
     h_(tppsf.h_),
     Ta_(tppsf.Ta_),
+    QrPrevious_(ptf.QrPrevious_),
+    QrRelaxation_(ptf.QrRelaxation_),
     QrName_(tppsf.QrName_),
     thicknessLayers_(tppsf.thicknessLayers_),
     kappaLayers_(tppsf.kappaLayers_)
@@ -203,6 +216,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     q_(tppsf.q_),
     h_(tppsf.h_),
     Ta_(tppsf.Ta_),
+    QrPrevious_(ptf.QrPrevious_),
+    QrRelaxation_(ptf.QrRelaxation_),
     QrName_(tppsf.QrName_),
     thicknessLayers_(tppsf.thicknessLayers_),
     kappaLayers_(tppsf.kappaLayers_)
@@ -254,6 +269,9 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
     if (QrName_ != "none")
     {
         Qr = patch().lookupPatchField<volScalarField, scalar>(QrName_);
+
+        Qr = QrRelaxation_*Qr + (1.0 - QrRelaxation_)*QrPrevious_;
+        QrPrevious_ = Qr;
     }
 
     switch (mode_)
@@ -331,7 +349,11 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::write
 {
     mixedFvPatchScalarField::write(os);
     temperatureCoupledBase::write(os);
+
+    QrPrevious_.writeEntry("QrPrevious", os);
     os.writeKeyword("Qr")<< QrName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("relaxation")<< QrRelaxation_
+        << token::END_STATEMENT << nl;
 
     switch (mode_)
     {
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
index 93c1dd32..bc10e92f 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
@@ -139,6 +139,12 @@ private:
         //- Ambient temperature / [K]
         scalarField Ta_;
 
+        //- Chache Qr for relaxation
+        scalarField QrPrevious_;
+
+        //- Relaxation for Qr
+        scalar QrRelaxation_;
+
         //- Name of the radiative heat flux
         const word QrName_;