mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
CONFIG: adjust paraview libs, intelmpi handling
- 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:
@ -39,16 +39,18 @@ fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
if [ -d "$projectDir" ]
|
||||
_com_openfoam_projectDir="$projectDir"
|
||||
if [ -d "$_com_openfoam_projectDir" ]
|
||||
then
|
||||
_foamSourceBashEnv="$projectDir/etc/bashrc"
|
||||
_com_openfoam_bashrcFile="${_com_openfoam_projectDir}/etc/bashrc"
|
||||
else
|
||||
unset _foamSourceBashEnv
|
||||
unset _com_openfoam_bashrcFile
|
||||
fi
|
||||
|
||||
|
||||
# Source the user bashrc first.
|
||||
# Simply hope that they don't unset/reset _foamSourceBashEnv !!
|
||||
# Source the user bashrc first. Improbable they use the following variables:
|
||||
# * _com_openfoam_bashrcFile
|
||||
# * _com_openfoam_projectDir
|
||||
|
||||
if [ -f "$HOME/.bashrc" ]
|
||||
then
|
||||
@ -58,20 +60,46 @@ fi
|
||||
|
||||
# Source the OpenFOAM etc/bashrc
|
||||
|
||||
if [ -f "$_foamSourceBashEnv" ]
|
||||
if [ -f "$_com_openfoam_bashrcFile" ]
|
||||
then
|
||||
. "$_foamSourceBashEnv" $FOAM_SETTINGS
|
||||
. "$_com_openfoam_bashrcFile" $FOAM_SETTINGS
|
||||
|
||||
# Avoid further inheritance
|
||||
unset FOAM_SETTINGS
|
||||
else
|
||||
echo "Missing OpenFOAM etc/bashrc in '${_com_openfoam_projectDir}'" 1>&2
|
||||
fi
|
||||
unset _com_openfoam_bashrcFile _com_openfoam_projectDir
|
||||
|
||||
# Some feedback
|
||||
if [ -n "$PS1" ] && [ -d "$WM_PROJECT_DIR" ]
|
||||
|
||||
# Welcome banner - format somewhat like Ubuntu welcome
|
||||
#----
|
||||
## Welcome to Ubuntu VER (GNU/Linux ... x86_64)
|
||||
##
|
||||
## * Documentation: ...
|
||||
#----
|
||||
|
||||
if [ -n "$PS1" ] ## Interactive
|
||||
then
|
||||
if [ -d "$WM_PROJECT_DIR" ]
|
||||
then
|
||||
_foam_api="$("$WM_PROJECT_DIR"/bin/foamEtcFile -show-api 2>/dev/null)"
|
||||
_foam_patch="$("$WM_PROJECT_DIR"/bin/foamEtcFile -show-patch 2>/dev/null)"
|
||||
_foam_build="$("$WM_PROJECT_DIR"/bin/foamEtcFile -show-build 2>/dev/null)"
|
||||
|
||||
unset _foam_arch1
|
||||
case "$WM_OPTIONS" in # Or WM_LABEL_SIZE?
|
||||
(*Int32*) _foam_arch1="label=32" ;;
|
||||
(*Int64*) _foam_arch1="label=64" ;;
|
||||
esac
|
||||
|
||||
unset _foam_arch2
|
||||
case "$WM_OPTIONS" in # Or WM_PRECISION_OPTION?
|
||||
(*SPDPInt*) _foam_arch2="scalar=32;solveScalar=64" ;;
|
||||
(*SPInt*) _foam_arch2="scalar=32" ;;
|
||||
(*DPInt*) _foam_arch2="scalar=64" ;;
|
||||
esac
|
||||
|
||||
if [ "${_foam_patch:-0}" = 0 ]
|
||||
then
|
||||
unset _foam_patch
|
||||
@ -86,15 +114,17 @@ then
|
||||
_foam_verinfo="${_foam_api}${_foam_patch:+ patch=${_foam_patch}}"
|
||||
fi
|
||||
|
||||
echo "Using: OpenFOAM-$WM_PROJECT_VERSION (${_foam_verinfo}) - visit www.openfoam.com" 1>&2
|
||||
echo "openfoam = $WM_PROJECT_DIR" 1>&2
|
||||
echo 1>&2
|
||||
echo " * Using: OpenFOAM-$WM_PROJECT_VERSION (${_foam_verinfo}) - visit www.openfoam.com" 1>&2
|
||||
if [ -n "$_foam_build" ]
|
||||
then
|
||||
echo "Build: ${_foam_build}" 1>&2
|
||||
echo " * Build: ${_foam_build}" 1>&2
|
||||
fi
|
||||
echo "Arch: $WM_OPTIONS (mpi=$FOAM_MPI)" 1>&2
|
||||
# Arch: LSB;label=32;scalar=64
|
||||
|
||||
## echo 1>&2
|
||||
# Arch: LSB;label=32;scalar=64
|
||||
echo " * Arch: $_foam_arch1;$_foam_arch2" 1>&2
|
||||
echo " * Platform: $WM_OPTIONS (mpi=$FOAM_MPI)" 1>&2
|
||||
echo 1>&2
|
||||
|
||||
# Set prompt as reminder that this is a shell session
|
||||
|
||||
@ -102,18 +132,18 @@ then
|
||||
# PS1="openfoam${_foam_api}:"'$(foamPwd)\n\u\$ '
|
||||
|
||||
PS1="openfoam${_foam_api}:"'\w/\n\u\$ '
|
||||
unset _foam_arch1 _foam_arch2
|
||||
unset _foam_api _foam_patch _foam_build _foam_verinfo
|
||||
else
|
||||
# Adjust prompt if not found - reminder that it is a shell session
|
||||
PS1="openfoam(not-found):"'\w/\n\u\$ '
|
||||
fi
|
||||
else
|
||||
echo "Could not locate OpenFOAM etc/bashrc in '$projectDir'" 1>&2
|
||||
|
||||
echo "OpenFOAM shell session - use 'exit' to quit" 1>&2
|
||||
echo 1>&2
|
||||
fi
|
||||
|
||||
echo 1>&2
|
||||
echo "openfoam = $WM_PROJECT_DIR" 1>&2
|
||||
echo "OpenFOAM shell session - use exit to quit" 1>&2
|
||||
echo 1>&2
|
||||
|
||||
# Cleanup variables (done as final statement for a clean exit code)
|
||||
unset _foamSourceBashEnv projectDir
|
||||
unset projectDir
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user