ENH: avoid parse problems caused by #calc directives (fixes #722)

- The additional output generated by #calc directives in the
  controlDict or decomposeParDict causes issues for the RunFunctions
  extraction of 'application' and 'numberOfSubdomains'.

  Avoid by using -disableFunctionEntries, which also has the side-effect
  of disabling '#include'.
This commit is contained in:
Mark Olesen
2018-06-19 12:38:53 +02:00
parent 0c5f36f40a
commit d637b6eb78
2 changed files with 16 additions and 6 deletions

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -334,7 +334,11 @@ int main(int argc, char *argv[])
const bool disableEntries = args.found("disableFunctionEntries");
if (disableEntries)
{
Info<< "Not expanding variables or dictionary directives" << endl;
// Report on stderr (once) to avoid polluting the output
if (Pstream::master())
{
Serr<< "Not expanding variables or dictionary directives" << endl;
}
entry::disableFunctionEntries = true;
}