Commit 0a66dabe authored by Andrew Heather's avatar Andrew Heather
Browse files

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

parents 7d604758 26bb661d
......@@ -3054,6 +3054,41 @@ _of_interFoam()
}
complete -o nospace -F _of_interFoam interFoam
unset -f _of_interIsoFoam 2>/dev/null
_of_interIsoFoam()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-noFunctionObjects -parallel -postProcess -srcDoc -doc -help "
local optsWithArgs="-case -decomposeParDict -roots "
case ${prev} in
-case)
COMPREPLY=($(compgen -d -- ${cur}))
;;
*Dict)
COMPREPLY=($(compgen -f -- ${cur}))
;;
*)
if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
then
# Unknown type of arg follows - set to files.
# Not always correct but can still navigate path if needed...
COMPREPLY=($(compgen -f -- ${cur}))
else
# Catch-all - present all remaining options
opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
fi
;;
esac
return 0
}
complete -o nospace -F _of_interIsoFoam interIsoFoam
unset -f _of_interMixingFoam 2>/dev/null
_of_interMixingFoam()
{
......@@ -3226,6 +3261,116 @@ _of_laplacianFoam()
}
complete -o nospace -F _of_laplacianFoam laplacianFoam
unset -f _of_lumpedPointForces 2>/dev/null
_of_lumpedPointForces()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-constant -latestTime -newTimes -noZero -parallel -vtk -srcDoc -doc -help "
local optsWithArgs="-case -decomposeParDict -region -roots -time "
case ${prev} in
-case)
COMPREPLY=($(compgen -d -- ${cur}))
;;
*Dict)
COMPREPLY=($(compgen -f -- ${cur}))
;;
-region)
local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
COMPREPLY=($(compgen -W "$regions" -- ${cur}))
;;
-time)
COMPREPLY=($(compgen -d -X '![-0-9]*' -- ${cur}))
;;
*)
if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
then
# Unknown type of arg follows - set to files.
# Not always correct but can still navigate path if needed...
COMPREPLY=($(compgen -f -- ${cur}))
else
# Catch-all - present all remaining options
opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
fi
;;
esac
return 0
}
complete -o nospace -F _of_lumpedPointForces lumpedPointForces
unset -f _of_lumpedPointMovement 2>/dev/null
_of_lumpedPointMovement()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-removeLock -slave -srcDoc -doc -help "
local optsWithArgs="-case -max -scale -span "
case ${prev} in
-case)
COMPREPLY=($(compgen -d -- ${cur}))
;;
*)
if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
then
# Unknown type of arg follows - set to files.
# Not always correct but can still navigate path if needed...
COMPREPLY=($(compgen -f -- ${cur}))
else
# Catch-all - present all remaining options
opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
fi
;;
esac
return 0
}
complete -o nospace -F _of_lumpedPointMovement lumpedPointMovement
unset -f _of_lumpedPointZones 2>/dev/null
_of_lumpedPointZones()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-verbose -srcDoc -doc -help "
local optsWithArgs="-case -region "
case ${prev} in
-case)
COMPREPLY=($(compgen -d -- ${cur}))
;;
-region)
local regions=$(sed 's#/##g' <<< $([ -d system ] && (\cd system && (\ls -d */ 2>/dev/null))))
COMPREPLY=($(compgen -W "$regions" -- ${cur}))
;;
*)
if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
then
# Unknown type of arg follows - set to files.
# Not always correct but can still navigate path if needed...
COMPREPLY=($(compgen -f -- ${cur}))
else
# Catch-all - present all remaining options
opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
fi
;;
esac
return 0
}
complete -o nospace -F _of_lumpedPointZones lumpedPointZones
unset -f _of_magneticFoam 2>/dev/null
_of_magneticFoam()
{
......@@ -5832,6 +5977,41 @@ _of_selectCells()
}
complete -o nospace -F _of_selectCells selectCells
unset -f _of_setAlphaField 2>/dev/null
_of_setAlphaField()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-noFunctionObjects -parallel -srcDoc -doc -help "
local optsWithArgs="-case -decomposeParDict -roots "
case ${prev} in
-case)
COMPREPLY=($(compgen -d -- ${cur}))
;;
*Dict)
COMPREPLY=($(compgen -f -- ${cur}))
;;
*)
if [ "${optsWithArgs/${prev} /}" != "${optsWithArgs}" ]
then
# Unknown type of arg follows - set to files.
# Not always correct but can still navigate path if needed...
COMPREPLY=($(compgen -f -- ${cur}))
else
# Catch-all - present all remaining options
opts=$(_of_filter_opts "${opts}" "${COMP_LINE}")
optsWithArgs=$(_of_filter_opts "${optsWithArgs}" "${COMP_LINE}")
COMPREPLY=($(compgen -W "${opts} ${optsWithArgs}" -- ${cur}))
fi
;;
esac
return 0
}
complete -o nospace -F _of_setAlphaField setAlphaField
unset -f _of_setFields 2>/dev/null
_of_setFields()
{
......
#----------------------------*- makefile-gmake -*------------------------------
WMKDEP_FLAGS := -eWM_PROJECT_DIR -eWM_THIRD_PARTY_DIR
ifneq ("$(WM_QUIET)","")
E=@
define QUIET_MESSAGE
......@@ -7,6 +9,7 @@ ifneq ("$(WM_QUIET)","")
endef
define VERBOSE_MESSAGE
endef
WMKDEP_FLAGS += -q
else
E=
define QUIET_MESSAGE
......@@ -28,7 +31,6 @@ $(OBJECTS_DIR)/%.dep : %
$(call QUIET_MESSAGE,wmkdep,$(<F))
$(call VERBOSE_MESSAGE,Making dependency list for source file,$(<F))
@$(WM_SCRIPTS)/makeTargetDir $@
@$(WMAKE_BIN)/wmkdep -o$@ -I$(*D) $(LIB_HEADER_DIRS) \
-eWM_PROJECT_DIR -eWM_THIRD_PARTY_DIR $<
@$(WMAKE_BIN)/wmkdep $(WMKDEP_FLAGS) -o$@ -I$(*D) $(LIB_HEADER_DIRS) $<
#------------------------------------------------------------------------------
......@@ -36,7 +36,7 @@ Description
which makes this faster than cpp.
Usage
wmkdep [-Idir..] [-iheader...] [-eENV...] [-ofile] filename
wmkdep [-Idir..] [-iheader...] [-eENV...] [-oFile] [-q] filename
\*---------------------------------------------------------------------------*/
/* With cpp:
......@@ -264,6 +264,7 @@ static void print_fileName(const char* fileName)
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int optQuiet = 0;
int nDirectories = 0;
char** directories = NULL;
char* sourceFile = NULL;
......@@ -314,18 +315,23 @@ int main(int argc, char* argv[])
fputs
(
"\nUsage: " EXENAME
" [-Idir...] [-iheader...] [-eENV...]"
" [-ofile] filename\n\n"
" [-Idir...] [-iheader...] [-eENV...] [-oFile] [-q]"
" filename\n\n"
" -Idir Directories to be searched for headers.\n"
" -iheader Headers to be ignored.\n"
" -eENV Environment variable path substitutions.\n"
" -ofile Write output to file.\n"
" -oFile Write output to File.\n"
" -q Suppress 'No such file' warnings.\n"
"\nDependency list generator, similar to 'cpp -M'\n\n",
stderr
);
return 0;
break;
case 'q': /* Option: -q (quiet) */
++optQuiet;
break;
case 'I': /* Option: -Idir */
++nDirectories;
break;
......@@ -390,7 +396,7 @@ int main(int argc, char* argv[])
}
else if (!strncmp(argv[i], "-o", 2))
{
/* Option: -ofile */
/* Option: -oFile */
if (optLen > 2)
{
outputFile = (argv[i] + 2);
......@@ -414,6 +420,7 @@ int main(int argc, char* argv[])
EXENAME ": could not open file '%s' for output: %s\n",
outputFile, strerror(errno)
);
fflush(stderr);
return 1;
}
......@@ -427,6 +434,7 @@ int main(int argc, char* argv[])
yylex();
fputs("\n\n", stdout);
fflush(stdout);
for (i = nDirectories-1; i >= 0; --i)
{
......@@ -438,9 +446,6 @@ int main(int argc, char* argv[])
free_hashTable(visitedFiles);
free_envTable();
fflush(stdout);
fflush(stderr);
return 0;
}
......@@ -553,20 +558,23 @@ void nextFile(const char* fileName)
}
}
fprintf
(
stderr,
EXENAME ": could not open file '%s' for source file '%s'",
fileName, sourceFile
);
if (nDirectories)
if (!optQuiet)
{
fprintf(stderr, ": %s", strerror(errno));
fprintf
(
stderr,
EXENAME ": could not open file '%s' for source file '%s'",
fileName, sourceFile
);
if (nDirectories)
{
fprintf(stderr, ": %s", strerror(errno));
}
fputs("\n", stderr);
fflush(stderr);
}
fputs("\n", stderr);
fflush(stdout);
fflush(stderr);
/* Only report the first occurrence */
lookUp(visitedFiles, fileName);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment