Merge branch 'master' of ssh://10.0.0.4/home/noisy3/OpenFOAM/OpenFOAM-dev

Allwmake

@@ -15,6 +15,8 @@ wmakeCheckPwd "$WM_PROJECT_DIR" || {
 if [ -d "$WM_THIRD_PARTY_DIR" ]
 then
     $WM_THIRD_PARTY_DIR/Allwmake
+else
+    echo "no ThirdParty sources found - skipping"
 fi
 
 # build OpenFOAM libraries and applications

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -430,6 +430,59 @@ int main(int argc, char *argv[])
         << "Band before renumbering: "
         << returnReduce(band, maxOp<label>()) << nl << endl;
 
+
+    // Read parallel reconstruct maps
+    labelIOList cellProcAddressing
+    (
+        IOobject
+        (
+            "cellProcAddressing",
+            mesh.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::READ_IF_PRESENT
+        ),
+        labelList(0)
+    );
+
+    labelIOList faceProcAddressing
+    (
+        IOobject
+        (
+            "faceProcAddressing",
+            mesh.facesInstance(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::READ_IF_PRESENT
+        ),
+        labelList(0)
+    );
+    labelIOList pointProcAddressing
+    (
+        IOobject
+        (
+            "pointProcAddressing",
+            mesh.pointsInstance(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::READ_IF_PRESENT
+        ),
+        labelList(0)
+    );
+    labelIOList boundaryProcAddressing
+    (
+        IOobject
+        (
+            "boundaryProcAddressing",
+            mesh.pointsInstance(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::READ_IF_PRESENT
+        ),
+        labelList(0)
+    );
+
+
     // Read objects in time directory
     IOobjectList objects(mesh, runTime.timeName());
 
@@ -579,6 +632,39 @@ int main(int argc, char *argv[])
     // Update fields
     mesh.updateMesh(map);
 
+    // Update proc maps
+    if (cellProcAddressing.headerOk())
+    {
+        Info<< "Renumbering processor cell decomposition map "
+            << cellProcAddressing.name() << endl;
+
+        cellProcAddressing = labelList
+        (
+            UIndirectList<label>(cellProcAddressing, map().cellMap())
+        );
+    }
+    if (faceProcAddressing.headerOk())
+    {
+        Info<< "Renumbering processor face decomposition map "
+            << faceProcAddressing.name() << endl;
+
+        faceProcAddressing = labelList
+        (
+            UIndirectList<label>(faceProcAddressing, map().faceMap())
+        );
+    }
+    if (pointProcAddressing.headerOk())
+    {
+        Info<< "Renumbering processor point decomposition map "
+            << pointProcAddressing.name() << endl;
+
+        pointProcAddressing = labelList
+        (
+            UIndirectList<label>(pointProcAddressing, map().pointMap())
+        );
+    }
+
+
     // Move mesh (since morphing might not do this)
     if (map().hasMotionPoints())
     {
@@ -652,7 +738,8 @@ int main(int argc, char *argv[])
     {
         mesh.setInstance(oldInstance);
     }
-    Info<< "Writing mesh to " << runTime.timeName() << endl;
+
+    Info<< "Writing mesh to " << mesh.facesInstance() << endl;
 
     mesh.write();
 

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C

@@ -31,6 +31,7 @@ License
 #include "cellModeller.H"
 #include "vtkOpenFOAMPoints.H"
 #include "Swap.H"
+#include "longLong.H"
 
 // VTK includes
 #include "vtkCellArray.h"

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H

@@ -195,7 +195,15 @@ void Foam::vtkPV3Foam::convertPointField
 
     // Note: using the name of the original volField
     // not the name generated by the interpolation "volPointInterpolate(<name>)"
-    pointData->SetName(tf.name().c_str());
+
+    if (&tf != &GeometricField<Type, fvPatchField, volMesh>::null())
+    {
+        pointData->SetName(tf.name().c_str());
+    }
+    else
+    {
+        pointData->SetName(ptf.name().c_str());
+    }
 
     if (debug)
     {

applications/utilities/surface/surfaceInertia/surfaceInertia.C

@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
     if (m < 0)
     {
         WarningIn(args.executable() + "::main")
-            << "Negative mass detected" << endl;
+            << "Negative mass detected, the surface may be inside-out." << endl;
     }
 
     vector eVal = eigenValues(J);

bin/foamEtcFile

@@ -39,8 +39,6 @@
 #     @endverbatim
 #
 #-------------------------------------------------------------------------------
-unset listOpt quietOpt
-
 usage() {
     [ "$quietOpt" = true ] && exit 1
 
@@ -53,7 +51,10 @@ Usage: ${0##*/} [OPTION] fileName
 options:
   -list             list the directories to be searched
   -mode <mode>      any combination of u(user), g(group), o(other)
+  -prefix <dir>     specify an alternative installation prefix
   -quiet            suppress all normal output
+  -version <ver>    specify an alternative OpenFOAM version
+                    in the form Maj.Min.Rev (eg, 1.7.0)
   -help             print the usage
 
   Locate user/group/shipped file with semantics similar to the
@@ -71,9 +72,63 @@ USAGE
     exit 1
 }
 
+#
+# This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+# or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
+#
+#-------------------------------------------------------------------------------
+
+# the bindir:
+binDir="${0%/*}"
+
+# the project dir:
+projectDir="${binDir%/bin}"
+
+# the prefix dir (same as foamInstall):
+prefixDir="${projectDir%/*}"
+
+# the name used for the project directory
+projectDirName="${projectDir##*/}"
+
+# version number used for debian packaging
+unset versionNum
+
+#
+# handle standard and debian naming convention
+#
+case "$projectDirName" in
+OpenFOAM-*)         # standard naming convention OpenFOAM-<VERSION>
+    version="${projectDirName##OpenFOAM-}"
+    ;;
+
+openfoam[0-9]*)     # debian naming convention 'openfoam<VERSION>'
+    versionNum="${projectDirName##openfoam}"
+    case "$versionNum" in
+    ??)         # convert 2 digit version number to decimal delineated
+        version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)@\1.\2@')
+        ;;
+    ???)        # convert 3 digit version number to decimal delineated
+        version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)@\1.\2.\3@')
+        ;;
+    ????)       # convert 4 digit version number to decimal delineated
+        version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)\(.\)@\1.\2.\3.\4@')
+        ;;
+    *)          # failback - use current environment setting
+        version="$WM_PROJECT_VERSION"
+        ;;
+    esac
+    ;;
+
+*)
+    echo "Error : unknown/unsupported naming convention"
+    exit 1
+    ;;
+esac
+
 
 # default mode is 'ugo'
 mode=ugo
