Merge branch 'master' into cvm

Conflicts:
	src/mesh/Allwmake

src/parallel/Allwmake

@@ -1,11 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
 decompose/Allwmake $*
 reconstruct/Allwmake $*
-wmake $makeOption distributed
+wmake $makeType distributed
 
 
 # ----------------------------------------------------------------- end-of-file

src/parallel/decompose/Allwmake

@@ -1,6 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
 settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
@@ -17,17 +17,17 @@ set -x
 
 wmakeLnInclude decompositionMethods
 
-wmake $makeOption scotchDecomp
+wmake $makeType scotchDecomp
 
 if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
 then
 (
     WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
-    wmake $makeOption ptscotchDecomp
+    wmake $makeType ptscotchDecomp
 )
 fi
 
-wmake $makeOption decompositionMethods
+wmake $makeType decompositionMethods
 
 
 # ----------------------------------------------------------------- end-of-file

src/parallel/reconstruct/Allwmake

@@ -1,8 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
+makeType=${1:-libso}
 set -x
 
-wmake $makeOption reconstruct
+wmake $makeType reconstruct
 
 # ----------------------------------------------------------------- end-of-file

src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,7 @@ License
 
 #include "reconstructLagrangian.H"
 #include "labelIOList.H"
-#include "Cloud.H"
-#include "passiveParticle.H"
+#include "passiveParticleCloud.H"
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
@@ -39,7 +38,7 @@ void Foam::reconstructLagrangianPositions
     const PtrList<labelIOList>& cellProcAddressing
 )
 {
-    Cloud<passiveParticle> lagrangianPositions
+    passiveParticleCloud lagrangianPositions
     (
         mesh,
         cloudName,
@@ -67,7 +66,7 @@ void Foam::reconstructLagrangianPositions
             (
                 new passiveParticle
                 (
-                    lagrangianPositions,
+                    mesh,
                     ppi.position(),
                     cellMap[ppi.cell()],
                     false
@@ -76,7 +75,7 @@ void Foam::reconstructLagrangianPositions
         }
     }
 
-    IOPosition<passiveParticle>(lagrangianPositions).write();
+    IOPosition<Cloud<passiveParticle> >(lagrangianPositions).write();
 }