Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
f6421f10
Commit
f6421f10
authored
Feb 03, 2015
by
Henry
Browse files
POSIX.C findEtcFiles: Revert change to read system/controlDict
Causes problems if the controlDict contains # entries
parent
f2f4c00e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/OSspecific/POSIX/POSIX.C
View file @
f6421f10
...
...
@@ -277,23 +277,11 @@ Foam::fileNameList Foam::findEtcFiles
{
fileNameList
results
;
// Search for user files in ./system
// Assumes the application is executed in the case directory
fileName
searchDir
=
"system"
;
if
(
isDir
(
searchDir
))
{
fileName
fullName
=
searchDir
/
name
;
if
(
isFile
(
fullName
))
{
results
.
append
(
fullName
);
}
}
// Search for user files in
// * ~/.OpenFOAM/VERSION
// * ~/.OpenFOAM
//
searchDir
=
home
()
/
".OpenFOAM"
;
fileName
searchDir
=
home
()
/
".OpenFOAM"
;
if
(
isDir
(
searchDir
))
{
fileName
fullName
=
searchDir
/
FOAMversion
/
name
;
...
...
src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
View file @
f6421f10
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011
-2015
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -62,7 +62,7 @@ bool Foam::functionEntry::execute
if
(
!
executedictionaryIstreamMemberFunctionTablePtr_
)
{
cerr
<<
"functionEntry::execute"
cerr
<<
"functionEntry::execute"
<<
"(const word&, dictionary&, Istream&)"
<<
" not yet initialized, function = "
<<
functionName
.
c_str
()
<<
std
::
endl
;
...
...
@@ -108,7 +108,7 @@ bool Foam::functionEntry::execute
if
(
!
executeprimitiveEntryIstreamMemberFunctionTablePtr_
)
{
cerr
<<
"functionEntry::execute"
cerr
<<
"functionEntry::execute"
<<
"(const word&, const dictionary&, primitiveEntry&, Istream&)"
<<
" not yet initialized, function = "
<<
functionName
.
c_str
()
<<
std
::
endl
;
...
...
@@ -137,4 +137,5 @@ bool Foam::functionEntry::execute
return
mfIter
()(
parentDict
,
entry
,
is
);
}
// ************************************************************************* //
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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