+unset listOpt quietOpt
 
 # parse options
 while [ "$#" -gt 0 ]
@@ -84,7 +139,6 @@ do
         ;;
     -l | -list)
         listOpt=true
-        shift
         ;;
     -m | -mode)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
@@ -98,12 +152,30 @@ do
            usage "'$1' option with invalid mode '$mode'"
            ;;
         esac
-        shift 2
+        shift
+        ;;
+    -p | -prefix)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        prefixDir="$2"
+        shift
         ;;
     -q | -quiet)
         quietOpt=true
+        ;;
+    -v | -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        version="$2"
+        # convert x.y.z -> xyz version (if installation looked like debian)
+        if [ -n "$versionNum" ]
+        then
+            versionNum=$(echo "$version" | sed -e 's@\.@@g')
+        fi
         shift
         ;;
+    --)
+        shift
+        break
+        ;;
     -*)
         usage "unknown option: '$*'"
         ;;
@@ -111,8 +183,18 @@ do
         break
         ;;
     esac
+    shift
 done
 
+
+# debugging:
+# echo "Installed locations:"
+# for i in projectDir prefixDir projectDirName version versionNum
+# do
+#     eval echo "$i=\$$i"
+# done
+
+
 # Save the essential bits of information:
 nArgs=$#
 fileName="$1"
