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

POSIX.C findEtcFiles: Revert change to read system/controlDict

Browse Source 
Causes problems if the controlDict contains # entries
This commit is contained in:
Henry
2015-02-03 11:59:43 +00:00
parent f2f4c00e24
commit f6421f108d
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/OSspecific/POSIX/POSIX.C
View File

@ -277,23 +277,11 @@ Foam::fileNameList Foam::findEtcFiles
{ {
fileNameList results; 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 // Search for user files in
// * ~/.OpenFOAM/VERSION // * ~/.OpenFOAM/VERSION
// * ~/.OpenFOAM // * ~/.OpenFOAM
// //
searchDir = home()/".OpenFOAM"; fileName searchDir = home()/".OpenFOAM";
if (isDir(searchDir)) if (isDir(searchDir))
{ {
fileName fullName = searchDir/FOAMversion/name; fileName fullName = searchDir/FOAMversion/name;

7
src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,7 +62,7 @@ bool Foam::functionEntry::execute
if (!executedictionaryIstreamMemberFunctionTablePtr_) if (!executedictionaryIstreamMemberFunctionTablePtr_)
{ {
cerr<<"functionEntry::execute" cerr<< "functionEntry::execute"
<< "(const word&, dictionary&, Istream&)" << "(const word&, dictionary&, Istream&)"
<< " not yet initialized, function = " << " not yet initialized, function = "
<< functionName.c_str() << std::endl; << functionName.c_str() << std::endl;
@ -108,7 +108,7 @@ bool Foam::functionEntry::execute
if (!executeprimitiveEntryIstreamMemberFunctionTablePtr_) if (!executeprimitiveEntryIstreamMemberFunctionTablePtr_)
{ {
cerr<<"functionEntry::execute" cerr<< "functionEntry::execute"
<< "(const word&, const dictionary&, primitiveEntry&, Istream&)" << "(const word&, const dictionary&, primitiveEntry&, Istream&)"
<< " not yet initialized, function = " << " not yet initialized, function = "
<< functionName.c_str() << std::endl; << functionName.c_str() << std::endl;
@ -137,4 +137,5 @@ bool Foam::functionEntry::execute
return mfIter()(parentDict, entry, is); return mfIter()(parentDict, entry, is);
} }
// ************************************************************************* // // ************************************************************************* //