diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/T.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/T.gas similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/T.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/T.gas index e380a4e2ba..9b3a7f1687 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/T.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/T.gas @@ -33,7 +33,7 @@ boundaryField inletValue $internalField; value $internalField; } - wall + walls { type copiedFixedValue; sourceFieldName T.liquid; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/T.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/T.liquid similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/T.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/T.liquid index c3b8b75f0d..86561ee360 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/T.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/T.liquid @@ -33,7 +33,7 @@ boundaryField inletValue $internalField; value $internalField; } - wall + walls { type zeroGradient; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/U.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/U.gas similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/U.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/U.gas index c17b1eb340..c1b465d4ef 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/U.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/U.gas @@ -25,9 +25,8 @@ boundaryField { type mapped; field U.gas; - setAverage 0; + setAverage no; average (0.916 0 0 ); - interpolationScheme cell; value $internalField; } outlet @@ -36,7 +35,7 @@ boundaryField phi phi.gas; value $internalField; } - wall + walls { type slip; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/U.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/U.liquid similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/U.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/U.liquid index 841a5c9ebd..5bd4d91626 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/U.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/U.liquid @@ -25,9 +25,8 @@ boundaryField { type mapped; field U.liquid; - setAverage 1; + setAverage yes; average (0.916 0 0 ); - interpolationScheme cell; value $internalField; } outlet @@ -36,7 +35,7 @@ boundaryField phi phi.liquid; value $internalField; } - wall + walls { type noSlip; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alpha.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alpha.gas similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alpha.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alpha.gas index d86e8aa4cf..c5050aecb4 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alpha.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alpha.gas @@ -25,9 +25,8 @@ boundaryField { type mapped; fieldName alpha.air; - setAverage 1; + setAverage yes; average 0.0567; - interpolationScheme cell; value $internalField; } outlet @@ -37,7 +36,7 @@ boundaryField inletValue uniform 0; value uniform 0; } - wall + walls { type zeroGradient; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alpha.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alpha.liquid similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alpha.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alpha.liquid index c04ba90962..1b9a0ca2ea 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alpha.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alpha.liquid @@ -25,9 +25,8 @@ boundaryField { type mapped; fieldName alpha.liquid; - setAverage 0; + setAverage no; average 0.9433; - interpolationScheme cell; value $internalField; } outlet @@ -37,7 +36,7 @@ boundaryField inletValue uniform 1; value uniform 1; } - wall + walls { type zeroGradient; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alphat.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alphat.gas similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alphat.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alphat.gas index 752dbb8ddd..26cc27199a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alphat.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alphat.gas @@ -31,7 +31,7 @@ boundaryField type calculated; value uniform 1e-8; } - wall + walls { type compressible::alphatPhaseJayatillekeWallFunction; Prt 0.85; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alphat.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alphat.liquid similarity index 93% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alphat.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alphat.liquid index b18305ec60..aa3fbf1dab 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/alphat.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/alphat.liquid @@ -23,15 +23,15 @@ boundaryField { inlet { - type fixedValue; - value uniform 0; + type calculated; + value uniform 1e-8; } outlet { type calculated; value uniform 1e-08; } - wall + walls { type compressible::alphatPhaseJayatillekeWallFunction; Prt 0.85; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/epsilon.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/epsilon.gas similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/epsilon.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/epsilon.gas index 2277619a95..d100fb015b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/epsilon.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/epsilon.gas @@ -25,9 +25,8 @@ boundaryField { type mapped; field epsilon.gas; - setAverage 0; + setAverage no; average 0; - interpolationScheme cell; value $internalField; } outlet @@ -35,8 +34,9 @@ boundaryField type inletOutlet; phi phi.gas; inletValue $internalField; + value $internalField; } - wall + walls { type epsilonWallFunction; Cmu 0.09; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/epsilon.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/epsilon.liquid similarity index 95% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/epsilon.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/epsilon.liquid index 626602a8c5..25bd99ea99 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/epsilon.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/epsilon.liquid @@ -25,9 +25,8 @@ boundaryField { type mapped; field epsilon.liquid; - setAverage 0; + setAverage no; average 0; - interpolationScheme cell; value $internalField; } outlet @@ -37,7 +36,7 @@ boundaryField inletValue $internalField; value $internalField; } - wall + walls { type epsilonWallFunction; Cmu 0.09; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/k.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/k.gas similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/k.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/k.gas index bcc7a4d2ce..14a90f5c53 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/k.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/k.gas @@ -25,9 +25,8 @@ boundaryField { type mapped; field k.gas; - setAverage 0; + setAverage no; average 0; - interpolationScheme cell; value $internalField; } outlet @@ -37,7 +36,7 @@ boundaryField inletValue $internalField; value $internalField; } - wall + walls { type kqRWallFunction; value $internalField; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/k.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/k.liquid similarity index 94% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/k.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/k.liquid index a8817173e3..94ca3df409 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/k.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/k.liquid @@ -25,9 +25,8 @@ boundaryField { type mapped; field k.liquid; - setAverage 0; + setAverage no; average 0; - interpolationScheme cell; value $internalField; } outlet @@ -37,7 +36,7 @@ boundaryField inletValue $internalField; value $internalField; } - wall + walls { type kqRWallFunction; value $internalField; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/nut.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/nut.gas similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/nut.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/nut.gas index 77d3b96406..705c0c4920 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/nut.gas +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/nut.gas @@ -31,7 +31,7 @@ boundaryField type calculated; value $internalField; } - wall + walls { type nutkWallFunction; Cmu 0.09; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/nut.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/nut.liquid similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/nut.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/nut.liquid index 35eb84f923..e1ff55ce2f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/nut.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/nut.liquid @@ -31,7 +31,7 @@ boundaryField type calculated; value $internalField; } - wall + walls { type nutkWallFunction; Cmu 0.09; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/omega.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/omega.liquid similarity index 95% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/omega.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/omega.liquid index 8b277c3ced..a36f4fdea0 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/omega.liquid +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/omega.liquid @@ -25,9 +25,8 @@ boundaryField { type mapped; field omega.liquid; - setAverage 0; + setAverage no; average 0; - interpolationScheme cell; value $internalField; } outlet @@ -37,7 +36,7 @@ boundaryField inletValue $internalField; value $internalField; } - wall + walls { type omegaWallFunction; Cmu 0.09; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/p b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/p similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/p rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/p index 8424bd9ab4..fbaaffc57b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/p +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/p @@ -31,7 +31,7 @@ boundaryField type calculated; value $internalField; } - wall + walls { type calculated; value $internalField; diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/p_rgh similarity index 99% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/p_rgh rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/p_rgh index 7c59d09d55..c55433993c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/p_rgh +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/0/p_rgh @@ -31,7 +31,7 @@ boundaryField p $internalField; value $internalField; } - wall + walls { type fixedFluxPressure; } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/Allclean b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/Allclean similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/Allclean rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/Allclean diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/Allrun b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/Allrun similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/Allrun rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/Allrun diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/g b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/g similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/g rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/g diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/momentumTransport.gas diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/thermophysicalProperties.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/thermophysicalProperties.gas similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/thermophysicalProperties.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/thermophysicalProperties.gas diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/thermophysicalProperties.liquid b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/thermophysicalProperties.liquid similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/thermophysicalProperties.liquid rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/thermophysicalProperties.liquid diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/blockMeshDict similarity index 93% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/blockMeshDict index 3a7872dfca..a6f589e80a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/blockMeshDict @@ -55,10 +55,10 @@ boundary inlet { type mappedPatch; - sampleMode nearestCell; + sampleMode nearestPatchFace; sampleRegion region0; - samplePatch none; - offset (0.05 0 0); + samplePatch outlet; + offset ($!backgroundMesh/length 0 0); faces ( (0 4 6 2) @@ -80,7 +80,6 @@ boundary (4 5 7 6) ); } - back { type symmetry; @@ -89,8 +88,7 @@ boundary (0 1 3 2) ); } - - wall + walls { type wall; faces diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/controlDict similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/controlDict diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/extrudeMeshDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/extrudeMeshDict similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/extrudeMeshDict rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/extrudeMeshDict diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSchemes rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSchemes diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSolution similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/fvSolution rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/fvSolution diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/singleGraph similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/singleGraph rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/singleGraph diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/createGraphs similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/createGraphs diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/exptData/alpha.gas b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/exptData/alpha.gas similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/exptData/alpha.gas rename to tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/exptData/alpha.gas