@@ -121,21 +203,28 @@ fileName="$1"
 unset dirList
 case "$mode" in
 *u*)  # user
-    dirList="$dirList $HOME/.${WM_PROJECT:-OpenFOAM}/$WM_PROJECT_VERSION"
+    dirList="$dirList $HOME/.${WM_PROJECT:-OpenFOAM}/$version"
     dirList="$dirList $HOME/.${WM_PROJECT:-OpenFOAM}"
     ;;
 esac
 
 case "$mode" in
 *g*)  # group
-    dirList="$dirList $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION"
+    dirList="$dirList $prefixDir/site/$version"
-    dirList="$dirList $WM_PROJECT_INST_DIR/site"
+    dirList="$dirList $prefixDir/site"
     ;;
 esac
 
 case "$mode" in
-*o*)  # other
+*o*)  # other (shipped)
-    dirList="$dirList $WM_PROJECT_DIR/etc"
+    if [ -n "$versionNum" ]
+    then
+        # debian packaging
+        dirList="$dirList $prefixDir/openfoam$versionNum/etc"
+    else
+        # standard packaging
+        dirList="$dirList $prefixDir/${WM_PROJECT:-OpenFOAM}-$version/etc"
+    fi
     ;;
 esac
 set -- $dirList

bin/foamExec

@@ -35,6 +35,8 @@
 #     mpirun -np <nProcs> \
 #         foamExec -v <foamVersion> <foamCommand> ... -parallel
 #
+# SeeAlso
+#    foamEtcFile
 #------------------------------------------------------------------------------
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
@@ -43,8 +45,9 @@ usage() {
 Usage: ${0##*/} [OPTION] <application> ...
 
 options:
-  -v ver        specify OpenFOAM version
+  -version <ver>    specify an alternative OpenFOAM version
-  -help         this usage
+                    pass through to foamEtcFile
+  -help             this usage
 
 * run a particular OpenFOAM version of <application>
 
@@ -52,18 +55,14 @@ USAGE
     exit 1
 }
 
+#
+# This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+# or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
+#
+# foamEtcFile is found in the same directory
+#-------------------------------------------------------------------------------
 
-# This script should exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+unset etcOpts
-# extract the <foamInstall> and <version> elements
-# using a function preserves the command args
-getDefaults() {
-    set -- $(echo $0 | sed -e 's@/OpenFOAM-\([^/]*\)/bin/[^/]*$@ \1@')
-    foamInstall=$1
-    version=$2
-}
-
-getDefaults
-
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -71,9 +70,9 @@ do
     -h | -help)
         usage
         ;;
-    -v)
+    -v | -version)
-        shift
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        version=$1
+        etcOpts="-version $2"
         shift
         ;;
     --)
@@ -87,43 +86,22 @@ do
         break
         ;;
     esac
+    shift
 done
 
-if [ "$#" -lt 1 ]
+[ "$#" -ge 1 ] || usage "no application specified"
-then
-    usage "no application specified"
-fi
 
-unset foamDotFile
+# find OpenFOAM settings (bashrc)
-
+foamDotFile="$(${0%/*}/foamEtcFile $etcOpts bashrc)" || {
-# Check user-specific OpenFOAM bashrc file
-foamDotFile="$HOME/.OpenFOAM/$version/bashrc"
-if [ -f $foamDotFile ]
-then
-    . $foamDotFile
-    foamDotFile=okay
-else
-    # Use the FOAM_INST_DIR variable for locating the installed version
-    for FOAM_INST_DIR in $foamInstall $WM_PROJECT_INST_DIR
-    do
-        foamDotFile="$FOAM_INST_DIR/OpenFOAM-$version/etc/bashrc"
-        if [ -f $foamDotFile ]
-        then
-            . $foamDotFile
-            foamDotFile=okay
-            break
-        fi
-    done
-fi
-
-
-if [ "$foamDotFile" != okay ]
-then
     echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
     exit 1
-fi
+}
 
