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

2025-11-28 03:28:01 +00:00 · 2012-04-19 16:17:17 +01:00
parent ccf1499eef dfac320401
commit 7dc2f6980d
94 changed files with 912 additions and 148 deletions
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@ -37,7 +37,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(nu,U) Gauss linear corrected;
-    laplacian((1|A(U)),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }

 interpolationSchemes
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@ -33,6 +33,7 @@ mixture
    {
        As              1.458e-06;
        Ts              110.4;
+        Pr              1;
    }
 }

--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-Pr              0.72;
-
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;

 mixture
@ -38,6 +36,7 @@ mixture
    {
        As              1.458e-06;
        Ts              110;
+        Pr              0.72;
    }
 }

--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(nuEff,U) Gauss linear uncorrected;
-    laplacian((1|A(U)),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(kappaEff,T) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes
@ -39,7 +39,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(nuEff,U) Gauss linear corrected;
-    laplacian((1|A(U)),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
    laplacian(kappaEff,T) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(nuEff,U) Gauss linear limited 0.333;
-    laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(kappaEff,T) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@ -42,7 +42,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
    laplacian(alphaEff,h) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes
@ -40,7 +40,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear orthogonal;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear orthogonal;
+    laplacian(Dp,p_rgh) Gauss linear orthogonal;
    laplacian(alphaEff,h) Gauss linear orthogonal;
    laplacian(DkEff,k) Gauss linear orthogonal;
    laplacian(DepsilonEff,epsilon) Gauss linear orthogonal;
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes
@ -40,7 +40,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(alphaEff,h) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
@ -42,7 +42,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(alphaEff,h) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
@ -42,7 +42,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
    laplacian(alphaEff,h) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes
@ -43,7 +43,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected;
+    laplacian(Dp,p_rgh) Gauss linear corrected;
    laplacian(alphaEff,h) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(alphaEff,h) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(alphaEff,h) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(alphaEff,h) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(alphaEff,h) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(alphaEff,h) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@ -41,7 +41,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear limited 0.333;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear limited 0.333;
+    laplacian(Dp,p_rgh) Gauss linear limited 0.333;
    laplacian(alphaEff,h) Gauss linear limited 0.333;
    laplacian(DkEff,k) Gauss linear limited 0.333;
    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSchemes
@ -42,7 +42,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(alphaEff,h) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
@ -42,7 +42,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(alphaEff,h) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
@ -43,7 +43,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(alphaEff,h) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
@ -43,7 +43,7 @@ laplacianSchemes
 {
    default         none;
    laplacian(muEff,U) Gauss linear uncorrected;
-    laplacian((rho*(1|A(U))),p_rgh) Gauss linear uncorrected;
+    laplacian(Dp,p_rgh) Gauss linear uncorrected;
    laplacian(alphaEff,h) Gauss linear uncorrected;
    laplacian(DkEff,k) Gauss linear uncorrected;
    laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre
@ -12,21 +12,7 @@ cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/

 runApplication blockMesh

-surfaces="
-    innerCylinder
-    innerCylinderSmall
-    outerCylinder
-    propellerTip
-    propellerStem1
-    propellerStem2
-    propellerStem3
-"
-
-for s in $surfaces; do
-    runApplication surfaceFeatureExtract -includedAngle 150 -minElem 10        \
-        constant/triSurface/$s.obj $s
-    mv log.surfaceFeatureExtract log.surfaceFeatureExtract.$s
-done
+runApplication surfaceFeatureExtract

 runApplication snappyHexMesh -overwrite
 # force removal of fields generated by snappy
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDict
@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+innerCylinder.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+innerCylinderSmall.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+outerCylinder.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem1.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem2.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerStem3.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+propellerTip.obj
+{
+    #include "surfaceFeatureExtractDictDefaults"
+}
+
+
+// ************************************************************************* //
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@ -0,0 +1,17 @@
+// How to obtain raw features (extractFromFile || extractFromSurface)
+extractionMethod    extractFromSurface;
+
+extractFromSurfaceCoeffs
+{
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle   150;
+}
+
+trimFeatures
+{
+    // Remove features with fewer than the specified number of edges
+    minElem         10;
+}
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
@ -27,19 +27,19 @@ boundaryField
        mixingLength    0.01;
        phi             phi;
        k               k;
-        value           $internalField;
+        value           uniform 200;
    }
    outlet1
    {
        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 200;
+        value           uniform 200;
    }
    outlet2
    {
        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 200;
+        value           uniform 200;
    }
    baffles
    {
@ -47,7 +47,7 @@ boundaryField
        Cmu             0.09;
        kappa           0.41;
        E               9.8;
-        value           $internalField;
+        value           uniform 0;
    }
    fan_half0
    {
@ -63,7 +63,7 @@ boundaryField
        Cmu             0.09;
        kappa           0.41;
        E               9.8;
-        value           $internalField;
+        value           uniform 200;
    }
 }

--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
@ -27,24 +27,24 @@ boundaryField
        intensity       0.05;
        U               U;
        phi             phi;
-        value           $internalField;
+        value           uniform 0.375;
    }
    outlet1
    {
        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
    }
    outlet2
    {
        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
    }
    baffles
    {
        type            kqRWallFunction;
-        value           $internalField;
+        value           uniform 0;
    }
    fan_half0
    {
@ -57,7 +57,7 @@ boundaryField
    defaultFaces
    {
        type            kqRWallFunction;
-        value           $internalField;
+        value           uniform 0.375;
    }
 }

