From 784d28d4404856ff744991d92b25e0a6b43d15c9 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Mon, 10 Jul 2017 08:25:09 +0100
Subject: [PATCH] thermoSingleLayer::q: Use a local "alpha" without
 hydrophilic/phobic adjustment

Resolves bug-report https://bugs.openfoam.org/view.php?id=2605
---
 .../kinematicSingleLayer/kinematicSingleLayer.C             | 2 +-
 .../surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 9debb2d99..059ae34a7 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -204,7 +204,7 @@ tmp<volScalarField> kinematicSingleLayer::pp()
 
 void kinematicSingleLayer::correctAlpha()
 {
-    alpha_ == pos0(delta_ - deltaSmall_);
+    alpha_ == pos(delta_ - deltaSmall_);
 }
 
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index f6e7dd901..2912f029f 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -268,15 +268,17 @@ void thermoSingleLayer::updateSubmodels()
 
 tmp<fvScalarMatrix> thermoSingleLayer::q(volScalarField& hs) const
 {
+    const volScalarField alpha(pos(delta_ - deltaSmall_));
+
     return
     (
         // Heat-transfer to the primary region
       - fvm::Sp(htcs_->h()/Cp_, hs)
-      + htcs_->h()*(hs/Cp_ + alpha_*(TPrimary_ - T_))
+      + htcs_->h()*(hs/Cp_ + alpha*(TPrimary_ - T_))
 
         // Heat-transfer to the wall
       - fvm::Sp(htcw_->h()/Cp_, hs)
-      + htcw_->h()*(hs/Cp_ + alpha_*(Tw_- T_))
+      + htcw_->h()*(hs/Cp_ + alpha*(Tw_- T_))
     );
 }