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

applications/utilities/parallelProcessing/redistributeMeshPar/Make/files

@@ -1,3 +0,0 @@
-redistributeMeshPar.C
-
-EXE = $(FOAM_APPBIN)/redistributeMeshPar

applications/utilities/parallelProcessing/redistributePar/Make/files

@@ -0,0 +1,3 @@
+redistributePar.C
+
+EXE = $(FOAM_APPBIN)/redistributePar

applications/utilities/parallelProcessing/redistributePar/redistributePar.C

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    redistributeMeshPar
+    redistributePar
 
 Description
     Redistributes existing decomposed mesh and fields according to the current
@@ -42,7 +42,7 @@ Description
         cp -r constant processor0
 
         # Distribute
-        mpirun -np ddd redistributeMeshPar -parallel
+        mpirun -np ddd redistributePar -parallel
     \endverbatim
 \*---------------------------------------------------------------------------*/
 

src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C

@@ -235,7 +235,11 @@ tmp<Field<Type> > volPointInterpolation::flatBoundaryField
     {
         label bFaceI = bm[patchI].patch().start() - mesh.nInternalFaces();
 
-        if (!isA<emptyFvPatch>(bm[patchI]) && !bm[patchI].coupled())
+        if
+        (
+           !isA<emptyFvPatch>(bm[patchI])
+        && !vf.boundaryField()[patchI].coupled()
+        )
         {
             SubList<Type>
             (

src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C

@@ -31,6 +31,8 @@ License
 #include "coupledPointPatchFields.H"
 #include "pointConstraint.H"
 
+#include "surfaceFields.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -75,11 +77,19 @@ void volPointInterpolation::calcBoundaryAddressing()
 
     const polyBoundaryMesh& pbm = mesh().boundaryMesh();
 
+    // Get precalculated volField only so we can use coupled() tests for
+    // cyclicAMI
+    const surfaceScalarField& magSf = mesh().magSf();
+
     forAll(pbm, patchI)
     {
         const polyPatch& pp = pbm[patchI];
 
-        if (!isA<emptyPolyPatch>(pp) && !pp.coupled())
+        if
+        (
+            !isA<emptyPolyPatch>(pp)
+         && !magSf.boundaryField()[patchI].coupled()
+        )
         {
             label bFaceI = pp.start()-mesh().nInternalFaces();
 

tutorials/incompressible/simpleFoam/turbineSiting/Allrun

@@ -25,7 +25,7 @@ cp system/decomposeParDict-4proc system/decomposeParDict
 # Unset floating point trapping since creating processor directories
 unset FOAM_SIGFPE
 unset FOAM_SETNAN
-runParallel redistributeMeshPar 4 -overwrite
+runParallel redistributePar 4 -overwrite
 runParallel renumberMesh 4 -overwrite
 
 # Add wildcard entries for meshes patches since not preserved