STYLE: qualify expression debug flags

- for debug/tracing handle the following keywords:

   * debug.driver   (was "debugBaseDriver")
   * debug.scanner  (was "debugScanner")
   * debug.parser   (was "debugParser")
This commit is contained in:
Mark Olesen
2021-12-10 09:25:03 +01:00
committed by Andrew Heather
parent 510ffb3322
commit a6cbfcb9ba
6 changed files with 21 additions and 20 deletions

View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2019-2020 OpenCFD Ltd. Copyright (C) 2019-2021 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -54,7 +54,7 @@ void Foam::PDRparams::readDefaults(const dictionary& dict)
outer_orthog = dict.found("outer_orthog"); outer_orthog = dict.found("outer_orthog");
dict.readIfPresent("debugLevel", debugLevel); dict.readIfPresent("debug.level", debugLevel);
dict.readIfPresent("nFacesToBlockC", nFacesToBlockC); dict.readIfPresent("nFacesToBlockC", nFacesToBlockC);
dict.readIfPresent("nPairsToBlockC", nPairsToBlockC); dict.readIfPresent("nPairsToBlockC", nPairsToBlockC);
dict.readIfPresent("overlaps", overlaps); dict.readIfPresent("overlaps", overlaps);

View File

@ -189,8 +189,8 @@ Foam::expressions::exprDriver::exprDriver
stashedTokenId_(0), stashedTokenId_(0),
// Controls // Controls
debugScanner_(dict.getOrDefault("debugScanner", false)), debugScanner_(dict.getOrDefault("debug.scanner", false)),
debugParser_(dict.getOrDefault("debugParser", false)), debugParser_(dict.getOrDefault("debug.parser", false)),
allowShadowing_(dict.getOrDefault("allowShadowing", false)), allowShadowing_(dict.getOrDefault("allowShadowing", false)),
prevIterIsOldTime_(dict.getOrDefault("prevIterIsOldTime", false)), prevIterIsOldTime_(dict.getOrDefault("prevIterIsOldTime", false)),
searchCtrl_(search) searchCtrl_(search)
@ -298,7 +298,7 @@ bool Foam::expressions::exprDriver::readDict
const dictionary& dict const dictionary& dict
) )
{ {
dict.readIfPresent("debugBaseDriver", debug); dict.readIfPresent("debug.driver", debug);
// Regular variables // Regular variables
variableStrings_ = readVariableStrings(dict); variableStrings_ = readVariableStrings(dict);

View File

@ -43,10 +43,10 @@ Description
Debug Properties Debug Properties
\table \table
Property | Description | Required | Default Property | Description | Required | Default
debugBaseDriver | Debug level (int) for base driver | no | debug.driver | Debug level (int) for base driver | no |
debugScanner | Add debug for scanner | no | false debug.scanner | Add debug for scanner | no | false
debugParser | Add debug for parser | no | false debug.parser | Add debug for parser | no | false
\endtable \endtable
The \c lookup<scalar> and \c lookup<vector> are dictionaries The \c lookup<scalar> and \c lookup<vector> are dictionaries

View File

@ -44,10 +44,10 @@ Description
Debug Properties Debug Properties
\table \table
Property | Description | Required | Default Property | Description | Required | Default
debugBaseDriver | Debug level (int) for base driver | no | debug.driver | Debug level (int) for base driver | no |
debugScanner | Add debug for scanner | no | false debug.scanner | Add debug for scanner | no | false
debugParser | Add debug for parser | no | false debug.parser | Add debug for parser | no | false
\endtable \endtable
SourceFiles SourceFiles

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2106 | | \\ / O peration | Version: v2112 |
| \\ / A nd | Website: www.openfoam.com | | \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | | | \\/ M anipulation | |
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -42,17 +42,17 @@ boundaryField
{ {
type exprFixedValue; type exprFixedValue;
value $internalField; value $internalField;
// debug true;
// debug.scanner true;
// debug.parser true;
valueExpr "0.5*(pInlet + pOutlet2)";
variables variables
( (
"pInlet{inlet} = weightAverage(p)" "pInlet{inlet} = weightAverage(p)"
"pOutlet2{outlet2} = p" "pOutlet2{outlet2} = p"
); );
// debug true; valueExpr "0.5*(pInlet + pOutlet2)";
// debugScanner true;
// debugParser true;
} }
outlet2 outlet2

View File

@ -1,4 +1,5 @@
- 15/8/8 Simple T-junction. ## Simple T-junction.
- Inlet on left, one outlet at bottom, one at top. - Inlet on left, one outlet at bottom, one at top.
- To test multiple outlets. - To test multiple outlets.
- Enable debugScanner/debugParser for a verbose view of the parsing engine. - Enable debug.scanner/debug.parser for a verbose view of the parsing engine.