diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C index 364564aea..4d85f6438 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C @@ -52,7 +52,10 @@ Foam::dragModels::AttouFerschneider::KGasLiquid const phaseModel& solid = gas.fluid().phases()[solidName_]; const volScalarField oneMinusGas(max(1 - gas, liquid.residualAlpha())); - const volScalarField cbrtR(solid/oneMinusGas); + const volScalarField cbrtR + ( + cbrt(max(solid, solid.residualAlpha())/oneMinusGas) + ); const volScalarField magURel(mag(gas.U() - liquid.U())); return @@ -70,7 +73,10 @@ Foam::dragModels::AttouFerschneider::KGasSolid ) const { const volScalarField oneMinusGas(max(1 - gas, solid.residualAlpha())); - const volScalarField cbrtR(solid/oneMinusGas); + const volScalarField cbrtR + ( + cbrt(max(solid, solid.residualAlpha())/oneMinusGas) + ); return E1_*gas.mu()*sqr(oneMinusGas/solid.d())*sqr(cbrtR) diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.air index 35b1df7c6..77f13e270 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.air @@ -20,14 +20,7 @@ internalField uniform 300; boundaryField { - bottom - { - type inletOutlet; - phi phi.air; - inletValue $internalField; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type zeroGradient; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.solid b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.solid index b63896311..ad72183d7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.solid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.solid @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object T.solid; + object T.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.water index 646a9f67a..86e7f2081 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/T.water @@ -20,14 +20,7 @@ internalField uniform 300; boundaryField { - bottom - { - type inletOutlet; - phi phi.water; - inletValue $internalField; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type zeroGradient; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.air index 88ed3c481..7e419e941 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.air @@ -20,13 +20,7 @@ internalField uniform (0 0 0); boundaryField { - bottom - { - type pressureInletOutletVelocity; - phi phi.air; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type noSlip; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.water index b85ec1003..2bf5abf15 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/U.water @@ -20,13 +20,7 @@ internalField uniform (0 0 0); boundaryField { - bottom - { - type pressureInletOutletVelocity; - phi phi.water; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type noSlip; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig index 8768fe7ef..8e9abf899 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.air.orig @@ -20,14 +20,7 @@ internalField uniform 0.5; boundaryField { - bottom - { - type inletOutlet; - phi phi.air; - inletValue $internalField; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type zeroGradient; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig index 6bce9e8af..ea380a7cf 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/alpha.water.orig @@ -20,14 +20,7 @@ internalField uniform 0; boundaryField { - bottom - { - type inletOutlet; - phi phi.water; - inletValue $internalField; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type zeroGradient; } diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/p_rgh index 6701faf5e..182d4ef48 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/p_rgh +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/0/p_rgh @@ -20,16 +20,7 @@ internalField uniform 1e5; boundaryField { - bottom - { - type prghTotalPressure; - p0 $internalField; - U U.air; - phi phi.air; - rho thermo:rho.air; - value $internalField; - } - "(top|walls)" + "(bottom|top|walls)" { type fixedFluxPressure; value $internalField;