--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
@ -29,10 +29,13 @@ boundaryField
        gamma           1;
        p0              40;
        pressure        table
-        (
-            (0 10)
-            (1 40)
-        );
+
+2
+(
+(0 10)
+(1 40)
+)
+;
        value           uniform 40;
    }
    outlet1
@ -54,7 +57,14 @@ boundaryField
        type            fan;
        patchType       cyclic;
        jump            uniform 0;
-        f               2(100 -0.1);
+        jumpTable       polynomial
+
+2
+(
+(100 0)
+(-0.1 1)
+)
+;
        value           uniform 0;
    }
    fan_half1
@ -62,7 +72,6 @@ boundaryField
        type            fan;
        patchType       cyclic;
        jump            uniform 0;
-        f               2(100 -0.1);
        value           uniform 0;
    }
    defaultFaces
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary
@ -15,31 +15,37 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-4
+5
 (
+    left
+    {
+        type            symmetryPlane;
+        nFaces          320;
+        startFace       99210;
+    }
    outlet
    {
        type            patch;
        nFaces          320;
-        startFace       99370;
+        startFace       99530;
    }
    up
    {
        type            symmetryPlane;
        nFaces          380;
-        startFace       99690;
+        startFace       99850;
    }
    hole
    {
        type            wall;
        nFaces          560;
-        startFace       100070;
+        startFace       100230;
    }
    frontAndBack
    {
        type            empty;
        nFaces          100000;
-        startFace       100630;
+        startFace       100790;
    }
 )

--- a/tutorials/mesh/cvMesh/flange/Allrun
+++ b/tutorials/mesh/cvMesh/flange/Allrun
@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 nProc=`grep numberOfSubdomains system/decomposeParDict \
     | sed s/"numberOfSubdomains *\(.*\);"/"\1"/`

-runApplication surfaceFeatureExtract constant/triSurface/flange.obj flange -includedAngle 155
+runApplication surfaceFeatureExtract

 # Create tight-fitting background mesh
 runApplication blockMesh
--- a/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/cvMesh/flange/system/surfaceFeatureExtractDict
@ -30,9 +30,6 @@ flange.obj

    // Write options

-        // Write .eMesh file (for snappyHexMesh)
-        writeFeatureEdgeMesh    no;
-
        // Write features to obj format for postprocessing
        writeObj                yes;
 }