-# Pass on the rest of the arguments
+# preserve arguments (can otherwise get lost when sourcing the foamDotFile)
-exec $*
+args="$*"
+. $foamDotFile
+
+# execute
+exec $args
 
 #------------------------------------------------------------------------------

bin/tools/foamConfigurePaths

@@ -34,10 +34,10 @@ usage() {
     cat<<USAGE
 
 usage: ${0##*/}
-  --foamInstall dir   		specify installation directory (e.g. /opt)
+  --foamInstall dir       specify installation directory (e.g. /opt)
-  --projectName name 		specify project name (e.g. openfoam170)
+  --projectName name      specify project name (e.g. openfoam170)
-  --archOption  arch		specify architecture option (only 32 or 64 applicable)
+  --archOption  arch      specify architecture option (only 32 or 64 applicable)
-  --paraviewInstall dir 	specify ParaView_DIR (e.g. /opt/paraviewopenfoam380)
+  --paraviewInstall dir   specify ParaView_DIR (e.g. /opt/paraviewopenfoam380)
 
 * hardcode paths to installation
 
@@ -59,30 +59,30 @@ do
         ;;
     --foamInstall)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-	foamInstall="$2"
+        foamInstall="$2"
-	echo "Replacing foamInstall setting by $foamInstall"
+        echo "Replacing foamInstall setting by $foamInstall"
-	sed -i -e '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" etc/bashrc
+        sed -i -e '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" etc/bashrc
         shift 2
         ;;
    --projectName)
-       	[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-	projectName="$2"
+        projectName="$2"
-	echo "Replacing WM_PROJECT_DIR setting by $projectName"
+        echo "Replacing WM_PROJECT_DIR setting by $projectName"
-	sed -i -e '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" etc/bashrc
+        sed -i -e '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" etc/bashrc
-       	shift 2
+        shift 2
-       	;;
+        ;;
     --archOption)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-	archOption="$2"
+        archOption="$2"
-	echo "Replacing WM_ARCH_OPTION setting by $archOption"
+        echo "Replacing WM_ARCH_OPTION setting by $archOption"
-	sed -i -e '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" etc/bashrc
+        sed -i -e '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" etc/bashrc
         shift 2
         ;;
     --paraviewInstall)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-	paraviewInstall="$2"
+        paraviewInstall="$2"
-	echo "Replacing ParaView_DIR setting by $paraviewInstall"
+        echo "Replacing ParaView_DIR setting by $paraviewInstall"
-	sed -i -e '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" etc/apps/paraview3/bashrc
+        sed -i -e '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" etc/apps/paraview3/bashrc
         shift 2
         ;;
     *)
@@ -99,10 +99,9 @@ done
 # Replace the WM_MPLIB always
 echo "Replacing WM_MPLIB setting by SYSTEMOPENMPI"
 sed -i -e '/^[^#]/s@: ${WM_MPLIB:=.*}@WM_MPLIB=SYSTEMOPENMPI@' etc/bashrc
+
 # Replace the compilerInstall always
 echo "Replacing compilerInstall setting by system"
 sed -i -e '/^[^#]/s@: ${compilerInstall:=.*}@compilerInstall=system@' etc/settings.sh
 
-
-
 #------------------------------------------------------------------------------

debian/copyright

@@ -27,4 +27,4 @@ The Debian packaging is:
 
     Copyright (C) 2010 OpenCFD Ltd. <patches@opencfd.co.uk>
 
-    and is licensed under the GPL version 3 
+    and is licensed under the GPL version 3

debian/rules

@@ -96,13 +96,13 @@ binary-arch: build install
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-#	dh_perl 
+#	dh_perl
 	dh_shlibdeps -- --ignore-missing-info	#We depend on vtk libs without info
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch

etc/apps/paraview3/bashrc

@@ -51,7 +51,7 @@ done
 
 
 # set VERSION and MAJOR (version) variables if not already set
