diff --git a/META-INFO/api-info b/META-INFO/api-info index 3de86f1351..d88b77f16d 100644 --- a/META-INFO/api-info +++ b/META-INFO/api-info @@ -1,2 +1,2 @@ api=2002 -patch=200312 +patch=200316 diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C index ccc9da33dc..8965219067 100644 --- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C +++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -128,6 +128,8 @@ int main(int argc, char *argv[]) std::ifstream OBJfile(objName); + Info<< "Processing file " << objName << endl; + if (!OBJfile.good()) { FatalErrorInFunction @@ -145,13 +147,14 @@ int main(int argc, char *argv[]) label lineNo = 0; while (OBJfile.good()) { - string line = getLine(OBJfile); + const string line = getLine(OBJfile); lineNo++; + if (line.empty()) continue; + // Read first word IStringStream lineStream(line); - word cmd; - lineStream >> cmd; + word cmd(lineStream); if (cmd == "v") { diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C index 776b9b0fa6..6e7fd29ab8 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -143,7 +143,8 @@ bool Foam::functionEntries::includeEntry::execute { if (Foam::functionEntries::includeEntry::log) { - DetailInfo << fName << endl; + // Report to stdout which file is included + Info<< fName << nl; } // Add watch on included file @@ -194,7 +195,8 @@ bool Foam::functionEntries::includeEntry::execute { if (Foam::functionEntries::includeEntry::log) { - DetailInfo << fName << endl; + // Report to stdout which file is included + Info<< fName << nl; } // Add watch on included file diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C index e596a2a3f2..9431a57a92 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2015-2017 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -123,7 +123,8 @@ bool Foam::functionEntries::includeEtcEntry::execute { if (Foam::functionEntries::includeEtcEntry::log) { - DetailInfo << fName << endl; + // Report to stdout which file is included + Info<< fName << nl; } parentDict.read(ifs); return true; @@ -162,7 +163,8 @@ bool Foam::functionEntries::includeEtcEntry::execute { if (Foam::functionEntries::includeEtcEntry::log) { - DetailInfo << fName << endl; + // Report to stdout which file is included + Info<< fName << nl; } entry.read(parentDict, ifs); return true;