diff --git a/src/Allwmake b/src/Allwmake index 31ff2e265a86d5c191b393a754069a689b101ec8..c693a09ba7ed1c5065831b6307df84dbc6e02c00 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 diff --git a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C index 425a0c333d006645d06d87c4fbf2de751ea3d76a..b40c49c48467d8fc78ab1cb3c0430a6e366887e8 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) { - label watchFd; + if (debug) + { + Pout<< "fileMonitor : adding watch on file " << fName << endl; + } - label sz = freeWatchFds_.size(); + label watchFd; - 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 f8f9a46af72a1650ae827c5d8ffac8bd9789aeb0..80b5b4044dec779712231a77c2c0ce4ea8f52442 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) { - label watchFd; + if (debug) + { + Pout<< "fileMonitor : adding watch on file " << fName << endl; + } - label sz = freeWatchFds_.size(); + label watchFd; - 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); } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index aa6a90543ddca7f6ab29eb004695c4f5b77dd77e..ea4621d2559c1b587cbb8830b5f3bfc10486ac1a 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")) {