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

potentialFoam: Replaced the -withFunctionObjects option with -functionObjects

Browse Source 
and removed the unused -noFunctionObjects option.
This commit is contained in:
Henry Weller
2024-01-21 09:27:12 +00:00
parent 06df35268f
commit 8402bc3de2
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/potentialFoam/potentialFoam.C
View File

@ -78,7 +78,7 @@ int main(int argc, char *argv[])
"Calculate and write the pressure field" "Calculate and write the pressure field"
); );
#include "addWithFunctionObjectsOption.H" #include "addFunctionObjectsOption.H"
#include "setRootCase.H" #include "setRootCase.H"
#include "createTime.H" #include "createTime.H"

6
etc/config.sh/bash_completion
View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | Website: https://openfoam.org # \\ / O peration | Website: https://openfoam.org
# \\ / A nd | Copyright (C) 2017-2023 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2017-2024 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -1144,7 +1144,7 @@ _foamListTimes_ ()
local line=${COMP_LINE} local line=${COMP_LINE}
local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
opts="-case -constant -doc -fileHandler -help -latestTime -libs -noFunctionObjects -noZero -processor -rm -srcDoc -time -withFunctionEntries -withFunctionObjects -withZero" opts="-case -constant -doc -fileHandler -help -latestTime -libs -noFunctionObjects -noZero -processor -rm -srcDoc -time -functionEntries -functionObjects -withZero"
for o in $used ; do opts="${opts/$o/}" ; done for o in $used ; do opts="${opts/$o/}" ; done
extra="" extra=""
@ -2342,7 +2342,7 @@ _potentialFoam_ ()
local line=${COMP_LINE} local line=${COMP_LINE}
local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
opts="-case -doc -fileHandler -help -hostRoots -initialiseUBCs -libs -noFunctionObjects -parallel -pName -roots -srcDoc -withFunctionObjects -writep -writePhi" opts="-case -doc -fileHandler -help -hostRoots -initialiseUBCs -libs -parallel -pName -roots -srcDoc -functionObjects -writep -writePhi"
for o in $used ; do opts="${opts/$o/}" ; done for o in $used ; do opts="${opts/$o/}" ; done
extra="" extra=""

4
src/OpenFOAM/db/Time/Time.C
View File

@ -391,8 +391,8 @@ Foam::Time::Time
( (
*this, *this,
enableFunctionObjects enableFunctionObjects
? argList::validOptions.found("withFunctionObjects") ? argList::validOptions.found("functionObjects")
? args.optionFound("withFunctionObjects") ? args.optionFound("functionObjects")
: !args.optionFound("noFunctionObjects") : !args.optionFound("noFunctionObjects")
: false : false
) )

2
src/OpenFOAM/include/addWithFunctionObjectsOption.H → src/OpenFOAM/include/addFunctionObjectsOption.H
View File

@ -2,6 +2,6 @@ Foam::argList::removeOption("noFunctionObjects");
Foam::argList::addBoolOption Foam::argList::addBoolOption
( (
"withFunctionObjects", "functionObjects",
"Execute functionObjects" "Execute functionObjects"
); );

2
tutorials/potentialFoam/cylinder/Allrun
View File

@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
application=$(getApplication) application=$(getApplication)
runApplication blockMesh runApplication blockMesh
runApplication $application -withFunctionObjects -writePhi -writep runApplication $application -functionObjects -writePhi -writep
runApplication foamPostProcess -func streamFunction runApplication foamPostProcess -func streamFunction
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------