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: typo in config.csh/mpi

Browse Source 
- also handle stray semi-colons in foamCleanPath.
  Treat like a ':' separator.
  They are incorrect and potentially problematic for shell evals.
This commit is contained in:
Mark Olesen
2018-01-16 12:00:21 +01:00
parent a4fa743add
commit ff07ae1520
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/foamCleanPath
View File

@ -181,7 +181,7 @@ fi
# or may contain ':' separators # or may contain ':' separators
oldIFS="$IFS" # Preserve initial IFS oldIFS="$IFS" # Preserve initial IFS
IFS=': ' # Split on colon, whitespace IFS=':; ' # Split on colon, whitespace (semi-colon for good measure)
set -- $* set -- $*
if [ -n "$optVerbose" ] if [ -n "$optVerbose" ]
@ -203,7 +203,7 @@ do
done done
printDebug "intermediate>$dirList<" printDebug "intermediate>$dirList<"
IFS=': ' # Split on colon, whitespace (to avoid surprises) IFS=':; ' # Split on colon, whitespace (semi-colon for good measure)
set -- $dirList set -- $dirList
IFS="$oldIFS" # Restore initial IFS IFS="$oldIFS" # Restore initial IFS

2
etc/config.csh/mpi
View File

@ -56,7 +56,7 @@ case OPENMPI:
# Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments) # Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH
if (! -d "$MPI_ARCH_PATH" ) then if (! -d "$MPI_ARCH_PATH" ) then
setenv mpiDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
endif endif
# Inform openmpi where to find its install directory # Inform openmpi where to find its install directory