From c4a61bb8ac2bc731398571cb1fe23516d6b379ae Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 11 Jul 2019 00:22:17 +0100 Subject: [PATCH] dictionary: Read dictionaries referred to within keywords relative to the directory of the current dictionary Special handling for absolute paths will be added. --- src/OpenFOAM/db/dictionary/dictionary.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C index a9188974cc..3d2f08da8c 100644 --- a/src/OpenFOAM/db/dictionary/dictionary.C +++ b/src/OpenFOAM/db/dictionary/dictionary.C @@ -349,7 +349,10 @@ const Foam::entry* Foam::dictionary::lookupScopedSubEntryPtr keyword.size() - emarkPos - 1 ); - autoPtr ifsPtr(fileHandler().NewIFstream(fName)); + autoPtr ifsPtr + ( + fileHandler().NewIFstream(topDict().name().path()/fName) + ); ISstream& ifs = ifsPtr(); if (!ifs || !ifs.good())