Merge branch 'master' of ssh://hunt/home/hunt2/OpenFOAM/OpenFOAM-dev

etc/settings.csh

@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 alias _foamAddPath 'set path=(\!* $path) ; if ( ! -d \!* ) mkdir -p \!*'
-alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH} ; if ( ! -d \!* ) mkdir -p \!*'
+alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH} ; set xx=`echo $LD_LIBRARY_PATH | sed -e "s/:.*//"`; if ( ! -d  $xx ) mkdir -p $xx'
 
 
 #- Add the system-specific executables path to the path
@@ -82,7 +82,6 @@ switch ("$WM_COMPILER_INST")
 case OpenFOAM:
     switch ("$WM_COMPILER")
     case Gcc:
-        #setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.3/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib

etc/settings.sh

@@ -33,22 +33,40 @@
 
 _foamAddPath()
 {
-    while [ $# -ge 1 ]
+   if [ $# -eq 1 ]
-    do
+   then
-        [ -d $1 ] || mkdir -p $1
+      oldIFS="$IFS"
-        export PATH=$1:$PATH
+      IFS=':'    # split on ':'
-        shift
+      set -- $1
-    done
+      IFS="$oldIFS"
+      unset oldIFS
+   fi
+
+   while [ $# -ge 1 ]
+   do
+      [ -d $1 ] || mkdir -p $1
+      export PATH=$1:$PATH
+      shift
+   done
 }
 
 _foamAddLib()
 {
-    while [ $# -ge 1 ]
+   if [ $# -eq 1 ]
-    do
+   then
-        [ -d $1 ] || mkdir -p $1
+      oldIFS="$IFS"
-        export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+      IFS=':'    # split on ':'
-        shift
+      set -- $1
-    done
+      IFS="$oldIFS"
+      unset oldIFS
+   fi
+
+   while [ $# -ge 1 ]
+   do
+      [ -d $1 ] || mkdir -p $1
+      export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+      shift
+   done
 }
 
 
@@ -99,7 +117,6 @@ case "$WM_COMPILER_INST" in
 OpenFOAM)
     case "$WM_COMPILER" in
     Gcc)
-        #export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.3/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
@@ -127,7 +144,7 @@ esac
 
 if [ -d "$WM_COMPILER_BIN" ]; then
     _foamAddPath $WM_COMPILER_BIN
-    _foamAddLib $WM_COMPILER_LIB
+    _foamAddLib  $WM_COMPILER_LIB
 fi
 
 unset WM_COMPILER_BIN WM_COMPILER_LIB

src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H

@@ -168,19 +168,50 @@ public:
                 List<T>&
             );
 
-            //- Distribute data using scheduling.
+            //- Distribute data using default commsType.
             template<class T>
             void distribute(List<T>& fld) const
             {
-                distribute
+                if
                 (
-                    Pstream::scheduled,
+                    Pstream::defaultCommsType == Pstream::nonBlocking
-                    schedule(),
+                 && contiguous<T>()
-                    constructSize_,
+                )
-                    subMap_,
+                {
-                    constructMap_,
+                    distribute
-                    fld
+                    (
-                );
+                        Pstream::nonBlocking,
+                        List<labelPair>(),
+                        constructSize_,
+                        subMap_,
+                        constructMap_,
+                        fld
+                    );
+                }
+                else if (Pstream::defaultCommsType == Pstream::scheduled)
+                {
+                    distribute
+                    (
+                        Pstream::scheduled,
+                        schedule(),
+                        constructSize_,
+                        subMap_,
+                        constructMap_,
+                        fld
+                    );
+                }
+                else
+                {
+                    distribute
+                    (
+                        Pstream::blocking,
+                        List<labelPair>(),
+                        constructSize_,
+                        subMap_,
+                        constructMap_,
+                        fld
+                    );
+                }
             }
 
             //- Correct for topo change.

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C

@@ -86,7 +86,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             (
                 IOobject
                 (
-                     this->name() + "rhoTrans" + name(i),
+                     this->name() + "rhoTrans" + Foam::name(i),
                      this->db().time().timeName(),
                      this->db(),
                      IOobject::NO_READ,

wmake/wmakeScheduler

@@ -57,14 +57,15 @@ lockDir=$HOME/.wmakeScheduler
 # count the total number of slots available and exit
 if [ "$1" = "-count" ]
 then
-    expr $(
+   expr $(
-        for slotGroup in $WM_HOSTS
+      for slotGroup in $WM_HOSTS
-        do
+      do
-            n=${slotGroup##*:}
+         n=${slotGroup##*:}
-            if [ "$n" = "${slotGroup%%:*}" ]; then n=1; fi # missing ':'
+         [ "$n" = "${slotGroup%%:*}" ] && n=1  # missing ':'
-            echo "+ ${n:-1}"
+         echo "+ ${n:-1}"
-        done)
+      done
-    exit 0
+   )
+   exit 0
 fi
 
 # where to source WM_PROJECT settings in a remote shell
@@ -75,25 +76,26 @@ fi
 sourceFoam=false    # fallback command
 case $SHELL in
 */csh | */tcsh )    # [t]csh vs bash|ksh|sh
-    shellRc=cshrc
+   shellRc=cshrc
-    ;;
+   ;;
 *)
-    shellRc=bashrc
+   shellRc=bashrc
-    ;;
+   ;;
 esac
 
 # check ~/.$WM_PROJECT/$WM_PROJECT_VERSION/
 # check ~/.$WM_PROJECT/
 # check <installedProject>/etc/
-if [ "$WM_PROJECT" ]; then
+if [ "$WM_PROJECT" ]
-
+then
    for i in \
       $HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
       $HOME/.$WM_PROJECT \
       $WM_PROJECT_DIR/etc \
       ;
    do
-      if [ -f "$i/$shellRc" ]; then
+      if [ -f "$i/$shellRc" ]
+      then
          sourceFoam="$i/$shellRc"
          break
       fi
@@ -105,7 +107,8 @@ fi
 # attempt to preserve the installation directory 'FOAM_INST_DIR'
 case $sourceFoam in
 */bashrc)
-   if [ "$FOAM_INST_DIR" ]; then
+   if [ "$FOAM_INST_DIR" ]
+   then
       sourceFoam='[ "$WM_PROJECT" ] || '"FOAM_INST_DIR=$FOAM_INST_DIR . $sourceFoam"
    else
       sourceFoam='[ "$WM_PROJECT" ] || '". $sourceFoam"
@@ -125,25 +128,50 @@ rcmd=$(echo $* | sed -e s/\"/\'\"\'/g)
 
 
 # Convert WM_COLOURS into an array
-declare colours
+declare colourList
 nColours=0
 for col in $WM_COLOURS
 do
-    colours[$nColours]=$col
+   colourList[$nColours]=$col
-    ((nColours = $nColours + 1))
+   ((nColours = $nColours + 1))
 done
 
-# Bashism: make pipe fail early. This make sure return value of compilation
+# Bashism: make pipe fail early.
-# is returned and not of colouring pipe.
+# This ensures the return value of the command is returned and not of the
+# colouring pipe etc.
 set -o pipefail
 
-# Define function to colour output by argument 1
+
-colourPipe(){
+#
-    if [ "$1" ]; then
+# colour output by argument 1
-        (while read line; do setterm -foreground $1; echo "$line" ; done; setterm -foreground default)
+#
-    else
+colourPipe()
-        cat
+{
-    fi
+   if [ "$1" ]
+   then
+   (
+      while read line
+      do
+         setterm -foreground $1
+         echo "$line"
+      done
+      setterm -foreground default
+   )
+   else
+      cat
+   fi
+}
+
+
+#
+# prefix message with [HOSTNAME]
+#
+prefixPipe()
+{
+   while read line
+   do
+      echo "[$@] $line"
+   done
 }
 
 
@@ -151,61 +179,60 @@ colourIndex=0
 
 while :
 do
-    for slotGroup in $WM_HOSTS
+   for slotGroup in $WM_HOSTS
-    do
+   do
-        # split 'host:N', but catch 'host:' and 'host' too
+      # split 'host:N', but catch 'host:' and 'host' too
-        host=${slotGroup%%:*}
+      host=${slotGroup%%:*}
-        n=${slotGroup##*:}
+      n=${slotGroup##*:}
-        if [ "$n" = "$host" ]; then n=1; fi # missing ':'
+      [ "$n" = "$host" ] && n=1  # missing ':'
-        : ${n:=1}
+      : ${n:=1}
 
-        i=0
+      i=0
-        while [ "$i" -lt "$n" ]
+      while [ "$i" -lt "$n" ]
-        do
+      do
-            lockFile="$lockDir/$host:$i"
+         lockFile="$lockDir/$host:$i"
-            if lockfile -r0 "$lockFile" 2>/dev/null; then
+         if lockfile -r0 "$lockFile" 2>/dev/null
-                if [ "$WM_COLOURS" ]; then
+         then
-                    # Set colour
+            if [ "$nColours" -gt 0 ]
-                    colour="${colours[$colourIndex]}"
+            then
+               # Set colour and index to next colour
+               colour="${colourList[$colourIndex]}"
+               colourIndex=$(expr $colourIndex + 1)
+               [ "$colourIndex" -lt "$nColours" ] || colourIndex=0
 
-                    if [ "$host" = "$HOST" ]; then
+               if [ "$host" = "$HOST" ]; then
-                        eval $* 2>&1 | colourPipe "$colour"
+                  eval $* 2>&1 | colourPipe "$colour"
-                    elif [ -n "$JOB_ID" ]; then
+               elif [ -n "$JOB_ID" ]; then
-                        qrsh -inherit -v PWD $host "$rcmd"
+                  qrsh -inherit -v PWD $host "$rcmd"
-                    else
+               else
-                        ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe "$colour"
+                  ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe "$colour"
-                    fi
+               fi
-                    retval=$?
+               retval=$?
-                else
+            else
-                    if [ "$host" = "$HOST" ]; then
+               if [ "$host" = "$HOST" ]; then
-                        eval $*
+                  eval $* 2>&1 | prefixPipe "$host"
-                    elif [ -n "$JOB_ID" ]; then
+               elif [ -n "$JOB_ID" ]; then
-                        qrsh -inherit -v PWD $host "$rcmd"
+                  qrsh -inherit -v PWD $host "$rcmd" | prefixPipe "$host"
-                    else
+               else
-                        ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd"
+                  ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | prefixPipe "$host"
-                    fi
+               fi
-                    retval=$?
+               retval=$?
-                fi
-
-                # Release lock
-                rm -f "$lockFile" 2>/dev/null
-                exit $retval
             fi
-            i=$(expr $i + 1)
 
-            # Cycle through colours
+            # Release lock
-            colourIndex=$(expr $colourIndex + 1)
+            rm -f "$lockFile" 2>/dev/null
-            if (( $colourIndex >= $nColours )); then
+            exit $retval
-                colourIndex=0
+         fi
-            fi
+         i=$(expr $i + 1)
-        done
+      done
-    done
+   done
-    # Did not find any free slots. Rest a bit.
+   # Did not find any free slots. Rest a bit.
-    sleep 1
+   sleep 1
 done
 
-if [ "$WM_COLOURS" ]; then
+if [ "$nColours" -gt 0 ]
-    setterm -foreground default
+then
+   setterm -foreground default
 fi
 
 #------------------------------------------------------------------------------