-[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.6.1
+[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.8.0
 [ -n "$ParaView_MAJOR" ]   || ParaView_MAJOR=unknown
 
 # if needed, set MAJOR version to correspond to VERSION
@@ -75,6 +75,7 @@ export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-
 if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
 then
     export PATH=$ParaView_DIR/bin:$PATH
+    export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-$ParaView_MAJOR:$LD_LIBRARY_PATH
     export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
 
     # add in python libraries if required

etc/apps/paraview3/cshrc

@@ -49,7 +49,7 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
 end
 
 # set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1
+if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.8.0
 if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
 
 # if needed, set MAJOR version to correspond to VERSION
@@ -73,6 +73,7 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-
 # set paths if binaries or source are present
 if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     setenv PATH ${ParaView_DIR}/bin:${PATH}
+    setenv LD_LIBRARY_PATH "${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}:${LD_LIBRARY_PATH}"
     setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR}
 
     # add in python libraries if required

etc/bashrc

@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=1.6
+[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=dev
 
 ################################################################################
 # USER EDITABLE PART. Note changes made here may be lost with the next upgrade
@@ -131,7 +131,7 @@ unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
 
-# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
 

etc/cshrc

@@ -31,7 +31,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION 1.6
+if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
 
 ################################################################################
 # USER EDITABLE PART. Note changes made here may be lost with the next upgrade
@@ -119,7 +119,7 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
 
-# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
 
 

etc/settings.csh

@@ -82,7 +82,7 @@ unsetenv MPFR_ARCH_PATH
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # compilerInstall = OpenFOAM | system
-if ( ! $?compilerInstall ) set compilerInstall=OpenFOAM
+if ( ! $?compilerInstall ) set compilerInstall=system
 
 switch ("$compilerInstall")
 case OpenFOAM:
@@ -209,14 +209,20 @@ case OPENMPI:
     breaksw
 
 case SYSTEMOPENMPI:
-    # use the system installed openmpi, get library directory via mpicc
+
+    # This uses the installed openmpi. It needs mpicc installed!
+
     set mpi_version=openmpi-system
-    set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+    setenv PINC "`mpicc --showme:compile`"
+    setenv PLIBS "`mpicc --showme:link`"
+    set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
     if ($?FOAM_VERBOSE && $?prompt) then
-        echo "Using system installed OpenMPI:"
+        echo "Using system installed MPI:"
-        echo "    compile flags : `mpicc --showme:compile`"
+        echo "    compile flags : $PINC"
-        echo "    link flags    : `mpicc --showme:link`"
+        echo "    link flags    : $PLIBS"
         echo "    libmpi dir    : $libDir"
     endif
 

etc/settings.sh

@@ -105,7 +105,7 @@ unset MPFR_ARCH_PATH
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # compilerInstall = OpenFOAM | system
-: ${compilerInstall:=OpenFOAM}
+: ${compilerInstall:=system}
 
 case "${compilerInstall:-OpenFOAM}" in
 OpenFOAM)
@@ -237,13 +237,17 @@ OPENMPI)
 SYSTEMOPENMPI)
     # use the system installed openmpi, get library directory via mpicc
     mpi_version=openmpi-system
-    libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+    export PINC="`mpicc --showme:compile`"
+    export PLIBS="`mpicc --showme:link`"
+    libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
     if [ "$FOAM_VERBOSE" -a "$PS1" ]
     then
-        echo "Using system installed OpenMPI:"
+        echo "Using system installed MPI:"
-        echo "    compile flags : `mpicc --showme:compile`"
+        echo "    compile flags : $PINC"
-        echo "    link flags    : `mpicc --showme:link`"
+        echo "    link flags    : $PLIBS"
         echo "    libmpi dir    : $libDir"
     fi
 

src/postProcessing/functionObjects/field/fieldMinMax/controlDict

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

src/sampling/sampledSurface/sampledPlane/sampledPlane.H

@@ -27,7 +27,8 @@ Class
 Description
     A sampledSurface defined by a cuttingPlane. Always triangulated.
 
-    Note: does not actually cut until update() called.
+Note
+    Does not actually cut until update() called.
 
 SourceFiles
     sampledPlane.C

src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C

