zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ISstream: Corrected parsing of variables

Browse Source
This commit is contained in:
Henry Weller
2023-06-20 19:14:47 +01:00
parent 23b169553c
commit c9bb53e109
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/test/dictionary/Test-dictionary.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 | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,9 +48,9 @@ int main(int argc, char *argv[])
{ {
dictionary dict; dictionary dict;
dict.add("aaOPENMPIcc", 1); dict.add("aaOpenFOAMcc", 1);
string s("DDD${aa${WM_MPLIB}cc}EEE"); string s("DDD${aa${WM_PROJECT}cc}EEE");
stringOps::inplaceExpand(s, dict, true, false); stringOps::inplaceExpand(s, dict, true, false);
Info<< "variable expansion:" << s << endl; Info<< "variable expansion:" << s << endl;
} }

4
src/OpenFOAM/db/IOstreams/Sstreams/ISstream.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 | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -570,7 +570,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
{ {
buf_.append(c); buf_.append(c);
int blockCount = 0; int blockCount = 1;
if (c == token::BEGIN_BLOCK) if (c == token::BEGIN_BLOCK)
{ {