diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties index f977303287..26d1884bf8 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties @@ -41,8 +41,8 @@ blending { default { - type none; - continuousPhase gas; + type continuous; + phase gas; } } diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties index 2e62251dd7..e15ec97058 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties @@ -40,8 +40,8 @@ blending { default { - type none; - continuousPhase gas; + type continuous; + phase gas; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties index a89c7aa268..99dc53c9bc 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties @@ -143,8 +143,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties index ed72538cc5..2f4d5f644c 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties @@ -144,8 +144,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties index a846c5b343..74deeb49c5 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties @@ -186,8 +186,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties index 26cd260389..f477407296 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties @@ -109,8 +109,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties index 3f65ce7d20..44b786e53f 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties @@ -128,8 +128,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties index e957624a24..3f1a0ca401 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties @@ -109,8 +109,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties index a99311c008..30f3625886 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties @@ -149,8 +149,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties index 4502b803e3..035fb45b1f 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties @@ -40,8 +40,8 @@ blending { default { - type none; - continuousPhase steam; + type continuous; + phase steam; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties index cb19d2b5f1..1fe110a0dc 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties @@ -115,8 +115,8 @@ blending { default { - type none; - continuousPhase liquid; + type continuous; + phase liquid; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties index ca770495a8..992534d148 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties @@ -45,8 +45,8 @@ blending { default { - type none; - continuousPhase gas; + type continuous; + phase gas; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties index 1e86c99b28..b9bbdcb296 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties @@ -113,8 +113,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index c3f53b9bad..defc671d89 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -47,8 +47,8 @@ blending { default { - type none; - continuousPhase air; + type continuous; + phase air; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties index 4e1a414fde..d6c425e453 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties @@ -121,8 +121,8 @@ blending { default { - type none; - continuousPhase liquid; + type continuous; + phase liquid; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties index 030e45ef4e..00c2373502 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties @@ -161,8 +161,8 @@ blending { default { - type none; - continuousPhase liquid; + type continuous; + phase liquid; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties index 7a5b776811..26a0bcc4e4 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties @@ -204,8 +204,8 @@ blending { default { - type none; - continuousPhase liquid; + type continuous; + phase liquid; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties index 3c71ddc3a8..67628ac2f1 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties @@ -291,8 +291,8 @@ blending { default { - type none; - continuousPhase liquid; + type continuous; + phase liquid; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels index 57a728509c..52fe2d4040 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels @@ -21,7 +21,14 @@ massSource selectionMode points; points ((0.075 0.925 0.05)); - massFlowRate 1; + massFlowRate + { + type square; + amplitude 0.5; + frequency 0.5; + level 0.5; + markSpace 0.3333; + } phase water; rho thermo:rho.water; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties index 56ca7845e1..7d54311587 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties @@ -49,7 +49,7 @@ solid diameterModel constant; constantCoeffs { - d 1e-3; + d 1e-2; } residualAlpha 1e-6; @@ -57,15 +57,26 @@ solid blending { + drag + { + type linear; + minFullyContinuousAlpha.air 0.8; + minPartlyContinuousAlpha.air 0.5; + minFullyContinuousAlpha.water 0.8; + minPartlyContinuousAlpha.water 0.5; + minFullyContinuousAlpha.solid none; + minPartlyContinuousAlpha.solid none; + } + default { type linear; - minFullyContinuousAlpha.air 0.7; - minPartlyContinuousAlpha.air 0.3; - minFullyContinuousAlpha.water 0.7; - minPartlyContinuousAlpha.water 0.3; - minFullyContinuousAlpha.solid 0; - minPartlyContinuousAlpha.solid 0; + minFullyContinuousAlpha.air 0.8; + minPartlyContinuousAlpha.air 0.2; + minFullyContinuousAlpha.water 0.8; + minPartlyContinuousAlpha.water 0.2; + minFullyContinuousAlpha.solid none; + minPartlyContinuousAlpha.solid none; } } @@ -86,22 +97,37 @@ drag residualRe 1e-3; } + air_segregatedWith_water + { + type segregated; + m 0.5; + n 8; + } + water_dispersedIn_air { type SchillerNaumann; residualRe 1e-3; } + air_water_displacedBy_solid + { + type AttouFerschneider; + gas air; + liquid water; + solid solid; + E1 280; + E2 4.8; + } + solid_dispersedIn_air { - type Ergun; - residualRe 1e-3; + $air_water_displacedBy_solid; } solid_dispersedIn_water { - type Ergun; - residualRe 1e-3; + $air_water_displacedBy_solid; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/controlDict index 3058340547..ef96eecdf4 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/system/controlDict @@ -22,7 +22,7 @@ startTime 0; stopAt endTime; -endTime 10; +endTime 20; deltaT 0.002; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties index 226f8e2d45..c1a8c978eb 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties @@ -54,8 +54,7 @@ blending { default { - type none; - continuousPhase none; + type segregated; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index 4dab13ae73..9fc015f873 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -43,8 +43,8 @@ blending { default { - type none; - continuousPhase air; + type continuous; + phase air; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties index eec2d9dbf2..9ca09d0cda 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties @@ -45,8 +45,8 @@ blending { default { - type none; - continuousPhase water; + type continuous; + phase water; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties index 65181b6850..41b5afa059 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties @@ -132,8 +132,8 @@ blending { default { - type none; - continuousPhase vapor; + type continuous; + phase vapor; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties index 3423c49f38..1c9ddbc2f9 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties @@ -144,8 +144,8 @@ blending { default { - type none; - continuousPhase vapor; + type continuous; + phase vapor; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.air b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.air deleted file mode 100644 index 2824fbe4ae..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.air +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - "(bottom|top|walls)" - { - type zeroGradient; - } -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.solid b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.solid deleted file mode 100644 index e777081ae0..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.solid +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - "(bottom|top|walls)" - { - type zeroGradient; - } -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.water b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.water deleted file mode 100644 index eb0f511087..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/T.water +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - "(bottom|top|walls)" - { - type zeroGradient; - } -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/U.air b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/U.air deleted file mode 100644 index 5878dacd27..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/U.air +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - "(bottom|top|walls)" - { - type noSlip; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/U.water b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/U.water deleted file mode 100644 index 903ae27c2c..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/U.water +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - "(bottom|top|walls)" - { - type noSlip; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig deleted file mode 100644 index 1d7ae3ca40..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - "(bottom|top|walls)" - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.solid.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.solid.orig deleted file mode 100644 index 75fc1fe86c..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.solid.orig +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.solid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.5; - -boundaryField -{ - "(bottom|top|walls)" - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig deleted file mode 100644 index b044f845c7..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - "(bottom|top|walls)" - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/p b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/p deleted file mode 100644 index 9ff5e38ffc..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/p +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1e5; - -boundaryField -{ - "(bottom|top|walls)" - { - type calculated; - value $internalField; - } -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/p_rgh deleted file mode 100644 index 053d0b6674..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/0/p_rgh +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1e5; - -boundaryField -{ - "(bottom|top|walls)" - { - type fixedFluxPressure; - value $internalField; - } -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/Allrun b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/Allrun deleted file mode 100755 index ed61ac5435..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/Allrun +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -runApplication blockMesh -runApplication setFields -runApplication $(getApplication) - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/g b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/g deleted file mode 100644 index 770a56192e..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/g +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value (0 -9.81 0); - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.air b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.air deleted file mode 100644 index bceba9af18..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.air +++ /dev/null @@ -1,19 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object momentumTransport.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.water b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.water deleted file mode 100644 index 05a1ed6fbb..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.water +++ /dev/null @@ -1,19 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object momentumTransport.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties deleted file mode 100644 index 122a933311..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties +++ /dev/null @@ -1,111 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object phaseProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -type basicMultiphaseSystem; - -phases (air water solid); - -air -{ - type pureIsothermalPhaseModel; - diameterModel none; - - residualAlpha 1e-6; -} - -water -{ - type pureIsothermalPhaseModel; - diameterModel none; - - residualAlpha 1e-6; -} - -solid -{ - type pureStationaryIsothermalPhaseModel; - diameterModel constant; - constantCoeffs - { - d 1e-3; - } - - residualAlpha 1e-6; -} - -blending -{ - default - { - type none; - continuousPhase none; - } -} - -surfaceTension -{ - air_water - { - type constant; - sigma 0.07; - } -} - -drag -{ - air_water - { - type AttouFerschneider; - gas air; - liquid water; - solid solid; - E1 280; - E2 4.8; - } - - air_solid - { - $air_water; - } - - water_solid - { - $air_water; - } -} - -virtualMass -{} - -heatTransfer -{} - -phaseTransfer -{} - -lift -{} - -wallLubrication -{} - -turbulentDispersion -{} - -interfaceCompression -{} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.air b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.air deleted file mode 100644 index 8b6595effa..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.air +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object physicalProperties.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.solid b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.solid deleted file mode 100644 index 4296fe961b..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.solid +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object physicalProperties.solid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState rhoConst; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 100; - } - equationOfState - { - rho 2500; - } - thermodynamics - { - Cp 6000; - Hf 0; - } - transport - { - mu 0; - Pr 1; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.water b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.water deleted file mode 100644 index 8843e086cf..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/physicalProperties.water +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object physicalProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo eConst; - equationOfState rPolynomial; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 18; - } - equationOfState - { - C (0.001278 -2.1055e-06 3.9689e-09 4.3772e-13 -2.0225e-16); - } - thermodynamics - { - Cv 4195; - Hf 0; - } - transport - { - mu 3.645e-4; - Pr 2.289; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/blockMeshDict deleted file mode 100644 index cf87259f53..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/blockMeshDict +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 1; - -vertices -( - (0 0 0) - (0.15 0 0) - (0.15 1 0) - (0 1 0) - (0 0 0.1) - (0.15 0 0.1) - (0.15 1 0.1) - (0 1 0.1) -); - -blocks -( - hex (0 1 2 3 4 5 6 7) (25 75 1) simpleGrading (1 1 1) -); - -patches -( - patch top - ( - (3 7 6 2) - ) - patch bottom - ( - (1 5 4 0) - ) - wall walls - ( - (0 4 7 3) - (2 6 5 1) - ) -); - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/controlDict deleted file mode 100644 index 25c2c38ddf..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/controlDict +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application multiphaseEulerFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 100; - -deltaT 0.5; - -writeControl runTime; - -writeInterval 1; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression off; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep no; - -maxCo 0.5; - -maxDeltaT 1; - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvConstraints b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvConstraints deleted file mode 100644 index 164c3e0bc0..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvConstraints +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - object fvConstraints; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -limitp -{ - type limitPressure; - - min 1e4; -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes deleted file mode 100644 index e77d81557d..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSchemes +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - - "div\(phi,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; - - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1; - - "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear uncorrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default uncorrected; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSolution deleted file mode 100644 index a5801b80ca..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/fvSolution +++ /dev/null @@ -1,77 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - "alpha.*" - { - nAlphaCorr 1; - nAlphaSubCycles 2; - } - - p_rgh - { - solver GAMG; - smoother DIC; - tolerance 1e-8; - relTol 0; - } - - p_rghFinal - { - $p_rgh; - relTol 0; - } - - "U.*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-5; - relTol 0; - minIter 1; - } - - "e.*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-8; - relTol 0; - minIter 1; - } -} - -PIMPLE -{ - nOuterCorrectors 3; - nCorrectors 1; - nNonOrthogonalCorrectors 0; - - partialElimination true; - -} - -relaxationFactors -{ - equations - { - ".*" 1; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/setFieldsDict deleted file mode 100644 index 00121e42fb..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/system/setFieldsDict +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object setFieldsDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defaultFieldValues -( - volScalarFieldValue alpha.air 0.5 - volScalarFieldValue alpha.water 0.0 - volScalarFieldValue alpha.solid 0.5 -); - -regions -( - boxToCell - { - box (0 0.5001 -0.1) (0.15 1.0 0.1); - fieldValues - ( - volScalarFieldValue alpha.air 0.35 - volScalarFieldValue alpha.water 0.15 - volScalarFieldValue alpha.solid 0.5 - ); - } -); - - -// ************************************************************************* //