From 1f187d6f9e58c232a1363aafe4ffe46e6f20f876 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 10 Mar 2015 20:01:35 +0000
Subject: [PATCH] thermoSingleLayer: Revert q back to the working version in
 OpenFOAM-2.1.x Revert changes in tutorial to correspond to the version in
 OpenFOAM-2.1.x Resolves bug-report
 http://openfoam.org/mantisbt/view.php?id=1207

---
 .../thermoSingleLayer/thermoSingleLayer.C       | 17 ++++++-----------
 .../hotBoxes/constant/reactingCloud1Properties  |  8 ++++----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index e480d6e1..03b6de26 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -31,6 +31,7 @@ License
 #include "zeroGradientFvPatchFields.H"
 #include "mappedFieldFvPatchField.H"
 #include "mapDistribute.H"
+#include "constants.H"
 
 // Sub-models
 #include "filmThermoModel.H"
@@ -255,19 +256,13 @@ void thermoSingleLayer::updateSubmodels()
 
 tmp<fvScalarMatrix> thermoSingleLayer::q(volScalarField& hs) const
 {
-    dimensionedScalar Tstd("Tstd", dimTemperature, 298.15);
-
-    volScalarField boundedAlpha(max(alpha_, ROOTVSMALL));
-    volScalarField htcst(htcs_->h()*boundedAlpha);
-    volScalarField htcwt(htcw_->h()*boundedAlpha);
-
-    htcst.correctBoundaryConditions();
-    htcwt.correctBoundaryConditions();
-
     return
     (
-      - fvm::Sp(htcst/Cp_, hs) - htcst*(Tstd - TPrimary_)
-      - fvm::Sp(htcwt/Cp_, hs) - htcwt*(Tstd - Tw_)
+      - fvm::Sp(htcs_->h()/Cp_, hs)
+      - htcs_->h()*(constant::standard::Tstd - TPrimary_)
+
+      - fvm::Sp(htcw_->h()/Cp_, hs)
+      - htcw_->h()*(constant::standard::Tstd - Tw_)
     );
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index fec6bd25..164fa7fc 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  2.3.0                                 |
+|  \\    /   O peration     | Version:  2.3.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -83,12 +83,12 @@ subModels
                 ((0.6 0.35 1.45) (0 0 -1))
             );
 
-            massTotal       5;
+            massTotal       10;
             parcelsPerInjector 20000;
             parcelsPerSecond 500;
             parcelBasisType mass;
-            flowRateProfile constant 1;
-            Umag            constant 1;
+            flowRateProfile constant 0.1;
+            Umag            constant 3.0;
             thetaInner      constant 0;
             thetaOuter      constant 45;