@@ -57,7 +57,7 @@ makeBasicMixture
 (
     pureMixture,
     constTransport,
-    hConstThermo,
+    eConstThermo,
     perfectGas
 );
 
@@ -65,15 +65,16 @@ makeBasicMixture
 (
     pureMixture,
     sutherlandTransport,
-    hConstThermo,
+    eConstThermo,
     perfectGas
 );
 
+
 makeBasicMixture
 (
     pureMixture,
     constTransport,
-    eConstThermo,
+    hConstThermo,
     perfectGas
 );
 
@@ -81,7 +82,7 @@ makeBasicMixture
 (
     pureMixture,
     sutherlandTransport,
-    eConstThermo,
+    hConstThermo,
     perfectGas
 );
 

src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C

@@ -63,6 +63,7 @@ makeBasicPsiThermo
     perfectGas
 );
 
+
 makeBasicPsiThermo
 (
     ePsiThermo,

src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,6 +53,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// constTransport, hConstThermo
+
 makeCombustionThermo
 (
     hCombustionThermo,
@@ -83,6 +85,42 @@ makeCombustionThermo
     perfectGas
 );
 
+
+// sutherlandTransport, hConstThermo
+
+makeCombustionThermo
+(
+    hCombustionThermo,
+    hPsiMixtureThermo,
+    homogeneousMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeCombustionThermo
+(
+    hCombustionThermo,
+    hPsiMixtureThermo,
+    inhomogeneousMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeCombustionThermo
+(
+    hCombustionThermo,
+    hPsiMixtureThermo,
+    veryInhomogeneousMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+
+// sutherlandTransport, janafThermo
+
 makeCombustionThermo
 (
     hCombustionThermo,
@@ -113,6 +151,7 @@ makeCombustionThermo
     perfectGas
 );
 
+
 makeCombustionThermo
 (
     hCombustionThermo,

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,7 +57,7 @@ directionalSolidThermoCoeffs
     cpValues            (1700 1700);
 
     KValues             ((40 40 40) (40 40 40));
-    
+
     coordinateSystem
     {
         origin  (-0.000062 0.000019 0.000039);

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,7 +57,7 @@ directionalSolidThermoCoeffs
     cpValues            (1700 1700);
 
     KValues             ((40 40 40) (40 40 40));
-    
+
     coordinateSystem
     {
         origin  (-0.000062 0.000019 0.000039);

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,7 +57,7 @@ directionalSolidThermoCoeffs
     cpValues            (1700 1700);
 
     KValues             ((40 40 40) (40 40 40));
-    
+
     coordinateSystem
     {
         origin  (-0.000062 0.000019 0.000039);

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,7 +57,7 @@ directionalSolidThermoCoeffs
     cpValues            (1700 1700);
 
     KValues             ((40 40 40) (40 40 40));
-    
+
     coordinateSystem
     {
         origin  (-0.000062 0.000019 0.000039);

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,7 +57,7 @@ directionalSolidThermoCoeffs
     cpValues            (1700 1700);
 
     KValues             ((40 40 40) (40 40 40));
-    
+
     coordinateSystem
     {
         origin  (-0.000062 0.000019 0.000039);

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -57,7 +57,7 @@ directionalSolidThermoCoeffs
     cpValues            (1700 1700);
 
     KValues             ((40 40 40) (40 40 40));
-    
+
     coordinateSystem
     {
         origin  (-0.000062 0.000019 0.000039);

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/solidThermophysicalProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/0/U

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/0/epsilon

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/ABLConditions

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 

tutorials/incompressible/simpleFoam/windTurbineTerrain/0/include/initialConditions

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 

tutorials/incompressible/simpleFoam/windTurbineTerrain/0/k

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/polyMesh/blockMeshDict

@@ -1,11 +1,10 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
     version         2.0;

tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/polyMesh/boundary

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/sourcesProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/constant/transportProperties

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/system/controlDict

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSolution

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile

tutorials/incompressible/simpleFoam/windTurbineTerrain/system/snappyHexMeshDict

@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.7                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile