From 36fa660f36617f8b97cd1de80aa14715edaaf362 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 5 Aug 2013 13:42:18 +0100
Subject: [PATCH] BUG: Lagrangian TMax set using pvInvert function - mantis
 #939

---
 .../LiquidEvaporation/LiquidEvaporation.C                 | 8 ++------
 .../LiquidEvaporation/LiquidEvaporation.H                 | 2 +-
 .../LiquidEvaporationBoil/LiquidEvaporationBoil.C         | 5 ++---
 .../LiquidEvaporationBoil/LiquidEvaporationBoil.H         | 2 +-
 .../PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C  | 6 +-----
 .../PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H  | 2 +-
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index b46ea2b5bf1..5d7616b158e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -242,16 +242,12 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::dh
 
 
 template<class CloudType>
-Foam::scalar Foam::LiquidEvaporation<CloudType>::TMax
-(
-    const scalar pIn,
-    const scalar TIn
-) const
+Foam::scalar Foam::LiquidEvaporation<CloudType>::TMax(const scalar pIn) const
 {
     scalar T = -GREAT;
     forAll(liquids_, i)
     {
-        T = max(T, liquids_.properties()[i].pv(pIn, TIn));
+        T = max(T, liquids_.properties()[i].pv(pIn));
     }
 
     return T;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 5a97dc73944..fb2e2cdd9c8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -132,7 +132,7 @@ public:
         ) const;
 
         //- Return maximum/limiting temperature
-        virtual scalar TMax(const scalar pIn, const scalar TIn) const;
+        virtual scalar TMax(const scalar pIn) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
index 8a88620992f..468975d179b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
@@ -343,14 +343,13 @@ Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::dh
 template<class CloudType>
 Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::TMax
 (
-    const scalar pIn,
-    const scalar TIn
+    const scalar pIn
 ) const
 {
     scalar T = -GREAT;
     forAll(liquids_, i)
     {
-        T = max(T, liquids_.properties()[i].pv(pIn, TIn));
+        T = max(T, liquids_.properties()[i].pv(pIn));
     }
 
     return T;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
index bf9ca867ce5..2d11f55f320 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H
@@ -142,7 +142,7 @@ public:
         ) const;
 
         //- Return maximum/limiting temperature
-        virtual scalar TMax(const scalar pIn, const scalar TIn) const;
+        virtual scalar TMax(const scalar pIn) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 7141ff98147..3ba13f27e14 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -179,11 +179,7 @@ Foam::scalar Foam::PhaseChangeModel<CloudType>::dh
 
 
 template<class CloudType>
-Foam::scalar Foam::PhaseChangeModel<CloudType>::TMax
-(
-    const scalar,
-    const scalar
-) const
+Foam::scalar Foam::PhaseChangeModel<CloudType>::TMax(const scalar) const
 {
     return GREAT;
 }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index ac6c5c06b34..f61031c7582 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -185,7 +185,7 @@ public:
         ) const;
 
         //- Return maximum/limiting temperature
-        virtual scalar TMax(const scalar pIn, const scalar TIn) const;
+        virtual scalar TMax(const scalar pIn) const;
 
         //- Add to phase change mass
         void addToPhaseChangeMass(const scalar dMass);
-- 
GitLab