zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sergio
2019-06-12 10:37:51 -07:00
committed by Andrew Heather
parent b1563dc03e 3ef37ce188
commit 8b2e61faf0
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Allwmake
View File

@ -109,7 +109,6 @@ wmake $targetType semiPermeableBaffle
wmake $targetType atmosphericModels
phaseSystemModels/Allwmake $targetType $*
wmake $targetType TurbulenceModels/compressible/turbulentFluidThermoModels/
# Needs access to Turbulence

17
src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
View File

@ -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);
}

17
src/OSspecific/POSIX/fileMonitor/fileMonitor.C
View File

@ -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);
}

2
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
View File

@ -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"))
{