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

Conflicts:
	tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
	tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun

src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFields.C

@@ -110,7 +110,7 @@ void Foam::porousBafflePressureFvPatchField<Foam::scalar>::updateCoeffs()
             << endl;
     }
 
-    jumpCyclicFvPatchField<scalar>::updateCoeffs();
+    fixedJumpFvPatchField<scalar>::updateCoeffs();
 }
 
 

tutorials/multiphase/interFoam/ras/Allrun

@@ -23,6 +23,9 @@ setDamBreakFine ()
     mv temp.$$ $controlDict
 }
 
+# Do damBreakPorousBaffle
+(cd damBreakPorousBaffle && foamRunTutorials)
+
 # Do damBreak
 (cd damBreak && foamRunTutorials)
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun

@@ -10,6 +10,9 @@ application=`getApplication`
 runApplication blockMesh
 runApplication setFields
 
+unset FOAM_SIGFPE
+unset FOAM_SETNAN
+
 # Create faceZones for porous baffles
 runApplication topoSet
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/selectCyclics.setSet

+faceSet cyclicFaces new boxToFace (0.3015 0.0493 -1) (0.3069 0.2077 1);
+cellSet cyclicFacesSlaveCells new boxToCell  (-1 0 -1) (0.305 0.31 1)
+faceZoneSet cyclicZoneFaces new setsToFaceZone cyclicFaces cyclicFacesSlaveCells