Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

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