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

ENH: #include: allow dictionary variables in include paths

Browse Source
This commit is contained in:
mattijs
2012-10-12 12:23:34 +01:00
parent 23c4157fea
commit dced4a082a
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
View File

@ -27,6 +27,7 @@ License
#include "dictionary.H" #include "dictionary.H"
#include "IFstream.H" #include "IFstream.H"
#include "addToMemberFunctionSelectionTable.H" #include "addToMemberFunctionSelectionTable.H"
#include "stringOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -68,11 +69,12 @@ namespace functionEntries
Foam::fileName Foam::functionEntries::includeEntry::includeFileName Foam::fileName Foam::functionEntries::includeEntry::includeFileName
( (
Istream& is Istream& is,
const dictionary& dict
) )
{ {
fileName fName(is); fileName fName(is);
fName.expand(); stringOps::inplaceExpand(fName, dict);
if (fName.empty() || fName.isAbsolute()) if (fName.empty() || fName.isAbsolute())
{ {
@ -94,7 +96,7 @@ bool Foam::functionEntries::includeEntry::execute
Istream& is Istream& is
) )
{ {
const fileName fName(includeFileName(is)); const fileName fName(includeFileName(is, parentDict));
IFstream ifs(fName); IFstream ifs(fName);
if (ifs) if (ifs)
@ -129,7 +131,7 @@ bool Foam::functionEntries::includeEntry::execute
Istream& is Istream& is
) )
{ {
const fileName fName(includeFileName(is)); const fileName fName(includeFileName(is, parentDict));
IFstream ifs(fName); IFstream ifs(fName);
if (ifs) if (ifs)

4
src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -77,7 +77,7 @@ protected:
// Protected Member Functions // Protected Member Functions
//- Read the include fileName from Istream, expand and return //- Read the include fileName from Istream, expand and return
static fileName includeFileName(Istream&); static fileName includeFileName(Istream&, const dictionary&);
public: public:

6
src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -69,7 +69,7 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
Istream& is Istream& is
) )
{ {
const fileName fName(includeFileName(is)); const fileName fName(includeFileName(is, parentDict));
IFstream ifs(fName); IFstream ifs(fName);
if (ifs) if (ifs)
@ -92,7 +92,7 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
Istream& is Istream& is
) )
{ {
const fileName fName(includeFileName(is)); const fileName fName(includeFileName(is, parentDict));
IFstream ifs(fName); IFstream ifs(fName);
if (ifs) if (ifs)

9
src/OpenFOAM/primitives/strings/stringOps/stringOps.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -322,7 +322,12 @@ Foam::string& Foam::stringOps::inplaceExpand
// lookup in the dictionary // lookup in the dictionary
const entry* ePtr = dict.lookupEntryPtr(varName, true, true); const entry* ePtr = dict.lookupScopedEntryPtr
(
varName,
true,
false // wildcards disabled. See primitiveEntry
);
// if defined - copy its entries // if defined - copy its entries
if (ePtr) if (ePtr)