Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Planned maintenance at 14:00 - platform may be offline until 15:00 (UK times)
Open sidebar
Development
openfoam
Commits
8b2e61fa
Commit
8b2e61fa
authored
Jun 12, 2019
by
sergio
Committed by
Andrew Heather
Jun 12, 2019
Browse files
Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop
parents
b1563dc0
3ef37ce1
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/Allwmake
View file @
8b2e61fa
...
...
@@ -109,7 +109,6 @@ wmake $targetType semiPermeableBaffle
wmake
$targetType
atmosphericModels
phaseSystemModels/Allwmake
$targetType
$*
wmake
$targetType
TurbulenceModels/compressible/turbulentFluidThermoModels/
# Needs access to Turbulence
...
...
src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
View file @
8b2e61fa
...
...
@@ -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
);
}
...
...
src/OSspecific/POSIX/fileMonitor/fileMonitor.C
View file @
8b2e61fa
...
...
@@ -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
);
}
...
...
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
View file @
8b2e61fa
...
...
@@ -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"
))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment