Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev

bin/tools/buildParaView3.2.1

@@ -87,7 +87,7 @@ fi
 # 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_OPTIONS
+PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_ARCH$WM_COMPILER
 
 # remove existing build folder if present
 if [ -e "$PARAVIEW_OBJ_DIR" ]; then

bin/tools/buildParaViewFunctions

@@ -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 ]

etc/apps/paraview3/bashrc

@@ -37,7 +37,7 @@ if [ "$PS1" -a "$foamDotFile" ]; then
     fi
 fi
 
-export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6
+export CMAKE_HOME=$WM_PROJECT_INST_DIR/ThirdParty/cmake-2.4.6/platforms/$WM_ARCH
 
 if [ -r $CMAKE_HOME ]; then
     export PATH=$CMAKE_HOME/bin:$PATH
@@ -48,7 +48,7 @@ fi
 export ParaView_VERSION="3.3-cvs"
 
 export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/ThirdParty/ParaView$ParaView_VERSION
-export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_OPTIONS
+export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
 
 if [ "$PYTHONPATH" ]; then
     export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping

etc/apps/paraview3/bashrc.save

@@ -1,58 +0,0 @@
-#----------------------------------*-sh-*--------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     bashrc
-#
-# Description
-#     Setup file for ParaView3.
-#     Sourced from OpenFOAM-?.?/etc/bashrc
-#
-#------------------------------------------------------------------------------
-
-if [ "$PS1" -a "$foamDotFile" ]; then
-    if [ "$FOAM_VERBOSE" ]; then
-        echo "Executing: $foamDotFile"
-    fi
-fi
-
-export CMAKE_HOME=$WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6
-
-if [ -r $CMAKE_HOME ]; then
-    export PATH=$CMAKE_HOME/bin:$PATH
-fi
-
-export ParaView_VERSION=3
-
-export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/$WM_ARCH/ParaView3.2.1
-export ParaView_DIR=$ParaView_INST_DIR
-
-if [ -r $ParaView_INST_DIR ]; then
-    export PATH=$ParaView_INST_DIR/bin:$PATH
-    export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib/paraview-3.2:${LD_LIBRARY_PATH}
-
-    export PV_PLUGIN_PATH=$FOAM_LIBBIN
-fi
-
-# -----------------------------------------------------------------------------

etc/apps/paraview3/cshrc

@@ -37,7 +37,7 @@ if ($?prompt && $?foamDotFile) then
     endif
 endif
 
-setenv CMAKE_HOME $WM_PROJECT_INST_DIR/$WM_ARCH/cmake-2.4.6
+setenv CMAKE_HOME $WM_PROJECT_INST_DIR/ThirdParty/cmake-2.4.6/platforms/$WM_ARCH
 
 if ( -r $CMAKE_HOME ) then
     set path=($CMAKE_HOME/bin $path)
@@ -48,7 +48,7 @@ endif
 setenv ParaView_VERSION 3.3-cvs
 
 setenv ParaView_INST_DIR $WM_PROJECT_INST_DIR/ThirdParty/ParaView$ParaView_VERSION
-setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_OPTIONS
+setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
 
 if ($?PYTHONPATH) then
     setenv PYTHONPATH ${PYTHONPATH}:$ParaView_DIR/bin:$ParaView_DIR/Utilities/VTKPythonWrapping

etc/settings.csh

@@ -39,6 +39,7 @@ endif
 alias AddPath 'set path=(\!* $path) ; if ( ! -d \!* ) mkdir -p \!*'
 alias AddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH} ; if ( ! -d \!* ) mkdir -p \!*'
 
+
 #- Add the system-specific executables path to the path
 set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path)
 
@@ -73,6 +74,11 @@ AddPath $FOAM_USER_APPBIN
 setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
 
 
+# Location of third-party software
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
+
+
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
 set WM_COMPILER_BIN=
@@ -88,10 +94,10 @@ switch ("$WM_COMPILER_INST")
 case OpenFOAM:
     switch ("$WM_COMPILER")
     case Gcc43:
-        setenv WM_COMPILER_DIR $FOAM_INST_DIR/$WM_ARCH/gcc-4.3.0$WM_COMPILER_ARCH
+        setenv WM_COMPILER_DIR $thirdParty/gcc-4.3.0/platforms/$WM_ARCH
     breaksw
     case Gcc:
-        setenv WM_COMPILER_DIR $FOAM_INST_DIR/$WM_ARCH/gcc-4.2.2$WM_COMPILER_ARCH
+        setenv WM_COMPILER_DIR $thirdParty/gcc-4.2.2/platforms/$WM_ARCH
     breaksw
     endsw
 
@@ -121,11 +127,6 @@ if ($?WM_COMPILER_BIN) then
 endif
 
 
-# Third-party software
-# ~~~~~~~~~~~~~~~~~~~~
-set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
-
-
 # MICO
 # ~~~~
 setenv MICO_VERSION 2.3.12

etc/settings.sh

@@ -53,6 +53,7 @@ AddLib()
     fi
 }
 
+
 #- Add the system-specifc executables path to the path
 export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH
 
@@ -85,6 +86,12 @@ AddPath $FOAM_USER_APPBIN
 
 export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 
+
+# Location of third-party software
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
+
+
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
 WM_COMPILER_BIN=
@@ -99,10 +106,10 @@ case "$WM_COMPILER_INST" in
 OpenFOAM)
     case "$WM_COMPILER" in
     Gcc43)
-        export WM_COMPILER_DIR=$FOAM_INST_DIR/$WM_ARCH/gcc-4.3.0$WM_COMPILER_ARCH
+        export WM_COMPILER_DIR=$thirdParty/gcc-4.3.0/platforms/$WM_ARCH
         ;;
     Gcc)
-        export WM_COMPILER_DIR=$FOAM_INST_DIR/$WM_ARCH/gcc-4.2.2$WM_COMPILER_ARCH
+        export WM_COMPILER_DIR=$thirdParty/gcc-4.2.2/platforms/$WM_ARCH
         ;;
     esac
 

src/OpenFOAM/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/zlib-1.2.1
+    -I$(LIB_SRC)/zlib-1.2.3
 
 LIB_LIBS = \
     $(FOAM_LIBBIN)/libOSspecific.o \