Skip to content
Snippets Groups Projects
Commit f1112fc3 authored by Mark Olesen's avatar Mark Olesen
Browse files

CONFIG: update paraview 5.3.0, openmpi 2.0.2, mpich 3.2, fftw 3.3.6-pl1

parent 7848953b
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
etc/config.csh/FFTW
+ 1
− 1
View file @ f1112fc3
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade
set fftw_version=fftw-3.3.5 set fftw_version=fftw-3.3.6-pl1
setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
# END OF (NORMAL) USER EDITABLE PART # END OF (NORMAL) USER EDITABLE PART
......
etc/config.csh/mpi
+ 12
− 24
View file @ f1112fc3
...@@ -26,13 +26,10 @@ ...@@ -26,13 +26,10 @@
# #
# Description # Description
# Startup file for communications library (MPI) for OpenFOAM # Startup file for communications library (MPI) for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/bashrc # Sourced from OpenFOAM-<VERSION>/etc/cshrc
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
switch ("$WM_MPLIB") switch ("$WM_MPLIB")
...@@ -40,18 +37,17 @@ case SYSTEMOPENMPI: ...@@ -40,18 +37,17 @@ case SYSTEMOPENMPI:
# Use the system installed openmpi, get library directory via mpicc # Use the system installed openmpi, get library directory via mpicc
setenv FOAM_MPI openmpi-system setenv FOAM_MPI openmpi-system
# Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi
# include files and libraries.
set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'` set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi
# Include files and libraries.
setenv MPI_ARCH_PATH "${libDir:h}" setenv MPI_ARCH_PATH "${libDir:h}"
_foamAddLib $libDir _foamAddLib $libDir
unset libDir unset libDir
breaksw breaksw
case OPENMPI: case OPENMPI:
setenv FOAM_MPI openmpi-1.10.4 setenv FOAM_MPI openmpi-2.0.2
# Optional configuration tweaks: # Optional configuration tweaks:
_foamSourceEtc config.csh/openmpi _foamSourceEtc config.csh/openmpi
...@@ -74,7 +70,7 @@ case OPENMPI: ...@@ -74,7 +70,7 @@ case OPENMPI:
case SYSTEMMPI: case SYSTEMMPI:
setenv FOAM_MPI mpi-system setenv FOAM_MPI mpi-system
if ( ! ($?MPI_ROOT) ) then if ( ! $?MPI_ROOT ) then
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
echo " Please set the environment variable MPI_ROOT to point to" \ echo " Please set the environment variable MPI_ROOT to point to" \
...@@ -86,7 +82,7 @@ case SYSTEMMPI: ...@@ -86,7 +82,7 @@ case SYSTEMMPI:
else else
setenv MPI_ARCH_PATH $MPI_ROOT setenv MPI_ARCH_PATH $MPI_ROOT
if ( ! ($?MPI_ARCH_FLAGS) ) then if ( ! $?MPI_ARCH_FLAGS ) then
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
echo " MPI_ARCH_FLAGS is not set. Example:" echo " MPI_ARCH_FLAGS is not set. Example:"
...@@ -95,7 +91,7 @@ case SYSTEMMPI: ...@@ -95,7 +91,7 @@ case SYSTEMMPI:
echo echo
endif endif
if ( ! ($?MPI_ARCH_INC) ) then if ( ! $?MPI_ARCH_INC ) then
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
echo " MPI_ARCH_INC is not set. Example:" echo " MPI_ARCH_INC is not set. Example:"
...@@ -104,7 +100,7 @@ case SYSTEMMPI: ...@@ -104,7 +100,7 @@ case SYSTEMMPI:
echo echo
endif endif
if ( ! ($?MPI_ARCH_LIBS) ) then if ( ! $?MPI_ARCH_LIBS ) then
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
echo " MPI_ARCH_LIBS is not set. Example:" echo " MPI_ARCH_LIBS is not set. Example:"
...@@ -116,16 +112,12 @@ case SYSTEMMPI: ...@@ -116,16 +112,12 @@ case SYSTEMMPI:
breaksw breaksw
case MPICH: case MPICH:
setenv FOAM_MPI mpich2-1.1.1p1 setenv FOAM_MPI mpich-3.2
setenv MPI_ARCH_PATH $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
setenv MPI_HOME $MPI_ARCH_PATH setenv MPI_HOME $MPI_ARCH_PATH
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
# 64-bit on OpenSuSE 12.1 uses lib64 others use lib
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
_foamAddMan $MPI_ARCH_PATH/share/man _foamAddMan $MPI_ARCH_PATH/share/man
breaksw breaksw
...@@ -133,14 +125,10 @@ case MPICH-GM: ...@@ -133,14 +125,10 @@ case MPICH-GM:
setenv FOAM_MPI mpich-gm setenv FOAM_MPI mpich-gm
setenv MPI_ARCH_PATH /opt/mpi setenv MPI_ARCH_PATH /opt/mpi
setenv MPICH_PATH $MPI_ARCH_PATH setenv MPICH_PATH $MPI_ARCH_PATH
setenv GM_LIB_PATH /opt/gm/lib64 setenv GM_LIB_PATH /opt/gm/lib$WM_COMPILER_LIB_ARCH
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
# 64-bit on OpenSuSE 12.1 uses lib64 others use lib
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
_foamAddLib $GM_LIB_PATH _foamAddLib $GM_LIB_PATH
breaksw breaksw
...@@ -191,7 +179,7 @@ case QSMPI: ...@@ -191,7 +179,7 @@ case QSMPI:
breaksw breaksw
case SGIMPI: case SGIMPI:
if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy if ( ! $?MPI_ROOT ) setenv MPI_ROOT /dummy
if ( ! -d "$MPI_ROOT" ) then if ( ! -d "$MPI_ROOT" ) then
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
...@@ -219,7 +207,7 @@ case SGIMPI: ...@@ -219,7 +207,7 @@ case SGIMPI:
breaksw breaksw
case INTELMPI: case INTELMPI:
if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy if ( ! $?MPI_ROOT ) setenv MPI_ROOT /dummy
if ( ! -d "$MPI_ROOT" ) then if ( ! -d "$MPI_ROOT" ) then
echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
......
etc/config.csh/paraview
+ 1
− 1
View file @ f1112fc3
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade
setenv ParaView_VERSION 5.0.1 setenv ParaView_VERSION 5.3.0
setenv ParaView_MAJOR detect # Automatically determine major version setenv ParaView_MAJOR detect # Automatically determine major version
set cmake_version=cmake-system set cmake_version=cmake-system
......
etc/config.sh/FFTW
+ 1
− 1
View file @ f1112fc3
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade
fftw_version=fftw-3.3.5 fftw_version=fftw-3.3.6-pl1
export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
# END OF (NORMAL) USER EDITABLE PART # END OF (NORMAL) USER EDITABLE PART
......
etc/config.sh/mpi
+ 21
− 23
View file @ f1112fc3
...@@ -43,18 +43,17 @@ SYSTEMOPENMPI) ...@@ -43,18 +43,17 @@ SYSTEMOPENMPI)
unset OPAL_PREFIX unset OPAL_PREFIX
fi fi
# Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi
# include files and libraries.
libDir=$(mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/') libDir=$(mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/')
# Bit of a hack: strip off 'lib' and hope this is the path to openmpi
# include files and libraries.
export MPI_ARCH_PATH="${libDir%/*}" export MPI_ARCH_PATH="${libDir%/*}"
_foamAddLib $libDir _foamAddLib $libDir
unset libDir unset libDir
;; ;;
OPENMPI) OPENMPI)
export FOAM_MPI=openmpi-1.10.4 export FOAM_MPI=openmpi-2.0.2
# Optional configuration tweaks: # Optional configuration tweaks:
_foamSourceEtc config.sh/openmpi _foamSourceEtc config.sh/openmpi
...@@ -70,9 +69,13 @@ OPENMPI) ...@@ -70,9 +69,13 @@ OPENMPI)
echo " FOAM_MPI : $FOAM_MPI" 1>&2 echo " FOAM_MPI : $FOAM_MPI" 1>&2
fi fi
_foamAddPath $MPI_ARCH_PATH/bin # Could be sourced from ThirdParty with incomplete environment
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH if type _foamAddLib > /dev/null 2>&1
_foamAddMan $MPI_ARCH_PATH/share/man then
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
fi
;; ;;
SYSTEMMPI) SYSTEMMPI)
...@@ -124,31 +127,27 @@ SYSTEMMPI) ...@@ -124,31 +127,27 @@ SYSTEMMPI)
;; ;;
MPICH) MPICH)
export FOAM_MPI=mpich2-1.1.1p1 export FOAM_MPI=mpich-3.2
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
export MPI_HOME=$MPI_ARCH_PATH export MPI_HOME=$MPI_ARCH_PATH
_foamAddPath $MPI_ARCH_PATH/bin # Could be sourced from ThirdParty with incomplete environment
if type _foamAddLib > /dev/null 2>&1
# 64-bit on OpenSuSE 12.1 uses lib64 others use lib then
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH _foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
_foamAddMan $MPI_ARCH_PATH/share/man fi
;; ;;
MPICH-GM) MPICH-GM)
export FOAM_MPI=mpich-gm export FOAM_MPI=mpich-gm
export MPI_ARCH_PATH=/opt/mpi export MPI_ARCH_PATH=/opt/mpi
export MPICH_PATH=$MPI_ARCH_PATH export MPICH_PATH=$MPI_ARCH_PATH
export GM_LIB_PATH=/opt/gm/lib64 export GM_LIB_PATH=/opt/gm/lib$WM_COMPILER_LIB_ARCH
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
# 64-bit on OpenSuSE 12.1 uses lib64 others use lib
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $MPI_ARCH_PATH/lib
_foamAddLib $GM_LIB_PATH _foamAddLib $GM_LIB_PATH
;; ;;
...@@ -227,8 +226,7 @@ SGIMPI) ...@@ -227,8 +226,7 @@ SGIMPI)
;; ;;
INTELMPI) INTELMPI)
# No trailing slash MPI_ROOT="${MPI_ROOT%/}" # No trailing slash
[ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
export FOAM_MPI="${MPI_ROOT##*/}" export FOAM_MPI="${MPI_ROOT##*/}"
export MPI_ARCH_PATH=$MPI_ROOT export MPI_ARCH_PATH=$MPI_ROOT
...@@ -259,7 +257,7 @@ esac ...@@ -259,7 +257,7 @@ esac
# Add (non-dummy) MPI implementation # Add (non-dummy) MPI implementation
# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries # Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
if [ "$FOAM_MPI" != dummy ] if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1
then then
_foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI _foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI
fi fi
......
etc/config.sh/paraview
+ 1
− 1
View file @ f1112fc3
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade
ParaView_VERSION=5.0.1 ParaView_VERSION=5.3.0
ParaView_MAJOR=detect # Automatically determine major version ParaView_MAJOR=detect # Automatically determine major version
cmake_version=cmake-system cmake_version=cmake-system
......
etc/config.sh/vtk
+ 1
− 1
View file @ f1112fc3
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
# - the vtk_version, mesa_version variables are retained. # - the vtk_version, mesa_version variables are retained.
# (for future integration into ThirdParty build) # (for future integration into ThirdParty build)
# #
# It is recommended to use the VTK sources from ParaView 5.0.1. # It is recommended to use the VTK sources from ParaView 5.0.1 or later
# #
# See the BuildIssues.txt about problems that can be encountered when using # See the BuildIssues.txt about problems that can be encountered when using
# the 'plain' VTK sources. # the 'plain' VTK sources.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment