Commit 8b2e61fa authored by sergio's avatar sergio Committed by Andrew Heather
Browse files

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

parents b1563dc0 3ef37ce1
...@@ -109,7 +109,6 @@ wmake $targetType semiPermeableBaffle ...@@ -109,7 +109,6 @@ wmake $targetType semiPermeableBaffle
wmake $targetType atmosphericModels wmake $targetType atmosphericModels
phaseSystemModels/Allwmake $targetType $* phaseSystemModels/Allwmake $targetType $*
wmake $targetType TurbulenceModels/compressible/turbulentFluidThermoModels/
# Needs access to Turbulence # Needs access to Turbulence
......
...@@ -450,14 +450,16 @@ Foam::fileMonitor::~fileMonitor() ...@@ -450,14 +450,16 @@ Foam::fileMonitor::~fileMonitor()
// regIOobject) // regIOobject)
Foam::label Foam::fileMonitor::addWatch(const fileName& fName) 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]; watchFd = freeWatchFds_.remove();
freeWatchFds_.setSize(sz-1);
} }
else else
{ {
...@@ -495,7 +497,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd) ...@@ -495,7 +497,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
<< watchFile_[watchFd] << endl; << watchFile_[watchFd] << endl;
} }
freeWatchFds_.append(watchFd); if (!freeWatchFds_.found(watchFd))
{
freeWatchFds_.append(watchFd);
}
return watcher_->removeWatch(watchFd); return watcher_->removeWatch(watchFd);
} }
......
...@@ -446,14 +446,16 @@ Foam::fileMonitor::~fileMonitor() ...@@ -446,14 +446,16 @@ Foam::fileMonitor::~fileMonitor()
// regIOobject) // regIOobject)
Foam::label Foam::fileMonitor::addWatch(const fileName& fName) 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]; watchFd = freeWatchFds_.remove();
freeWatchFds_.setSize(sz-1);
} }
else else
{ {
...@@ -491,7 +493,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd) ...@@ -491,7 +493,10 @@ bool Foam::fileMonitor::removeWatch(const label watchFd)
<< watchFile_[watchFd] << endl; << watchFile_[watchFd] << endl;
} }
freeWatchFds_.append(watchFd); if (!freeWatchFds_.found(watchFd))
{
freeWatchFds_.append(watchFd);
}
return watcher_->removeWatch(watchFd); return watcher_->removeWatch(watchFd);
} }
......
...@@ -70,7 +70,7 @@ Foam::temperatureCoupledBase::temperatureCoupledBase ...@@ -70,7 +70,7 @@ Foam::temperatureCoupledBase::temperatureCoupledBase
) )
: :
patch_(patch), patch_(patch),
method_(KMethodTypeNames_.lookup("kappaMethod", dict)), method_(KMethodTypeNames_.get("kappaMethod", dict)),
kappaName_(dict.lookupOrDefault<word>("kappa", "none")), kappaName_(dict.lookupOrDefault<word>("kappa", "none")),
alphaAniName_(dict.lookupOrDefault<word>("alphaAni","none")) alphaAniName_(dict.lookupOrDefault<word>("alphaAni","none"))
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment