diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H index f6681086d0..d942f2c501 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H +++ b/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) ); diff --git a/applications/solvers/multiphase/settlingFoam/pEqn.H b/applications/solvers/multiphase/settlingFoam/pEqn.H index bf632adb4d..9f27e992a8 100644 --- a/applications/solvers/multiphase/settlingFoam/pEqn.H +++ b/applications/solvers/multiphase/settlingFoam/pEqn.H @@ -8,6 +8,7 @@ surfaceScalarField phiHbyA ( + "phiHbyA", fvc::interpolate(rho) *( (fvc::interpolate(HbyA) & mesh.Sf()) diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H index 90d70cc26b..d0689b0eb1 100644 --- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H +++ b/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 +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 diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C index 41e28c3f64..be6337a428 100644 --- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C +++ b/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 +template 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 +Foam::label Foam::findLower +( + const ListType& l, + typename ListType::const_reference t, + const label start +) +{ + return findLower(l, t, start, lessOp()); +} + + template Foam::List Foam::initList(const T elems[nRows]) { diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H index edf94f3848..4ec3bd4075 100644 --- a/src/OpenFOAM/global/argList/argList.H +++ b/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 inline T optionLookupOrDefault ( diff --git a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C index 18233f1825..89497fba37 100644 --- a/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C +++ b/src/OpenFOAM/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C @@ -167,8 +167,11 @@ bool linearInterpolationWeights::integrationWeights << exit(FatalError); } - // Currently no fancy logic on cached index - label i1 = findLower(samples_, t1); + // Currently no fancy logic on cached index like in value + + //- Find lower or equal index + label i1 = findLower(samples_, t1, 0, lessEqOp()); + //- Find lower index label i2 = findLower(samples_, t2); // For now just fail if any outside table diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H index 14e6eb1fb5..bcc3aee956 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H @@ -32,12 +32,13 @@ Description csvFile; csvFileCoeffs { - hasHeaderLine true; - refColumn 0; // reference column index - componentColumns (1 2 3); // component column indices - separator ","; // optional (defaults to ",") - fileName "fileXYZ"; // name of csv data file - outOfBounds clamp; // optional out-of-bounds handling + hasHeaderLine true; + refColumn 0; // reference column index + componentColumns (1 2 3); // component column indices + separator ","; // optional (defaults to ",") + fileName "fileXYZ"; // name of csv data file + outOfBounds clamp; // optional out-of-bounds handling + interpolationScheme linear; // optional interpolation scheme } \endverbatim diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C index 667ac72be2..10d79420f7 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C @@ -73,6 +73,11 @@ void Foam::TableBase::writeEntries(Ostream& os) const os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_) << token::END_STATEMENT << nl; } + if (interpolationScheme_ != "linear") + { + os.writeKeyword("interpolationScheme") << interpolationScheme_ + << token::END_STATEMENT << nl; + } } diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H index c68face927..66d7930849 100644 --- a/src/OpenFOAM/primitives/ops/ops.H +++ b/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 diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C index 03edfc3825..2cb27c39c7 100644 --- a/src/meshTools/meshTools/meshTools.C +++ b/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, diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H index 65dff1f3b6..3db94a8e5a 100644 --- a/src/meshTools/meshTools/meshTools.H +++ b/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 ( diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh index 1e34387a33..f0770e8bd9 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/p_rgh +++ b/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; } } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh index 54e8cbeb29..d941becc55 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh +++ b/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; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh index 7a8d6054f8..420c10de47 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh +++ b/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; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh index 7dc56a6289..b2d94f6866 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0/p_rgh +++ b/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; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh index 7dc56a6289..b2d94f6866 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p_rgh +++ b/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; } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh index 0ce8d85c2b..eb39e94eab 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh +++ b/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; } diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh index c851c9391a..8602946911 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0/p_rgh +++ b/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; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh index fcf8d57e51..15979d020e 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0/p_rgh +++ b/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; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh index 94fc0bd9f3..8cb7d58cdf 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh +++ b/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 diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh index c851c9391a..8602946911 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p_rgh +++ b/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; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh index 5b0b64b976..b8deb5e595 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p_rgh +++ b/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; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh index 5b0b64b976..b8deb5e595 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p_rgh +++ b/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; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh index 61d9570ec5..99be8758e2 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/p_rgh +++ b/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; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh index 5ab863aecc..df06f47fd0 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/p_rgh +++ b/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; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh index 09857d6805..7333dfae9b 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0.org/p_rgh +++ b/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; } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh index f30165dfb7..840f0d21be 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0.org/p_rgh +++ b/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; } } diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh index 54e73a08ae..2b4915fe5c 100644 --- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/p_rgh +++ b/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; } } diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p index 8f2ec50ff3..ae2c14b746 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/0/p +++ b/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; } } diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p index 9c4de0da51..72f221208d 100644 --- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/0/p +++ b/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; } diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh index e3f442956d..5c911a0345 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.org/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh index 03c2b46b04..825a15d6dc 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh +++ b/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; } } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh index 6fd77ea86a..5c0b4be6fd 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh @@ -30,7 +30,7 @@ boundaryField } walls { - type buoyantPressure; + type fixedFluxPressure; value uniform 0; } } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh index 6fd77ea86a..5c0b4be6fd 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p_rgh @@ -30,7 +30,7 @@ boundaryField } walls { - type buoyantPressure; + type fixedFluxPressure; value uniform 0; } } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh index 1f97b19664..29202adadb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p_rgh @@ -22,7 +22,7 @@ boundaryField { walls { - type buoyantPressure; + type fixedFluxPressure; value uniform 0; } } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh index 1f97b19664..29202adadb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p_rgh @@ -22,7 +22,7 @@ boundaryField { walls { - type buoyantPressure; + type fixedFluxPressure; value uniform 0; } } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh index 1f97b19664..29202adadb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p_rgh @@ -22,7 +22,7 @@ boundaryField { walls { - type buoyantPressure; + type fixedFluxPressure; value uniform 0; } } diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh index 1f97b19664..29202adadb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh +++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/p_rgh @@ -22,7 +22,7 @@ boundaryField { walls { - type buoyantPressure; + type fixedFluxPressure; value uniform 0; } } diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh index 7ef84e282b..cfabea4db1 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh index 7ef84e282b..cfabea4db1 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh index 2b5d9fde97..c085da2cb6 100644 --- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh index 7ef84e282b..cfabea4db1 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh index f32544b279..f2ef63d0be 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh @@ -39,7 +39,7 @@ boundaryField bullet { - type buoyantPressure; + type fixedFluxPressure; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p index 6fe844d27a..278db348b8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p @@ -22,7 +22,7 @@ boundaryField { inlet { - type multiphaseFixedFluxPressure; + type fixedFluxPressure; value uniform 0; } outlet diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p index 7d12a33956..037f82d0b0 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p +++ b/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; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p index 7d12a33956..037f82d0b0 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p +++ b/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; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p index 75717ab275..32d92ebc36 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/p +++ b/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; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh index 7ef84e282b..cfabea4db1 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh index 7ef84e282b..cfabea4db1 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh b/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh index f289b34b7c..81c72d7f7a 100644 --- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh index 75d1cda22d..0e6a2c640f 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p_rgh +++ b/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; } diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh index a9156248a7..b61e0277ec 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.org/p_rgh +++ b/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 { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p index 63e3f73b31..e5e362d958 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p +++ b/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; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p index d8384de3d5..5b2c9cfa86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p +++ b/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 diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p index db1aca2e2a..5fffa73a19 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p +++ b/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; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p index 75717ab275..32d92ebc36 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/0/p +++ b/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; }