--- a/tutorials/mesh/cvMesh/simpleShapes/Allrun
+++ b/tutorials/mesh/cvMesh/simpleShapes/Allrun
@ -30,15 +30,11 @@ surfaceOrient \
    constant/triSurface/domain_clean_orient.stl
    > log.surfaceOrient.domain 2>&1

-runApplication surfaceFeatureExtract \
-    constant/triSurface/coneAndSphere_clean_orient.obj \
-    coneAndSphere -includedAngle 125
+runApplication surfaceFeatureExtract
 mv log.surfaceFeatureExtract log.surfaceFeatureExtract.coneAndSphere_clean

 unset FOAM_SIGFPE
-runApplication surfaceFeatureExtract \
-    constant/triSurface/domain_clean_orient.stl \
-    domain -includedAngle 125
+runApplication surfaceFeatureExtract
 mv log.surfaceFeatureExtract log.surfaceFeatureExtract.domain

 # Generate aligned points (in constant/internalDelaunayVertices) and a
--- a/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/cvMesh/simpleShapes/system/surfaceFeatureExtractDict
@ -0,0 +1,57 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+coneAndSphere_clean_orient.obj
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   125;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                no;
+}
+
+
+domain_clean_orient.stl
+{
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   125;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                no;
+}
+
+
+// ************************************************************************* //
--- a/tutorials/mesh/snappyHexMesh/flange/Allrun
+++ b/tutorials/mesh/snappyHexMesh/flange/Allrun
@ -6,5 +6,5 @@
 cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/

 runApplication blockMesh
-runApplication surfaceFeatureExtract -includedAngle 150 -writeObj constant/triSurface/flange.stl flange
+runApplication surfaceFeatureExtract
 runApplication snappyHexMesh -overwrite
--- a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flange.stl
+{
+    // How to obtain raw features (extractFromFile || extractFromSurface)
+    extractionMethod    extractFromSurface;
+
+    extractFromSurfaceCoeffs
+    {
+        // Mark edges whose adjacent surface normals are at an angle less
+        // than includedAngle as features
+        // - 0  : selects no edges
+        // - 180: selects all edges
+        includedAngle   150;
+    }
+
+    // Write options
+
+        // Write features to obj format for postprocessing
+        writeObj                yes;
+}
+
+
+// ************************************************************************* //
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
@ -22,7 +22,8 @@ boundaryField
 {
    inlet
    {
-        type            zeroGradient;
+        type            fixedFluxPressure;
+        value           uniform 0;
    }

    outlet
@ -33,7 +34,7 @@ boundaryField

    walls
    {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
        value           uniform 0;
    }

--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
@ -1901,7 +1901,8 @@ boundaryField
 {
    inlet
    {
-        type            zeroGradient;
+        type            fixedFluxPressure;
+        value           uniform 0;
    }

    outlet
@ -1912,7 +1913,7 @@ boundaryField

    walls
    {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
        value           uniform 0;
    }

--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
@ -42,7 +42,7 @@ laplacianSchemes
    default         none;
    laplacian(nuEff1,U1) Gauss linear corrected;
    laplacian(nuEff2,U2) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
 }

 interpolationSchemes
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@ -43,7 +43,7 @@ laplacianSchemes
    default         none;
    laplacian(nuf,rhoU) Gauss linear corrected;
    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(1,p)  Gauss linear corrected;
 }
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@ -43,7 +43,7 @@ laplacianSchemes
    default         none;
    laplacian(nuf,rhoU) Gauss linear corrected;
    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(1,p)  Gauss linear corrected;
 }
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@ -44,7 +44,7 @@ laplacianSchemes
    default         none;
    laplacian(nuf,rhoU) Gauss linear corrected;
    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(rAUf,p) Gauss linear corrected;
+    laplacian(Dp,p) Gauss linear corrected;
    laplacian(DomegaEff,omega) Gauss linear corrected;
    laplacian(DkEff,k) Gauss linear corrected;
    laplacian(1,p)  Gauss linear corrected;