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

Conflicts:
	tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/polyMesh/boundary

applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H

@@ -7,6 +7,7 @@
 
     surfaceScalarField phiHbyA
     (
+        "phiHbyA",
         (fvc::interpolate(HbyA) & mesh.Sf())
       + fvc::ddtPhiCorr(rAU, rho, U, phiAbs)
     );

applications/solvers/multiphase/settlingFoam/pEqn.H

@@ -8,6 +8,7 @@
 
     surfaceScalarField phiHbyA
     (
+        "phiHbyA",
         fvc::interpolate(rho)
        *(
            (fvc::interpolate(HbyA) & mesh.Sf())

src/OpenFOAM/containers/Lists/ListOps/ListOps.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,7 @@ SourceFiles
 #define ListOps_H
 
 #include "labelList.H"
+#include "ops.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -209,6 +210,18 @@ label findSortedIndex
 );
 
 
+//- Find last element < given value in sorted list and return index,
+//  return -1 if not found. Binary search.
+template<class ListType, class BinaryOp>
+label findLower
+(
+    const ListType&,
+    typename ListType::const_reference,
+    const label stary,
+    const BinaryOp& bop
+);
+
+
 //- Find last element < given value in sorted list and return index,
 //  return -1 if not found. Binary search.
 template<class ListType>

src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -592,12 +592,13 @@ Foam::label Foam::findSortedIndex
 }
 
 
-template<class ListType>
+template<class ListType, class BinaryOp>
 Foam::label Foam::findLower
 (
     const ListType& l,
     typename ListType::const_reference t,
-    const label start
+    const label start,
+    const BinaryOp& bop
 )
 {
     if (start >= l.size())
@@ -612,7 +613,7 @@ Foam::label Foam::findLower
     {
         label mid = (low + high)/2;
 
-        if (l[mid] < t)
+        if (bop(l[mid], t))
         {
             low = mid;
         }
@@ -622,13 +623,13 @@ Foam::label Foam::findLower
         }
     }
 
-    if (l[high] < t)
+    if (bop(l[high], t))
     {
         return high;
     }
     else
     {
-        if (l[low] < t)
+        if (bop(l[low], t))
         {
             return low;
         }
@@ -640,6 +641,18 @@ Foam::label Foam::findLower
 }
 
 
+template<class ListType>
+Foam::label Foam::findLower
+(
+    const ListType& l,
+    typename ListType::const_reference t,
+    const label start
+)
+{
+    return findLower(l, t, start, lessOp<typename ListType::value_type>());
+}
+
+
 template<class Container, class T, int nRows>
 Foam::List<Container> Foam::initList(const T elems[nRows])
 {

src/OpenFOAM/global/argList/argList.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -270,7 +270,7 @@ public:
             ) const;
 
             //- Read a value from the named option if present.
-            //  Return true if the named option was found.
+            //  Return supplied default otherwise.
             template<class T>
             inline T optionLookupOrDefault
             (

src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C

@@ -167,8 +167,11 @@ bool linearInterpolationWeights::integrationWeights
             << exit(FatalError);
     }
 
-    // Currently no fancy logic on cached index
+    // Currently no fancy logic on cached index like in value
-    label i1 = findLower(samples_, t1);
+
+    //- Find lower or equal index
+    label i1 = findLower(samples_, t1, 0, lessEqOp<scalar>());
+    //- Find lower index
     label i2 = findLower(samples_, t2);
 
     // For now just fail if any outside table

src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H

@@ -38,6 +38,7 @@ Description
             separator           ",";        // optional (defaults to ",")
             fileName            "fileXYZ";  // name of csv data file
             outOfBounds         clamp;      // optional out-of-bounds handling
+            interpolationScheme linear;     // optional interpolation scheme
         }
     \endverbatim
 

src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C

@@ -73,6 +73,11 @@ void Foam::TableBase<Type>::writeEntries(Ostream& os) const
         os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
             << token::END_STATEMENT << nl;
     }
+    if (interpolationScheme_ != "linear")
+    {
+        os.writeKeyword("interpolationScheme") << interpolationScheme_
+            << token::END_STATEMENT << nl;
+    }
 }
 
 

src/OpenFOAM/primitives/ops/ops.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,6 +142,10 @@ Op(minMod, minMod(x, y))
 Op(and, x && y)
 Op(or, x || y)
 Op(eqEq, x == y)
+Op(less, x < y)
+Op(lessEq, x <= y)
+Op(greater, x > y)
+Op(greaterEq, x >= y)
 
 #undef Op
 

src/meshTools/meshTools/meshTools.C

@@ -215,6 +215,39 @@ void Foam::meshTools::writeOBJ
 }
 
 
