From b2aeb264b12725de623aca30be521c9f76f1ef6c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 12 Jun 2019 10:23:34 +0100
Subject: [PATCH 1/3] COMP: Allwmake: turbulentFluidThermoModels already in
 compressible turb

---
 src/Allwmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Allwmake b/src/Allwmake
index 31ff2e265a..c693a09ba7 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -109,7 +109,6 @@ wmake $targetType semiPermeableBaffle
 wmake $targetType atmosphericModels
 
 phaseSystemModels/Allwmake $targetType $*
-wmake $targetType TurbulenceModels/compressible/turbulentFluidThermoModels/
 
 # Needs access to Turbulence
 

From fb4230c3beab03cb543572c32bffcb3f31846635 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 12 Jun 2019 12:27:06 +0100
Subject: [PATCH 2/3] STYLE: dictionary: use get() method

---
 .../temperatureCoupledBase/temperatureCoupledBase.C             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 297a9cefc6..c9732706e5 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -70,7 +70,7 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
 )
 :
     patch_(patch),
-    method_(KMethodTypeNames_.lookup("kappaMethod", dict)),
+    method_(KMethodTypeNames_.get("kappaMethod", dict)),
     kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
     alphaAniName_(dict.lookupOrDefault<word>("alphaAni","none"))
 {

From 6c2220cdd6507f23c6403e1b6a55b0ee6a785d22 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 12 Jun 2019 12:27:28 +0100
Subject: [PATCH 3/3] BUG: fileMonitor: do not allow used watch also in free
 watches.

See #1328.
---
 .../MSwindows/fileMonitor/fileMonitor.C         | 17 +++++++++++------
 src/OSspecific/POSIX/fileMonitor/fileMonitor.C  | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
index 425a0c333d..b40c49c484 100644
--- a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
+++ b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
@@ -450,14 +450,16 @@ Foam::fileMonitor::~fileMonitor()
 // regIOobject)
 Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
 {
+    if (debug)
+    {
+        Pout<< "fileMonitor : adding watch on file " << fName << endl;
+    }
+
     label watchFd;
 
-    label sz = freeWatchFds_.size();
-
-    if (sz)
+    if (freeWatchFds_.size())
     {
-        watchFd = freeWatchFds_[sz-1];
-        freeWatchFds_.setSize(sz-1);
+        watchFd = freeWatchFds_.remove();
     }
     else
     {
@@ -495,7 +497,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
             << watchFile_[watchFd] << endl;
     }
 
-    freeWatchFds_.append(watchFd);
+    if (!freeWatchFds_.found(watchFd))
+    {
+        freeWatchFds_.append(watchFd);
+    }
     return watcher_->removeWatch(watchFd);
 }
 
diff --git a/src/OSspecific/POSIX/fileMonitor/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
index c36a092a19..bd7551db7f 100644
--- a/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
@@ -446,14 +446,16 @@ Foam::fileMonitor::~fileMonitor()
 // regIOobject)
 Foam::label Foam::fileMonitor::addWatch(const fileName& fName)
 {
+    if (debug)
+    {
+        Pout<< "fileMonitor : adding watch on file " << fName << endl;
+    }
+
     label watchFd;
 
-    label sz = freeWatchFds_.size();
-
-    if (sz)
+    if (freeWatchFds_.size())
     {
-        watchFd = freeWatchFds_[sz-1];
-        freeWatchFds_.setSize(sz-1);
+        watchFd = freeWatchFds_.remove();
     }
     else
     {
@@ -491,7 +493,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
             << watchFile_[watchFd] << endl;
     }
 
-    freeWatchFds_.append(watchFd);
+    if (!freeWatchFds_.found(watchFd))
+    {
+        freeWatchFds_.append(watchFd);
+    }
     return watcher_->removeWatch(watchFd);
 }