Merge commit 'origin/master' into olesenm

* Note: some strange renmant files from the intel compiler

bin/tools/buildParaView3.2.1

@@ -54,7 +54,10 @@ then
    CMAKE_SKIP=YES
 fi
 
-initialiseVariables
+# set paraview environment
+PARAVIEW_SRC_DIR=$PWD/$PARAVIEW_SRC
+#PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS/obj$OBJ_ADD
+PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_ARCH$WM_COMPILER
 
 addMpiSupport       # set MPI specific options
 addPythonSupport    # set python specific options

bin/tools/buildParaViewFunctions

@@ -43,7 +43,7 @@ addCMakeVariable ()
 
 initialiseVariables ()
 {
-    unset CMAKE_VARIABLES OBJ_ADD
+    unset CMAKE_VARIABLES OBJ_ADD MPI_ARCH_PATH
 
     if [ "$VERBOSE" = ON ]; then
         addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
@@ -58,19 +58,16 @@ addMpiSupport ()
     # using OpenFOAM variables to identify location of MPI libraries
     case "$WM_MPLIB" in
     OPENMPI)
-        MPI_INCLUDE_PATH=$OPENMPI_ARCH_PATH/include
+        MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
         MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so
-        MPI_RUN=$OPENMPI_ARCH_PATH/bin/mpirun
         ;;
     LAM)
-        MPI_INCLUDE_PATH=$LAM_ARCH_PATH/include
+        MPI_ARCH_PATH=$LAM_ARCH_PATH
         MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so
-        MPI_RUN=$LAM_ARCH_PATH/bin/mpirun
         ;;
     MPICH)
-        MPI_INCLUDE_PATH=$MPICH_ARCH_PATH/include
+        MPI_ARCH_PATH=$MPICH_ARCH_PATH
         MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so
-        MPI_RUN=$MPICH_ARCH_PATH/bin/mpirun
         ;;
     *)
         echo "*** Error: unknown/unsupported mpi: $WM_MPLIB"
@@ -78,6 +75,9 @@ addMpiSupport ()
         ;;
     esac
 
+    MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include
+    MPI_RUN=$MPI_ARCH_PATH/bin/mpirun
+
     OBJ_ADD="$OBJ_ADD-mpi"
     addCMakeVariable "VTK_USE_MPI=ON"
     addCMakeVariable "PARAVIEW_USE_MPI=ON"
@@ -180,7 +180,7 @@ buildParaView ()
     }
 
     # PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS/obj$OBJ_ADD
-    PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS
+    PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_ARCH$WM_COMPILER
 
     # provide a shortcut for repeated builds - use with caution
     if [ "$CMAKE_SKIP" = YES ]
@@ -235,12 +235,21 @@ installParaView ()
 
         cd $PARAVIEW_OBJ_DIR
 
-        # replace local links with ParaView_INST_DIR environment variables
+        # Replace PARAVIEW_SRC_DIR path with ParaView_INST_DIR
+        # environment variables
         echo "    Replacing path hard links"
         find . -iname \*.cmake -execdir sed -i \
             "s,$PARAVIEW_SRC_DIR,\$ENV{ParaView_INST_DIR},g" {} ';' \
             -print
 
+        # Replace local MPI_ARCH_PATH path with MPI_ARCH_PATH
+        # environment variables
+        if [ "$INCLUDE_MPI" = ON ]; then
+            find . -iname \*.cmake -execdir sed -i \
+                "s,$MPI_ARCH_PATH,\$ENV{MPI_ARCH_PATH},g" {} ';' \
+                -print
+        fi
+
         # create a softlink to the $PARAVIEW_OBJ_DIR/bin folder
         # - workaround for chosen install location
         echo "    Creating paraview $PARAVIEW_MAJOR_VERSION soft link to /bin"
@@ -265,6 +274,7 @@ installParaView ()
 # for good measure - clear a few variables before using any of the functions
 
 unset VERBOSE INCLUDE_MPI INCLUDE_PYTHON INCLUDE_MESA PYTHON_LIBRARY
+unset MPI_ARCH_PATH
 unset CMAKE_VARIABLES OBJ_ADD
 unset CMAKE_SKIP