+void Foam::meshTools::writeOBJ
+(
+    Ostream& os,
+    const point& p1,
+    const point& p2,
+    label& count
+)
+{
+    os << "v" << ' ' << p1.x() << ' ' << p1.y() << ' ' << p1.z() << endl;
+    os << "v" << ' ' << p2.x() << ' ' << p2.y() << ' ' << p2.z() << endl;
+
+    os << "l" << " " << (count + 1) << " " << (count + 2) << endl;
+
+    count += 2;
+}
+
+
+void Foam::meshTools::writeOBJ
+(
+    Ostream& os,
+    const point& p1,
+    const point& p2
+)
+{
+    os << "v" << ' ' << p1.x() << ' ' << p1.y() << ' ' << p1.z() << endl;
+
+    os << "vn"
+        << ' ' << p2.x() - p1.x()
+        << ' ' << p2.y() - p1.y()
+        << ' ' << p2.z() - p1.z() << endl;
+}
+
+
 void Foam::meshTools::writeOBJ
 (
     Ostream& os,

src/meshTools/meshTools/meshTools.H

@@ -107,6 +107,24 @@ namespace meshTools
             const point& pt
         );
 
+        //- Write obj representation of a line connecting two points
+        //  Need to keep track of points that have been added. count starts at 0
+        void writeOBJ
+        (
+            Ostream& os,
+            const point& p1,
+            const point& p2,
+            label& count
+        );
+
+        //- Write obj representation of a point p1 with a vector from p1 to p2
+        void writeOBJ
+        (
+            Ostream& os,
+            const point& p1,
+            const point& p2
+        );
+
         //- Write obj representation of faces subset
         void writeOBJ
         (

tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh

@@ -23,7 +23,7 @@ boundaryField
 {
     ground
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -35,7 +35,7 @@ boundaryField
 
     burner
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -53,7 +53,7 @@ boundaryField
 
     "(region0_to.*)"
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 }

tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh

@@ -23,7 +23,7 @@ boundaryField
 {
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
@@ -41,13 +41,13 @@ boundaryField
 
     base
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 

tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh

@@ -23,7 +23,7 @@ boundaryField
 {
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     sides
@@ -39,12 +39,12 @@ boundaryField
     }
     base
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 }

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh

@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh

@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh

@@ -22,28 +22,28 @@ boundaryField
 {
     ground
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     igloo_region0
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_seal_0
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_herring_1
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         rho             rhok;
         value           uniform 0;
     }

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh

@@ -23,25 +23,25 @@ boundaryField
 {
     frontAndBack
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     topAndBottom
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     hot
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     cold
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh

@@ -23,22 +23,22 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
     fixedWalls

tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 1e5;
     }
 }

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh

@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }

tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh

@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh

@@ -23,11 +23,11 @@ boundaryField
 {
     "(sides|frontAndBack)"
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh

@@ -23,12 +23,12 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
     wallFilm
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 100000;
     }
 }

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh

@@ -23,19 +23,19 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     outlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     sides
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh

@@ -23,11 +23,11 @@ boundaryField
 {
     sides
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     region0_to_wallFilmRegion_wallFilmFaces
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 

tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -50,7 +50,7 @@ boundaryField
 
     hull_wall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p

@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     outlet
@@ -32,7 +32,7 @@ boundaryField
     }
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 }

tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p

@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh

@@ -22,13 +22,13 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     obstacle
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     stationaryWalls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
     atmosphere
@@ -38,7 +38,7 @@ boundaryField
     }
     floatingObject
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh

@@ -30,7 +30,7 @@ boundaryField
     }
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh

@@ -30,7 +30,7 @@ boundaryField
     }
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 }

tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh

@@ -23,19 +23,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         gradient        uniform 0;
         value           uniform 0;
     }

tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh

@@ -39,7 +39,7 @@ boundaryField
 
     bullet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
 }
 

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p

@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
     outlet

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p

@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh

@@ -22,19 +22,19 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh

@@ -22,7 +22,7 @@ boundaryField
 {
     inlet
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -34,19 +34,19 @@ boundaryField
 
     bottomWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     endWall
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     top
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh

@@ -22,115 +22,115 @@ boundaryField
 {
     SYMP3
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     INLE1
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL9
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL10
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL11
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     OUTL12
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL6
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL8
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL61
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL62
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL63
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL64
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL65
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL66
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL67
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL68
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL69
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL7
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
     WALL70
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh

@@ -23,19 +23,19 @@ boundaryField
 {
     left
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     right
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     bottom
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     top
     {
-        type            buoyantPressure;
+        type            fixedFluxPressure;
     }
     frontBack
     {

tutorials/multiphase/twoPhaseEulerFoam/bed/0/p

@@ -22,7 +22,7 @@ boundaryField
 {
     bottom
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 
@@ -34,7 +34,7 @@ boundaryField
 
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
 

tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p

@@ -22,7 +22,7 @@ boundaryField
 {
     walls
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     outlet
@@ -32,7 +32,7 @@ boundaryField
     }
     inlet
     {
-        type               multiphaseFixedFluxPressure;
+        type               fixedFluxPressure;
         value              $internalField;
     }
     frontAndBackPlanes

tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p

@@ -1901,7 +1901,7 @@ boundaryField
 {
     inlet
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 
@@ -1913,7 +1913,7 @@ boundaryField
 
     walls
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           uniform 0;
     }
 

tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p

@@ -22,13 +22,13 @@ boundaryField
 {
     rotor
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }
 
     stator
     {
-        type            multiphaseFixedFluxPressure;
+        type            fixedFluxPressure;
         value           $internalField;
     }