From f1112fc3573d4fc9e85e05b8be1049483d5b331c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 14 Mar 2017 10:38:54 +0100 Subject: [PATCH] CONFIG: update paraview 5.3.0, openmpi 2.0.2, mpich 3.2, fftw 3.3.6-pl1 --- etc/config.csh/FFTW | 2 +- etc/config.csh/mpi | 36 +++++++++++---------------------- etc/config.csh/paraview | 2 +- etc/config.sh/FFTW | 2 +- etc/config.sh/mpi | 44 ++++++++++++++++++++--------------------- etc/config.sh/paraview | 2 +- etc/config.sh/vtk | 2 +- 7 files changed, 38 insertions(+), 52 deletions(-) diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW index d2e2c82529..8733ff591a 100644 --- a/etc/config.csh/FFTW +++ b/etc/config.csh/FFTW @@ -49,7 +49,7 @@ #------------------------------------------------------------------------------ # 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 # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi index ac3f3788cd..88524e548d 100644 --- a/etc/config.csh/mpi +++ b/etc/config.csh/mpi @@ -26,13 +26,10 @@ # # Description # Startup file for communications library (MPI) for OpenFOAM -# Sourced from OpenFOAM-/etc/bashrc +# Sourced from OpenFOAM-/etc/cshrc # #------------------------------------------------------------------------------ -# Communications library -# ~~~~~~~~~~~~~~~~~~~~~~ - unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN switch ("$WM_MPLIB") @@ -40,18 +37,17 @@ case SYSTEMOPENMPI: # Use the system installed openmpi, get library directory via mpicc 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/'` - # 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}" - _foamAddLib $libDir unset libDir breaksw case OPENMPI: - setenv FOAM_MPI openmpi-1.10.4 + setenv FOAM_MPI openmpi-2.0.2 # Optional configuration tweaks: _foamSourceEtc config.csh/openmpi @@ -74,7 +70,7 @@ case OPENMPI: case SYSTEMMPI: setenv FOAM_MPI mpi-system - if ( ! ($?MPI_ROOT) ) then + if ( ! $?MPI_ROOT ) then echo echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo " Please set the environment variable MPI_ROOT to point to" \ @@ -86,7 +82,7 @@ case SYSTEMMPI: else setenv MPI_ARCH_PATH $MPI_ROOT - if ( ! ($?MPI_ARCH_FLAGS) ) then + if ( ! $?MPI_ARCH_FLAGS ) then echo echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo " MPI_ARCH_FLAGS is not set. Example:" @@ -95,7 +91,7 @@ case SYSTEMMPI: echo endif - if ( ! ($?MPI_ARCH_INC) ) then + if ( ! $?MPI_ARCH_INC ) then echo echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo " MPI_ARCH_INC is not set. Example:" @@ -104,7 +100,7 @@ case SYSTEMMPI: echo endif - if ( ! ($?MPI_ARCH_LIBS) ) then + if ( ! $?MPI_ARCH_LIBS ) then echo echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" echo " MPI_ARCH_LIBS is not set. Example:" @@ -116,16 +112,12 @@ case SYSTEMMPI: breaksw 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_HOME $MPI_ARCH_PATH _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 - _foamAddMan $MPI_ARCH_PATH/share/man breaksw @@ -133,14 +125,10 @@ case MPICH-GM: setenv FOAM_MPI mpich-gm setenv MPI_ARCH_PATH /opt/mpi 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 - - # 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 - _foamAddLib $GM_LIB_PATH breaksw @@ -191,7 +179,7 @@ case QSMPI: breaksw case SGIMPI: - if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy + if ( ! $?MPI_ROOT ) setenv MPI_ROOT /dummy if ( ! -d "$MPI_ROOT" ) then echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" @@ -219,7 +207,7 @@ case SGIMPI: breaksw case INTELMPI: - if ( ! $?MPI_ROOT) setenv MPI_ROOT /dummy + if ( ! $?MPI_ROOT ) setenv MPI_ROOT /dummy if ( ! -d "$MPI_ROOT" ) then echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview index d1e306c522..ce7069b342 100644 --- a/etc/config.csh/paraview +++ b/etc/config.csh/paraview @@ -52,7 +52,7 @@ #------------------------------------------------------------------------------ # 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 set cmake_version=cmake-system diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW index 73b99534a3..47d3d22f8a 100644 --- a/etc/config.sh/FFTW +++ b/etc/config.sh/FFTW @@ -48,7 +48,7 @@ #------------------------------------------------------------------------------ # 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 # END OF (NORMAL) USER EDITABLE PART diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi index dd64a8649b..5d04da0ff3 100644 --- a/etc/config.sh/mpi +++ b/etc/config.sh/mpi @@ -43,18 +43,17 @@ SYSTEMOPENMPI) unset OPAL_PREFIX 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/') - # Bit of a hack: strip off 'lib' and hope this is the path to openmpi - # include files and libraries. export MPI_ARCH_PATH="${libDir%/*}" - _foamAddLib $libDir unset libDir ;; OPENMPI) - export FOAM_MPI=openmpi-1.10.4 + export FOAM_MPI=openmpi-2.0.2 # Optional configuration tweaks: _foamSourceEtc config.sh/openmpi @@ -70,9 +69,13 @@ OPENMPI) echo " FOAM_MPI : $FOAM_MPI" 1>&2 fi - _foamAddPath $MPI_ARCH_PATH/bin - _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH - _foamAddMan $MPI_ARCH_PATH/share/man + # Could be sourced from ThirdParty with incomplete environment + if type _foamAddLib > /dev/null 2>&1 + then + _foamAddPath $MPI_ARCH_PATH/bin + _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH + _foamAddMan $MPI_ARCH_PATH/share/man + fi ;; SYSTEMMPI) @@ -124,31 +127,27 @@ SYSTEMMPI) ;; 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_HOME=$MPI_ARCH_PATH - _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 - - _foamAddMan $MPI_ARCH_PATH/share/man + # Could be sourced from ThirdParty with incomplete environment + if type _foamAddLib > /dev/null 2>&1 + then + _foamAddPath $MPI_ARCH_PATH/bin + _foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH + _foamAddMan $MPI_ARCH_PATH/share/man + fi ;; MPICH-GM) export FOAM_MPI=mpich-gm export MPI_ARCH_PATH=/opt/mpi 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 - - # 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 - _foamAddLib $GM_LIB_PATH ;; @@ -227,8 +226,7 @@ SGIMPI) ;; INTELMPI) - # No trailing slash - [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}" + MPI_ROOT="${MPI_ROOT%/}" # No trailing slash export FOAM_MPI="${MPI_ROOT##*/}" export MPI_ARCH_PATH=$MPI_ROOT @@ -259,7 +257,7 @@ esac # Add (non-dummy) MPI implementation # 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 _foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI fi diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview index b1a4f245a8..4aadf1dccc 100644 --- a/etc/config.sh/paraview +++ b/etc/config.sh/paraview @@ -55,7 +55,7 @@ #------------------------------------------------------------------------------ # 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 cmake_version=cmake-system diff --git a/etc/config.sh/vtk b/etc/config.sh/vtk index e4dc84c90f..004a8d2b82 100644 --- a/etc/config.sh/vtk +++ b/etc/config.sh/vtk @@ -36,7 +36,7 @@ # - the vtk_version, mesa_version variables are retained. # (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 # the 'plain' VTK sources.