mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
POSIX.C findEtcFiles: Revert change to read system/controlDict
Causes problems if the controlDict contains # entries
This commit is contained in:
@ -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;
|
||||||
|
|||||||
@ -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
|
||||||
@ -137,4 +137,5 @@ bool Foam::functionEntry::execute
|
|||||||
return mfIter()(parentDict, entry, is);
|
return mfIter()(parentDict, entry, is);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ************************************************************************* //
|
// ************************************************************************* //
|
||||||
|
|||||||
Reference in New Issue
Block a user