From c551ef3b0164d70dc4f65e1ebec25ca9fad64032 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Dec 2022 14:46:42 +0100
Subject: [PATCH] CONFIG: update completion cache (csh)
---
bin/tools/foamCreateCompletionCache | 10 +++++-----
bin/tools/help-filter | 4 ++--
etc/config.sh/completion_cache | 17 ++++++++++-------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/bin/tools/foamCreateCompletionCache b/bin/tools/foamCreateCompletionCache
index 523ca98d290..014b0829eaa 100755
--- a/bin/tools/foamCreateCompletionCache
+++ b/bin/tools/foamCreateCompletionCache
@@ -165,7 +165,7 @@ extractOptions()
-e '/^ \{8\}/d;' \
-e 's/^ *//; /^$/d; /^[^-]/d; /^--/d; /^-help-man/d;' \
-e '/^-hostRoots /d; /^-roots /d;' \
- -e '/^-lib /d;' \
+ -e '/^-lib /d; /^-no-libs /d;' \
-e '/^-[a-z]*-switch /d;' \
-e 'y/,/ /; s/=.*$/=/;' \
-e '/^-[^ ]* </{ s/^\(-[^ ]* <\).*$/\1/; p; d }' \
@@ -198,7 +198,10 @@ extractOptions()
for item
do
- if [ -d "$item" ]
+ if command -v "$item" >/dev/null
+ then
+ extractOptions "$item"
+ elif [ -d "$item" ]
then
# Process directory for applications - sort with ignore-case
echo "[directory] $item" 1>&2
@@ -207,9 +210,6 @@ do
do
extractOptions $appName
done
- elif command -v "$item" >/dev/null
- then
- extractOptions $item
else
echo "No such file or directory: $item" 1>&2
fi
diff --git a/bin/tools/help-filter b/bin/tools/help-filter
index f9991129d7f..c65403ed074 100755
--- a/bin/tools/help-filter
+++ b/bin/tools/help-filter
@@ -6,7 +6,7 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#-------------------------------------------------------------------------------
-# Copyright (C) 2020 OpenCFD Ltd.
+# Copyright (C) 2020-2022 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -26,7 +26,7 @@ sed -ne '1,/^[Oo]ptions:/d' \
-e '/^ \{8\}/d;' \
-e 's/^ *//; /^$/d; /^[^-]/d; /^--/d; /^-help-man/d;' \
-e '/^-hostRoots /d; /^-roots /d;' \
- -e '/^-lib /d;' \
+ -e '/^-lib /d; /^-no-libs /d;' \
-e '/^-[a-z]*-switch /d;' \
-e 'y/,/ /; s/=.*$/=/;' \
-e '/^-[^ ]* </{ s/^\(-[^ ]* <\).*$/\1/; p; d }' \
diff --git a/etc/config.sh/completion_cache b/etc/config.sh/completion_cache
index 48907efef1f..75ba4a16465 100644
--- a/etc/config.sh/completion_cache
+++ b/etc/config.sh/completion_cache
@@ -76,6 +76,7 @@ _of_complete_cache_[electrostaticFoam]="-case -decomposeParDict -fileHandler -wo
_of_complete_cache_[engineCompRatio]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[engineFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[engineSwirl]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
+_of_complete_cache_[ensightToFoam]="-case -fileHandler -mergeTol -scale | -keepHandedness -noFunctionObjects -doc -doc-source -help"
_of_complete_cache_[equilibriumCO]="-case -fileHandler | -doc -doc-source -help"
_of_complete_cache_[equilibriumFlameT]="-case -fileHandler | -doc -doc-source -help"
_of_complete_cache_[explicitRhoFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
@@ -84,8 +85,9 @@ _of_complete_cache_[extrudeEdgesInto2DSurface]="-case -fileHandler | -noFunction
_of_complete_cache_[extrudeMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[extrudeToRegionMesh]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -overwrite -parallel -doc -doc-source -help"
_of_complete_cache_[faceAgglomerate]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[faParkerFukushimaFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[faSavageHutterFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
+_of_complete_cache_[faParkerFukushimaFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
+_of_complete_cache_[faSavageHutterFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
+_of_complete_cache_[faTwoLayerAvalancheFoam]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[financialFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[fireFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[fireToFoam]="-case -fileHandler -scale | -ascii -check -noFunctionObjects -doc -doc-source -help"
@@ -103,7 +105,7 @@ _of_complete_cache_[foamHelp]="-case -decomposeParDict -fileHandler -region -wor
_of_complete_cache_[foamListRegions]="-case -fileHandler | -doc -doc-source -help"
_of_complete_cache_[foamListTimes]="-case -fileHandler -time | -constant -latestTime -noZero -processor -rm -verbose -withZero -doc -doc-source -help"
_of_complete_cache_[foamMeshToFluent]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[foamRestoreFields]="-case -decomposeParDict -fileHandler -method -time -world | -constant -dry-run -latestTime -noZero -parallel -processor -verbose -withZero -doc -doc-source -help"
+_of_complete_cache_[foamRestoreFields]="-case -decomposeParDict -fileHandler -method -region -regions -time -world | -allRegions -constant -dry-run -latestTime -noZero -parallel -processor -verbose -withZero -doc -doc-source -help"
_of_complete_cache_[foamToEnsight]="-case -cellZones -decomposeParDict -exclude-fields -exclude-patches -faceZones -fields -fileHandler -index -name -patches -region -regions -time -width -world | -allRegions -ascii -constant -latestTime -nearCellValue -no-boundary -no-cellZones -no-fields -no-finite-area -no-internal -no-lagrangian -no-mesh -no-overwrite -no-point-data -noFunctionObjects -noZero -nodeValues -parallel -verbose -doc -doc-source -help"
_of_complete_cache_[foamToFireMesh]="-case -fileHandler -scale -time | -ascii -constant -latestTime -noFunctionObjects -noZero -doc -doc-source -help"
_of_complete_cache_[foamToGMV]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
@@ -159,7 +161,7 @@ _of_complete_cache_[mixtureAdiabaticFlameT]="-case -fileHandler | -doc -doc-sour
_of_complete_cache_[modifyMesh]="-case -decomposeParDict -dict -fileHandler -world | -overwrite -parallel -doc -doc-source -help"
_of_complete_cache_[moveDynamicMesh]="-case -decomposeParDict -fileHandler -region -world | -checkAMI -noFunctionObjects -overwrite -parallel -doc -doc-source -help"
_of_complete_cache_[moveEngineMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[moveMesh]="-case -decomposeParDict -deltaT -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
+_of_complete_cache_[moveMesh]="-case -decomposeParDict -deltaT -endTime -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[MPPICDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[MPPICFoam]="-case -cloud -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[MPPICInterFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
@@ -238,7 +240,7 @@ _of_complete_cache_[selectCells]="-case -fileHandler | -noFunctionObjects -doc -
_of_complete_cache_[setAlphaField]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[setExprBoundaryFields]="-case -decomposeParDict -dict -fileHandler -load-fields -region -time -world | -ascii -backup -cache-fields -dry-run -latestTime -noZero -parallel -withFunctionObjects -doc -doc-source -help"
_of_complete_cache_[setExprFields]="-case -decomposeParDict -dict -dimensions -expression -field -field-mask -fileHandler -load-fields -region -time -value-patches -world | -ascii -create -debug-parser -dry-run -dummy-phi -keepPatches -latestTime -no-variable-cache -noZero -parallel -verbose -withFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[setFields]="-case -decomposeParDict -dict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
+_of_complete_cache_[setFields]="-case -decomposeParDict -dict -fileHandler -region -world | -no-finite-area -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[setSet]="-batch -case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -loop -noFunctionObjects -noSync -noVTK -noZero -parallel -doc -doc-source -help"
_of_complete_cache_[setsToZones]="-case -decomposeParDict -fileHandler -region -time -world | -constant -latestTime -noFlipMap -noFunctionObjects -noZero -parallel -doc -doc-source -help"
_of_complete_cache_[setTurbulenceFields]="-case -decomposeParDict -dict -fileHandler -region -world | -parallel -doc -doc-source -help"
@@ -302,14 +304,14 @@ _of_complete_cache_[surfaceSplitNonManifolds]="-case -fileHandler | -debug -noFu
_of_complete_cache_[surfaceSubset]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
_of_complete_cache_[surfaceToFMS]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
_of_complete_cache_[surfaceToPatch]="-case -faceSet -fileHandler -tol | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[surfaceTransformPoints]="-case -fileHandler -origin -read-format -read-scale -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -translate -write-format -write-scale -yawPitchRoll | -auto-origin -noFunctionObjects -recentre -doc -doc-source -help"
+_of_complete_cache_[surfaceTransformPoints]="-case -centre -fileHandler -read-format -read-scale -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -translate -write-format -write-scale -yawPitchRoll | -auto-centre -noFunctionObjects -recentre -doc -doc-source -help"
_of_complete_cache_[surfactantFoam]="-case -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[temporalInterpolate]="-case -decomposeParDict -divisions -fields -fileHandler -interpolationType -region -time -world | -constant -latestTime -noZero -parallel -doc -doc-source -help"
_of_complete_cache_[tetgenToFoam]="-case -decomposeParDict -fileHandler -world | -noFaceFile -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[tetMesh]="-case -decomposeParDict -fileHandler -world | -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[thermoFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[topoSet]="-case -decomposeParDict -dict -fileHandler -region -time -world | -constant -latestTime -noFunctionObjects -noSync -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[transformPoints]="-case -decomposeParDict -fileHandler -origin -region -regions -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -scale -time -translate -world -yawPitchRoll | -allRegions -auto-origin -noFunctionObjects -parallel -recentre -rotateFields -doc -doc-source -help"
+_of_complete_cache_[transformPoints]="-case -centre -decomposeParDict -fileHandler -region -regions -rollPitchYaw -rotate -rotate-angle -rotate-x -rotate-y -rotate-z -scale -time -translate -world -yawPitchRoll | -allRegions -auto-centre -noFunctionObjects -parallel -recentre -rotateFields -doc -doc-source -help"
_of_complete_cache_[twoLiquidMixingFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[twoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[uncoupledKinematicParcelDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -world | -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
@@ -326,5 +328,6 @@ _of_complete_cache_[XiEngineFoam]="-case -decomposeParDict -fileHandler -world |
_of_complete_cache_[XiFoam]="-case -decomposeParDict -fileHandler -world | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
_of_complete_cache_[zipUpMesh]="-case -decomposeParDict -fileHandler -region -world | -noFunctionObjects -parallel -doc -doc-source -help"
_of_complete_cache_[paraFoam]="-case -region | -block -vtk -touch -touch-all -touch-proc -plugin-path= -help"
+_of_complete_cache_[wmake]=" | -s -a -q -k -j -update -debug -debug-O[g0123] -build-root= -module-prefix= -module-prefix= -no-openfoam -openmp -no-openmp -no-scheduler -show-api -show-ext-so -show-c -show-cflags -show-cxx -show-cxxflags -show-cflags-arch -show-cxxflags-arch -show-compile-c -show-compile-cxx -show-path-c -show-path-cxx -show-mpi-compile -show-mpi-link -show-openmp-compile -show-openmp-link -pwd -version -help"
#------------------------------------------------------------------------------
--
GitLab