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

foamDictionary: Allow functionEntry expansion with -entry option

Browse Source 
Resolves bug-report https://bugs.openfoam.org/view.php?id=3422
This commit is contained in:
Henry Weller
2020-01-07 21:25:09 +00:00
parent 8eba55f5d2
commit d8209247b1
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -400,7 +400,10 @@ int main(int argc, char *argv[])
// Do not expand functionEntries except during dictionary expansion
// with the -expand option
entry::disableFunctionEntries = true;
if (!args.optionFound("expand"))
{
entry::disableFunctionEntries = true;
}
const fileName dictPath(args[1]);
@ -470,10 +473,8 @@ int main(int argc, char *argv[])
{
return 0;
}
else if (args.optionFound("expand"))
else if (args.optionFound("expand") && !args.optionFound("entry"))
{
entry::disableFunctionEntries = false;
IOobject::writeBanner(Info)
<<"//\n// " << dictPath << "\n//\n";
dict.dictionary::write(Info, false);

4
bin/foamJob
View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | Website: https://openfoam.org
# \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -177,7 +177,7 @@ then
#
if [ -r "processor0" -o -r "processors" -o "$(echo processors[1-9]*)" != "processors[1-9]*" ]
then
NPROCS="$(foamDictionary -entry numberOfSubdomains -value system/decomposeParDict)"
NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
else
echo "Case is not currently decomposed"
if [ -r system/decomposeParDict ]