mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
efd1ac4b5f
- minor simplification of #if/#endif handling ENH: improve input robustness with negative-prefixed expansions (#2095) - especially in blockMeshDict it is useful to negate an value directly. Eg, ``` xmax 100; xmin -$xmax; ``` However, this fails since the dictionary expansion is a two-step process of tokenization followed by expansion. After the expansion the given input would now be the following: ``` xmax 100; xmin - 100; ``` and retrieving a scalar value for 'xmin' fails. Counteract this by being more generous on tokenized input when attempting to retrieve a label or scalar value. If a '-' is found where a number is expected, use it to negate the subsequent value. The previous solution was to invoke an 'eval': ``` xmax 100; xmin #eval{-$xmax}; ``` which adds additional clutter.
98 lines
2.5 KiB
C++
98 lines
2.5 KiB
C++
/*--------------------------------*- C++ -*----------------------------------*\
|
|
| ========= | |
|
|
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
|
| \\ / O peration | Version: v2012 |
|
|
| \\ / A nd | Website: www.openfoam.com |
|
|
| \\/ M anipulation | |
|
|
\*---------------------------------------------------------------------------*/
|
|
FoamFile
|
|
{
|
|
version 2.0;
|
|
format ascii;
|
|
class dictionary;
|
|
object dictionary;
|
|
}
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
expr1 "hypot(3,4)";
|
|
|
|
expr2 hypot(3,4);
|
|
|
|
expr3 #{ hypot(3,4) #};
|
|
|
|
eval1 #eval " pi() * 2 * $expr1";
|
|
|
|
eval2 #eval " pi() * 2 * $expr2";
|
|
|
|
eval3 #eval " pi() * 2 * $expr3";
|
|
|
|
|
|
factor "pi()";
|
|
|
|
factor10 10;
|
|
|
|
hypot_a 3;
|
|
hypot_b 4;
|
|
|
|
eval4 #eval "$factor * 2 * hypot(${hypot_xx:-0}, $hypot_b)";
|
|
|
|
//eval5 #eval " pi() * 2 * ${{ hypot(3,4) * 100 }}";
|
|
|
|
eval6 #eval " pi() * 2 * ${{ ${factor:-0} * ${{ 15 * 3 }} }} + 5";
|
|
|
|
eval6a #eval " pi() * 2 * ${{ ${factor:+-$factor} * ${{ 15 * 3 }} }} + 5";
|
|
|
|
eval6b #eval " pi() * 2 * ${{ ${unknown:-0} * ${{ 15 * 3 }} }} + 5";
|
|
|
|
eval6c #eval " pi() * 2 * ${{ -${unknown:-0} * ${{ 15 * 3 }} }} + 5";
|
|
|
|
// Even this work
|
|
eval7a #eval " pi() * 1 * ${factor${{2*5}}:-100}";
|
|
|
|
// Even this work
|
|
eval7b #eval " pi() * 1 * ${factorXYZ${{2*5}}:-100}";
|
|
|
|
index 10;
|
|
|
|
eval8a #eval " pi() * 2 * ${{ ${factor$index} + ${factor10} }}";
|
|
|
|
eval8b #eval " pi() * 2 * $factor * ${{ 100 }}";
|
|
|
|
eval10a #eval "vector(1,2,3) * 5";
|
|
|
|
|
|
// Slightly stranger ideas:
|
|
|
|
axis1 (1 0 0);
|
|
axis2 (0 1 0);
|
|
axis3 (0 0 1);
|
|
index 100;
|
|
|
|
location #eval #{
|
|
400 *
|
|
|
|
// Numerator: use the index to get relevant suffix [1,2,3]
|
|
// to form the lookup of axis1,axis2,...
|
|
// Treat the lookup as a vector within the expression evaluation
|
|
|
|
$[(vector) axis${{
|
|
($index % 3) + 1 /* Evaluates: 1,2,3 from index */ }}
|
|
]
|
|
|
|
// Denominator: divide by index with zero-division protection
|
|
/ ${{max(1, $index)}}
|
|
|
|
// Same thing, but using expressions-syntax for variable lookup
|
|
/ ${{max(1, $[index])}}
|
|
#};
|
|
|
|
|
|
// This is still a rather clunky syntax
|
|
length #eval{ cbrt(mag($[(vector) location])) };
|
|
|
|
|
|
// Remove evidence of some variables
|
|
#remove ("axis[0-9]*" index)
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|