zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DOC: fixed documented use of expression functions

Browse Source 
- `functions<scalar>` and `functions<vector>` were erroneously
   documented in header as `lookup<scalar>` etc.

INT: handle fluent square brackets (fixes #2429)

- patch applied from openfoam.org
This commit is contained in:
Mark Olesen
2022-03-30 16:45:30 +02:00
parent c7f4ba1969
commit ecf8d260c4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2011-2016,2022 OpenFOAM Foundation
Copyright (C) 2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -158,6 +158,7 @@ quote \"
dash "-"
dotColonDash [.:-]
commaPipe [,\|]
squareBracket [\[\]]
schemeSpecialInitial [!$%&*/\\:;<=>?~_^#.@']
schemeSpecialSubsequent [.+-]
@ -172,6 +173,7 @@ zeroLabel {digit}*
signedInteger [-+]?{integer}
word ({alpha}|{digit}|{dotColonDash})*
wordBraces ({word}|{lbrac}|{rbrac})*
wordSquareBrackets ({word}|{squareBracket})*
wordBracesExtras ({word}|{lbrac}|{rbrac}|{commaPipe})*
exponent_part [eE][-+]?{digit}+
@ -193,7 +195,7 @@ scalarList ({scalarListElement}+{space})
schemeSymbolList ({schemeSymbolListElement}+{space})
starStar ("**")
text ({space}({word}*{space})*)
text ({space}({wordSquareBrackets}*{space})*)
textBraces ({space}({wordBraces}*{space})*)
textExtras ({space}({word}*{commaPipe}{space})*)
textBracesExtras ({space}({wordBracesExtras}*{space})*)

17
src/OpenFOAM/expressions/exprDriver/exprDriver.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2010-2018 Bernhard Gschaider
Copyright (C) 2019-2021 OpenCFD Ltd.
Copyright (C) 2019-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -36,8 +36,8 @@ Description
\table
Property | Description | Required | Default
variables | List of variables for expressions | no | ()
lookup\<scalar\> | Dictionary of scalar Function1 | no | {}
lookup\<vector\> | Dictionary of vector Function1 | no | {}
functions\<scalar\> | Dictionary of scalar Function1 | no | {}
functions\<vector\> | Dictionary of vector Function1 | no | {}
allowShadowing | Allow variables to shadow field names | no | false
\endtable
@ -49,9 +49,10 @@ Description
debug.parser | Add debug for parser | no | false
\endtable
The \c lookup<scalar> and \c lookup<vector> are dictionaries
of Function1 definitions that can either be used to establish
a time-varying quantity, to remap a field of scalar values, or both.
The \c functions<scalar> and \c functions<vector> entries are
dictionaries of Foam::Function1 definitions that can either be used
to establish a time-varying quantity, to remap a field of scalar
values, or both.
SourceFiles
exprDriverI.H
@ -64,8 +65,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef expressions_exprDriver_H
#define expressions_exprDriver_H
#ifndef Foam_expressions_exprDriver_H
#define Foam_expressions_exprDriver_H
#include "exprResult.H"
#include "exprString.H"