zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: adjust paraview libs, intelmpi handling

Browse Source 
- fix overly aggressive match in the API value

- allow `INTELMPI*` generic value, this can be used to specify something
  like INTELMPI_custom and populate the corresponding wmake rule
  manually

STYLE: mention FOAM_BUILDROOT in wmake -help-full output

STYLE: adjust openfoam shell session welcome information

- adjust internal variable names to reduce collision potential

- improve handling of openfoam -etc=...
This commit is contained in:
Mark Olesen
2021-12-07 10:51:09 +01:00
parent 810d0c72ee
commit b25e1486de
9 changed files with 115 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etc/config.sh/mpi
View File

@ -442,8 +442,9 @@ SGIMPI)
# ----
# Also support any ending (eg, INTELMPI_custom) to allow custom wmake rules
intelmpi | intelmpi-[1-9]* |\
INTELMPI | INTELMPI-[1-9]* )
INTELMPI*) # Also includes (INTELMPI | INTELMPI-[1-9]*)
export FOAM_MPI=intelmpi
_foamMpiEmbedVersion intelmpi INTELMPI

4
etc/config.sh/paraview
View File

@ -118,7 +118,7 @@ case "$ParaView_VERSION" in
;;
([0-9]*)
# Extract API from VERSION
# Extract API (major.minor) from VERSION
pv_api=$(echo "$ParaView_VERSION" | \
sed -ne 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p')
;;
@ -162,7 +162,7 @@ case "$ParaView_VERSION" in
if [ -d "$ParaView_DIR/$pvLibDir" ]
then
case "$pv_api" in
(5.[0-4]*)
(5.[0-4])
libDir="$pvLibDir" # Needs lib/paraview-X.X (not lib)
;;
esac

2
etc/config.sh/settings
View File

@ -264,7 +264,7 @@ GCC_NOT_FOUND
if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
then
echo "Using ThirdParty compiler"
echo " ${gccDir##*/} (${gmpDir##*/} $${mpfrDir##*/} ${mpcDir##*/})"
echo " ${gccDir##*/} (${gmpDir##*/} ${mpfrDir##*/} ${mpcDir##*/})"
fi
;;

11
etc/config.sh/setup
View File

@ -130,22 +130,19 @@ then
;;
(*=)
# name= -> unset name
[ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] \
&& echo "unset ${foamVar_eval%=}" 1>&2
_foamEcho "unset ${foamVar_eval%=}"
eval "unset ${foamVar_eval%=}"
;;
(*=*)
# name=value -> export name=value
[ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] \
&& echo "export $foamVar_eval" 1>&2
_foamEcho "export $foamVar_eval"
eval "export $foamVar_eval"
;;
(*)
# Filename: source it
if [ -f "$foamVar_eval" ]
then
[ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] \
&& echo "Using: $foamVar_eval" 1>&2
_foamEcho "Use file: $foamVar_eval"
. "$foamVar_eval"
elif [ -n "$foamVar_eval" ]
then
@ -229,7 +226,7 @@ then
_foamAddMan "$WM_PROJECT_DIR/doc"
fi
# Interactive shell (use PS1, not tty)
# Interactive shell
if [ -n "$PS1" ]
then
_foamEtc -config aliases