diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties index 2a0bfc3979..f977303287 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/phaseProperties @@ -47,25 +47,23 @@ blending } surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.07; } -); +} drag -( -); +{} virtualMass -( -); +{} -interfaceComposition.gas -( - (gas and liquid) +interfaceComposition +{ + gas_liquid_inThe_gas { type nonRandomTwoLiquid; species (H2O C3H8O); @@ -112,62 +110,42 @@ interfaceComposition.gas } } } -); +} -interfaceComposition.liquid -( -); - -heatTransfer.gas -( - (liquid in gas) +heatTransfer +{ + liquid_dispersedIn_gas_inThe_gas { type RanzMarshall; residualAlpha 1e-4; } -); -heatTransfer.liquid -( - (liquid in gas) + liquid_dispersedIn_gas_inThe_liquid { type spherical; residualAlpha 1e-4; } -); +} -diffusiveMassTransfer.gas -( - (liquid in gas) +diffusiveMassTransfer +{ + liquid_dispersedIn_gas_inThe_gas { type Frossling; Le 1.0; } -); - -diffusiveMassTransfer.liquid -( - (liquid in gas) - { - type spherical; - Le 1.0; - } -); +} phaseTransfer -( -); +{} lift -( -); +{} wallLubrication -( -); +{} turbulentDispersion -( -); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties index 2bfe612e94..2e62251dd7 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/constant/phaseProperties @@ -46,25 +46,23 @@ blending } surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.07; } -); +} drag -( -); +{} virtualMass -( -); +{} -interfaceComposition.gas -( - (gas and liquid) +interfaceComposition +{ + gas_liquid_inThe_gas { type saturated; species ( H2O ); @@ -74,57 +72,42 @@ interfaceComposition.gas type ArdenBuck; } } -); +} -interfaceComposition.liquid -( -); - -heatTransfer.gas -( - (liquid in gas) +heatTransfer +{ + liquid_dispersedIn_gas_inThe_gas { type RanzMarshall; residualAlpha 1e-4; } -); -heatTransfer.liquid -( - (liquid in gas) + liquid_dispersedIn_gas_inThe_liquid { type spherical; residualAlpha 1e-4; } -); +} -diffusiveMassTransfer.gas -( - (liquid in gas) +diffusiveMassTransfer +{ + liquid_dispersedIn_gas_inThe_gas { type Frossling; Le 1.0; } -); - -diffusiveMassTransfer.liquid -( -); +} phaseTransfer -( -); +{} lift -( -); +{} wallLubrication -( -); +{} turbulentDispersion -( -); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties index f3f0639d57..a89c7aa268 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/phaseProperties @@ -149,30 +149,30 @@ blending } surfaceTension -(); +{} interfaceCompression -(); +{} drag -(); +{} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties index da6654c04c..ed72538cc5 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/phaseProperties @@ -150,30 +150,30 @@ blending } surfaceTension -(); +{} interfaceCompression -(); +{} drag -(); +{} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties index 99ada544fe..a846c5b343 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/phaseProperties @@ -192,30 +192,30 @@ blending } surfaceTension -(); +{} interfaceCompression -(); +{} drag -(); +{} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties index 0ebb86ee87..26cd260389 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties @@ -115,30 +115,30 @@ blending } surfaceTension -(); +{} interfaceCompression -(); +{} drag -(); +{} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties index 0f756bd201..3f65ce7d20 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/phaseProperties @@ -134,60 +134,46 @@ blending } drag -( - (air1 in water) +{ + air1_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air2 in water) + air2_dispersedIn_water { - type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } + $air1_dispersedIn_water; } - (air3 in water) + air3_dispersedIn_water { - type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } + $air1_dispersedIn_water; } -); +} heatTransfer -(); +{} interfaceCompression -(); +{} lift -(); +{} phaseTransfer -(); +{} surfaceTension -(); +{} turbulentDispersion -(); +{} virtualMass -(); +{} wallLubrication -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties index a88a388897..e957624a24 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties @@ -115,30 +115,30 @@ blending } surfaceTension -(); +{} interfaceCompression -(); +{} drag -(); +{} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties index 4c3b93509f..a99311c008 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/phaseProperties @@ -155,30 +155,30 @@ blending } surfaceTension -(); +{} interfaceCompression -(); +{} drag -(); +{} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties index 9e426fd778..4502b803e3 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/constant/phaseProperties @@ -46,82 +46,55 @@ blending } surfaceTension -( - (steam and water) +{ + steam_water { type constant; sigma 0.07; } -); +} saturation -( - (steam and water) +{ + steam_water { type constant; pSat 1e5; Tsat 372.76; } -); +} drag -( -); +{} virtualMass -( -); +{} -interfaceComposition.steam -( - (steam and water) - { - type saturated; - species ( H2O ); - Le 1.0; - saturationPressure - { - type ArdenBuck; - } - } -); - -interfaceComposition.water -( -); - -heatTransfer.steam -( - (water in steam) +heatTransfer +{ + water_dispersedIn_steam_inThe_steam { type RanzMarshall; residualAlpha 1e-4; } -); -heatTransfer.water -( - (water in steam) + water_dispersedIn_steam_inThe_water { type spherical; residualAlpha 1e-4; } -); +} phaseTransfer -( -); +{} lift -( -); +{} wallLubrication -( -); +{} turbulentDispersion -( -); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties index b615805fb6..0b86ae31c8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/LES/bubbleColumn/constant/phaseProperties @@ -65,91 +65,79 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } -); +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (water in air) + water_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-4; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties index e4c6c3803d..cb19d2b5f1 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/constant/phaseProperties @@ -41,38 +41,33 @@ liquid } drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type IshiiZuber; - - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type RanzMarshall; } -); +} lift -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type wallDamped; @@ -95,26 +90,26 @@ lift zeroInNearWallCells yes; } } -); +} wallLubrication -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type Antal; Cw1 -0.01; Cw2 0.05; } -); +} turbulentDispersion -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type Burns; sigma 0.7; } -); +} blending { @@ -126,18 +121,18 @@ blending } surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.071; } -); +} phaseTransfer -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties index aa6043e061..ca770495a8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/LBend/constant/phaseProperties @@ -51,59 +51,55 @@ blending } surfaceTension -( - (gas and solids) +{ + gas_solids { type constant; sigma 0; } -); +} drag -( - (solids in gas) +{ + solids_dispersedIn_gas { type GidaspowErgunWenYu; residualAlpha 1e-5; residualRe 1e-5; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (solids in gas) +{ + solids_dispersedIn_gas { type constantCoefficient; Cvm 0; } -); +} heatTransfer -( - (solids in gas) +{ + solids_dispersedIn_gas { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties index b615805fb6..0b86ae31c8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties @@ -65,91 +65,79 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } -); +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (water in air) + water_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-4; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties index 0f9b0d3376..99c6352978 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties @@ -70,55 +70,47 @@ blending } surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.07; } -); +} drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (liquid in gas) + liquid_dispersedIn_gas { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } - (liquid in gas) + liquid_dispersedIn_gas { type constantCoefficient; Cvm 0.5; } -); +} -interfaceComposition.gas -( - (gas and liquid) +interfaceComposition +{ + gas_liquid_inThe_gas { type saturated; species ( H2O ); @@ -128,73 +120,63 @@ interfaceComposition.gas type ArdenBuck; } } -); +} -interfaceComposition.liquid -( -); - -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; residualAlpha 1e-4; } - (liquid in gas) - { - type RanzMarshall; - residualAlpha 1e-4; - } -); - -heatTransfer.liquid -( - (gas in liquid) + liquid_dispersedIn_gas_inThe_gas { type RanzMarshall; residualAlpha 1e-4; } - (liquid in gas) + gas_dispersedIn_liquid_inThe_liquid + { + type RanzMarshall; + residualAlpha 1e-4; + } + + liquid_dispersedIn_gas_inThe_liquid { type spherical; residualAlpha 1e-4; } -); +} -diffusiveMassTransfer.gas -( - (gas in liquid) +diffusiveMassTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; Le 1.0; } - (liquid in gas) + liquid_dispersedIn_gas_inThe_gas { type Frossling; Le 1.0; } -); - -diffusiveMassTransfer.liquid -(); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties index 63bf84c98c..1e86c99b28 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/phaseProperties @@ -119,72 +119,62 @@ blending } surfaceTension -( - (air1 and water) +{ + air1_water { type constant; sigma 0.083; } - (air2 and water) + air2_water { type constant; sigma 0.083; } -); +} interfaceCompression -(); +{} drag -( - (air1 in water) +{ + air1_dispersedIn_water { type IshiiZuber; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air2 in water) + air2_dispersedIn_water { type IshiiZuber; - residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air1 in water) +{ + air1_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (air2 in water) + air2_dispersedIn_water { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -(); +{} phaseTransfer -(); +{} lift -( - (air1 in water) +{ + air1_dispersedIn_water { type wallDamped; @@ -205,7 +195,7 @@ lift } } - (air2 in water) + air2_dispersedIn_water { type wallDamped; @@ -225,38 +215,38 @@ lift } } } -); +} wallLubrication -( - (air1 in water) +{ + air1_dispersedIn_water { type Antal; Cw1 -0.01; Cw2 0.05; } - (air2 in water) + air2_dispersedIn_water { type Antal; Cw1 -0.01; Cw2 0.05; } -); +} turbulentDispersion -( - (air1 in water) +{ + air1_dispersedIn_water { type Burns; sigma 0.9; } - (air2 in water) + air2_dispersedIn_water { type Burns; sigma 0.9; } -); +} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index e1b7adf716..c3f53b9bad 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -53,57 +53,48 @@ blending } surfaceTension -( - (air and particles) +{ + air_particles { type constant; sigma 0; } -); +} interfaceCompression -(); +{} drag -( - (particles in air) +{ + particles_dispersedIn_air { type GidaspowErgunWenYu; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( -); +{} heatTransfer -( - (particles in air) +{ + particles_dispersedIn_air { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -( -); +{} lift -( -); +{} wallLubrication -( -); +{} turbulentDispersion -( -); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties index 6f19c99fec..4e1a414fde 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/constant/phaseProperties @@ -41,46 +41,38 @@ liquid } drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type IshiiZuber; - - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } -); +} -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; } -); -heatTransfer.liquid -( - (gas in liquid) + gas_dispersedIn_liquid_inThe_liquid { type RanzMarshall; } -); +} lift -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type wallDamped; @@ -103,27 +95,27 @@ lift zeroWallDist 0.0002; } } -); +} wallLubrication -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type Antal; Cw1 -0.01; Cw2 0.05; } -); +} turbulentDispersion -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type LopezDeBertodano; Ctd 1.0; residualAlpha 1e-3; } -); +} blending { @@ -135,8 +127,8 @@ blending } saturation -( - (gas and liquid) +{ + gas_liquid { type function1; @@ -157,21 +149,18 @@ saturation interpolationScheme linear; } } -); +} surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.00176574; } -); +} phaseTransfer -(); - -interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties index 9007823166..030e45ef4e 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties @@ -78,49 +78,41 @@ liquid } drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type IshiiZuber; - - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } -); +} -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type constantNu; Nu 1e1; residualAlpha 1e-4; } -); -heatTransfer.liquid -( - (gas in liquid) + gas_dispersedIn_liquid_inThe_liquid { type RanzMarshall; residualAlpha 1e-4; } -); +} lift -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type wallDamped; @@ -143,27 +135,27 @@ lift zeroWallDist 0.0002; } } -); +} wallLubrication -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type Antal; Cw1 -0.01; Cw2 0.05; } -); +} turbulentDispersion -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type LopezDeBertodano; Ctd 1.0; residualAlpha 1e-3; } -); +} blending { @@ -175,8 +167,8 @@ blending } saturation -( - (gas and liquid) +{ + gas_liquid { type function1; @@ -197,21 +189,21 @@ saturation interpolationScheme linear; } } -); +} surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.00176574; } -); +} phaseTransfer -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties index a8a0e933aa..7a5b776811 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/constant/phaseProperties @@ -124,46 +124,38 @@ populationBalanceCoeffs } drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type IshiiZuber; - - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } -); +} -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; } -); -heatTransfer.liquid -( - (gas in liquid) + gas_dispersedIn_liquid_inThe_liquid { type RanzMarshall; } -); +} lift -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type wallDamped; @@ -186,27 +178,27 @@ lift zeroWallDist 0.0002; } } -); +} wallLubrication -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type Antal; Cw1 -0.01; Cw2 0.05; } -); +} turbulentDispersion -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type LopezDeBertodano; Ctd 1.0; residualAlpha 1e-3; } -); +} blending { @@ -218,8 +210,8 @@ blending } saturation -( - (gas and liquid) +{ + gas_liquid { type function1; @@ -240,21 +232,21 @@ saturation interpolationScheme linear; } } -); +} surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.00176574; } -); +} phaseTransfer -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties index 284a5a9667..3c71ddc3a8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/phaseProperties @@ -150,77 +150,61 @@ populationBalanceCoeffs } drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type IshiiZuber; - - swarmCorrection - { - type none; - } } - (gas2 in liquid) + gas2_dispersedIn_liquid { type IshiiZuber; - - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } - (gas2 in liquid) + gas2_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } -); +} -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; } -); -heatTransfer.gas2 -( - (gas2 in liquid) + gas2_dispersedIn_liquid_inThe_gas2 { type spherical; } -); -heatTransfer.liquid -( - (gas in liquid) + gas_dispersedIn_liquid_inThe_liquid { type RanzMarshall; residualAlpha 1e-4; } - (gas2 in liquid) + gas2_dispersedIn_liquid_inThe_liquid { type RanzMarshall; residualAlpha 1e-4; } -); +} lift -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type wallDamped; @@ -244,7 +228,7 @@ lift } } - (gas2 in liquid) + gas2_dispersedIn_liquid { type wallDamped; @@ -267,41 +251,41 @@ lift zeroWallDist 0.0002; } } -); +} wallLubrication -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type Antal; Cw1 -0.01; Cw2 0.05; } - (gas2 in liquid) + gas2_dispersedIn_liquid { type Antal; Cw1 -0.01; Cw2 0.05; } -); +} turbulentDispersion -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type LopezDeBertodano; Ctd 1.0; residualAlpha 1e-3; } - (gas2 in liquid) + gas2_dispersedIn_liquid { type LopezDeBertodano; Ctd 1.0; residualAlpha 1e-3; } -); +} blending { @@ -313,8 +297,8 @@ blending } saturation -( - (gas and liquid) +{ + gas_liquid { type function1; @@ -336,7 +320,7 @@ saturation } } - (gas2 and liquid) + gas2_liquid { type function1; @@ -357,24 +341,24 @@ saturation interpolationScheme linear; } } -); +} surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.00176574; } - (gas2 and liquid) + gas2_liquid { type constant; sigma 0.00176574; } -); +} phaseTransfer -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties index 331bed4948..56ca7845e1 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/phaseProperties @@ -70,100 +70,72 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } - - (air and solid) - { - type constant; - sigma 0; - } - - (solid and water) - { - type constant; - sigma 0; - } -); +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (solid in air) + solid_dispersedIn_air { type Ergun; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (solid in water) + solid_dispersedIn_water { type Ergun; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (water in air) + water_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index c661acbb91..ff0107f8a6 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -67,94 +67,79 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } -); +} interfaceCompression -(); +{} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (water in air) + water_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-4; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties index fd9b537ac5..345f79150b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties @@ -70,55 +70,47 @@ blending } surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.07; } -); +} drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (liquid in gas) + liquid_dispersedIn_gas { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } - (liquid in gas) + liquid_dispersedIn_gas { type constantCoefficient; Cvm 0.5; } -); +} -interfaceComposition.gas -( - (gas and liquid) +interfaceComposition +{ + gas_liquid_inThe_gas { type saturated; species ( H2O ); @@ -128,84 +120,75 @@ interfaceComposition.gas type ArdenBuck; } } -); +} -interfaceComposition.liquid -(); - -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; residualAlpha 1e-4; } - (liquid in gas) - { - type RanzMarshall; - residualAlpha 1e-4; - } -); - -heatTransfer.liquid -( - (gas in liquid) + gas_dispersedIn_liquid_inThe_liquid { type RanzMarshall; residualAlpha 1e-4; } - (liquid in gas) + liquid_dispersedIn_gas_inThe_gas + { + type RanzMarshall; + residualAlpha 1e-4; + } + + liquid_dispersedIn_gas_inThe_liquid { type spherical; residualAlpha 1e-4; } -); +} -diffusiveMassTransfer.gas -( - (gas in liquid) +diffusiveMassTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; Le 1.0; } - (liquid in gas) - { - type Frossling; - Le 1.0; - } -); - -diffusiveMassTransfer.liquid -( - (gas in liquid) + gas_dispersedIn_liquid_inThe_liquid { type Frossling; Le 1.0; } - (liquid in gas) + liquid_dispersedIn_gas_inThe_gas + { + type Frossling; + Le 1.0; + } + + liquid_dispersedIn_gas_inThe_liquid { type spherical; Le 1.0; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties index 38cfbabfc5..4c3532cded 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties @@ -70,55 +70,47 @@ blending } surfaceTension -( - (gas and liquid) +{ + gas_liquid { type constant; sigma 0.07; } -); +} drag -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (liquid in gas) + liquid_dispersedIn_gas { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (gas in liquid) +{ + gas_dispersedIn_liquid { type constantCoefficient; Cvm 0.5; } - (liquid in gas) + liquid_dispersedIn_gas { type constantCoefficient; Cvm 0.5; } -); +} -interfaceComposition.gas -( - (gas and liquid) +interfaceComposition +{ + gas_liquid_inThe_gas { type saturated; species ( water ); @@ -128,92 +120,83 @@ interfaceComposition.gas type ArdenBuck; } } -); -interfaceComposition.liquid -( - (liquid and gas) + gas_liquid_inThe_liquid { type Henry; species ( air ); k ( 1.492e-2 ); Le 1.0; } -); +} -heatTransfer.gas -( - (gas in liquid) +heatTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; residualAlpha 1e-4; } - (liquid in gas) - { - type RanzMarshall; - residualAlpha 1e-4; - } -); - -heatTransfer.liquid -( - (gas in liquid) + liquid_dispersedIn_gas_inThe_gas { type RanzMarshall; residualAlpha 1e-4; } - (liquid in gas) + gas_dispersedIn_liquid_inThe_liquid + { + type RanzMarshall; + residualAlpha 1e-4; + } + + liquid_dispersedIn_gas_inThe_liquid { type spherical; residualAlpha 1e-4; } -); +} -diffusiveMassTransfer.gas -( - (gas in liquid) +diffusiveMassTransfer +{ + gas_dispersedIn_liquid_inThe_gas { type spherical; Le 1.0; } - (liquid in gas) - { - type Frossling; - Le 1.0; - } -); - -diffusiveMassTransfer.liquid -( - (gas in liquid) + liquid_dispersedIn_gas_inThe_gas { type Frossling; Le 1.0; } - (liquid in gas) + gas_dispersedIn_liquid_inThe_liquid + { + type Frossling; + Le 1.0; + } + + liquid_dispersedIn_gas_inThe_liquid { type spherical; Le 1.0; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties index d73e0b74d3..6cf05a8679 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties @@ -87,92 +87,79 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } -); +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; - residualAlpha 1e-6; m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (water in air) + water_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-4; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties index a4abf994d1..226f8e2d45 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/damBreak4phase/constant/phaseProperties @@ -60,121 +60,105 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } - (air and oil) + air_oil { type constant; sigma 0.032; } - (air and mercury) + air_mercury { type constant; sigma 0.486; } - (water and oil) + water_oil { type constant; sigma 0.03; } - (water and mercury) + water_mercury { type constant; sigma 0.415; } - (oil and mercury) + oil_mercury { type constant; sigma 0.4; } -); +} interfaceCompression -( - (air and water) 1 - (air and oil) 1 - (air and mercury) 1 - (water and oil) 1 - (water and mercury) 1 - (oil and mercury) 1 -); +{ + air_water 1; + air_oil 1; + air_mercury 1; + water_oil 1; + water_mercury 1; + oil_mercury 1; +} drag -( - (air and water) +{ + air_segregatedWith_water { type segregated; - m 0.1; n 8; } - (air and oil) + air_segregatedWith_oil { - type segregated; - - m 0.1; - n 8; + $air_segregatedWith_water; } - (air and mercury) + air_segregatedWith_mercury { - type segregated; - - m 0.1; - n 8; + $air_segregatedWith_water; } - (water and oil) + water_segregatedWith_oil { - type segregated; - - m 0.1; - n 8; + $air_segregatedWith_water; } - (water and mercury) + water_segregatedWith_mercury { - type segregated; - - m 0.1; - n 8; + $air_segregatedWith_water; } - (oil and mercury) + oil_segregatedWith_mercury { - type segregated; - - m 0.1; - n 8; + $air_segregatedWith_water; } -); +} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index 6aa369447c..4dab13ae73 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -49,58 +49,54 @@ blending } surfaceTension -( - (particles and air) +{ + particles_air { type constant; sigma 0; } -); +} drag -( - (particles in air) +{ + particles_dispersedIn_air { type GidaspowErgunWenYu; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (particles in air) +{ + particles_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (particles in air) +{ + particles_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties index af0f94ec8e..68a04c6f89 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/phaseProperties @@ -65,92 +65,79 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } -); +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; - residualAlpha 1e-4; m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (water in air) + water_dispersedIn_air { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index fa1ce85eae..1d6fe92d5a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -96,371 +96,277 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } - (air and oil) + + air_oil { type constant; sigma 0.07; } - (air and mercury) + + air_mercury { type constant; sigma 0.07; } - (water and oil) + + water_oil { type constant; sigma 0; } - (water and mercury) + + water_mercury { type constant; sigma 0; } - (oil and mercury) + + oil_mercury { type constant; sigma 0; } -); +} interfaceCompression -( - (air and water) 1 - (air and oil) 1 - (air and mercury) 1 - (water and oil) 1 - (water and mercury) 1 - (oil and mercury) 1 -); +{ + air_water 1; + air_oil 1; + air_mercury 1; + water_oil 1; + water_mercury 1; + oil_mercury 1; +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - (air in oil) + air_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (oil in air) + oil_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and oil) + air_segregatedWith_oil { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - (air in mercury) + air_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (mercury in air) + mercury_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and mercury) + air_segregatedWith_mercury { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - - (water in oil) + water_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (oil in water) + oil_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water and oil) + water_segregatedWith_oil { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - (water in mercury) + water_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (mercury in water) + mercury_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water and mercury) + water_segregatedWith_mercury { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - - (oil in mercury) + oil_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (mercury in oil) + mercury_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (oil and mercury) + oil_segregatedWith_mercury { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (air in oil) + air_dispersedIn_oil { type constantCoefficient; Cvm 0.5; } - (air in mercury) + air_dispersedIn_mercury { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } - (air in oil) + air_dispersedIn_oil { type RanzMarshall; residualAlpha 1e-3; } - (oil in air) + oil_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } - (air in mercury) + air_dispersedIn_mercury { type RanzMarshall; residualAlpha 1e-3; } - (mercury in air) + mercury_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } - - (water in oil) + water_dispersedIn_oil { type RanzMarshall; residualAlpha 1e-3; } - (oil in water) + oil_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - (water in mercury) + water_dispersedIn_mercury { type RanzMarshall; residualAlpha 1e-3; } - (mercury in water) + mercury_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - - (oil in mercury) + oil_dispersedIn_mercury { type RanzMarshall; residualAlpha 1e-3; } - (mercury in oil) + mercury_dispersedIn_oil { type RanzMarshall; residualAlpha 1e-3; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties index b6e4b5dec5..6f9cc4eff5 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phaseProperties @@ -97,371 +97,277 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } - (air and oil) + + air_oil { type constant; sigma 0.07; } - (air and mercury) + + air_mercury { type constant; sigma 0.07; } - (water and oil) + + water_oil { type constant; sigma 0; } - (water and mercury) + + water_mercury { type constant; sigma 0; } - (oil and mercury) + + oil_mercury { type constant; sigma 0; } -); +} interfaceCompression -( - (air and water) 1 - (air and oil) 1 - (air and mercury) 1 - (water and oil) 1 - (water and mercury) 1 - (oil and mercury) 1 -); +{ + air_water 1; + air_oil 1; + air_mercury 1; + water_oil 1; + water_mercury 1; + oil_mercury 1; +} drag -( - (air in water) +{ + air_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water in air) + water_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and water) + air_segregatedWith_water { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - (air in oil) + air_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (oil in air) + oil_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and oil) + air_segregatedWith_oil { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - (air in mercury) + air_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (mercury in air) + mercury_dispersedIn_air { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (air and mercury) + air_segregatedWith_mercury { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - - (water in oil) + water_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (oil in water) + oil_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water and oil) + water_segregatedWith_oil { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - (water in mercury) + water_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (mercury in water) + mercury_dispersedIn_water { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (water and mercury) + water_segregatedWith_mercury { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } - - - (oil in mercury) + oil_dispersedIn_mercury { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (mercury in oil) + mercury_dispersedIn_oil { type SchillerNaumann; - residualRe 1e-3; - swarmCorrection - { - type none; - } } - (oil and mercury) + oil_segregatedWith_mercury { type segregated; - m 0.5; n 8; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (air in water) +{ + air_dispersedIn_water { type constantCoefficient; Cvm 0.5; } - (air in oil) + air_dispersedIn_oil { type constantCoefficient; Cvm 0.5; } - (air in mercury) + air_dispersedIn_mercury { type constantCoefficient; Cvm 0.5; } -); +} heatTransfer -( - (air in water) +{ + air_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - (water in air) + water_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } - (air in oil) + air_dispersedIn_oil { type RanzMarshall; residualAlpha 1e-3; } - (oil in air) + oil_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } - (air in mercury) + air_dispersedIn_mercury { type RanzMarshall; residualAlpha 1e-3; } - (mercury in air) + mercury_dispersedIn_air { type RanzMarshall; residualAlpha 1e-3; } - - (water in oil) + water_dispersedIn_oil { type RanzMarshall; residualAlpha 1e-3; } - (oil in water) + oil_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - (water in mercury) + water_dispersedIn_mercury { type RanzMarshall; residualAlpha 1e-3; } - (mercury in water) + mercury_dispersedIn_water { type RanzMarshall; residualAlpha 1e-3; } - - (oil in mercury) + oil_dispersedIn_mercury { type RanzMarshall; residualAlpha 1e-3; } - (mercury in oil) + mercury_dispersedIn_oil { type RanzMarshall; residualAlpha 1e-3; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll b/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll deleted file mode 100644 index 496b646f7a..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/mixerVesselAMI2D/constant/phasePropertiesAll +++ /dev/null @@ -1,470 +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 (water oil mercury air); - -water -{ - type purePhaseModel; - diameterModel constant; - constantCoeffs - { - d 1e-3; - } - - residualAlpha 1e-3; -} - -oil -{ - type purePhaseModel; - diameterModel constant; - constantCoeffs - { - d 1e-3; - } - - residualAlpha 1e-3; -} - -mercury -{ - type purePhaseModel; - diameterModel constant; - constantCoeffs - { - d 1e-3; - } - - residualAlpha 1e-3; -} - -air -{ - type purePhaseModel; - diameterModel constant; - constantCoeffs - { - d 1e-3; - } - - residualAlpha 1e-3; -} - -blending -{ - default - { - type linear; - minFullyContinuousAlpha.water 0.7; - minPartlyContinuousAlpha.water 0.3; - minFullyContinuousAlpha.oil 0.7; - minPartlyContinuousAlpha.oil 0.3; - minFullyContinuousAlpha.mercury 0.7; - minPartlyContinuousAlpha.mercury 0.3; - minFullyContinuousAlpha.air 0.7; - minPartlyContinuousAlpha.air 0.3; - } - - drag - { - type linear; - minFullyContinuousAlpha.water 0.7; - minPartlyContinuousAlpha.water 0.5; - minFullyContinuousAlpha.oil 0.7; - minPartlyContinuousAlpha.oil 0.5; - minFullyContinuousAlpha.mercury 0.7; - minPartlyContinuousAlpha.mercury 0.5; - minFullyContinuousAlpha.air 0.7; - minPartlyContinuousAlpha.air 0.5; - } -} - -surfaceTension -( - (air and water) - { - type constant; - sigma 0.07; - } - (air and oil) - { - type constant; - sigma 0.07; - } - (air and mercury) - { - type constant; - sigma 0.07; - } - (water and oil) - { - type constant; - sigma 0; - } - (water and mercury) - { - type constant; - sigma 0; - } - (oil and mercury) - { - type constant; - sigma 0; - } -); - -interfaceCompression -( - (air and water) 1 - (air and oil) 1 - (air and mercury) 1 - (water and oil) 1 - (water and mercury) 1 - (oil and mercury) 1 -); - -drag -( - (air in water) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (water in air) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (air and water) - { - type segregated; - - m 0.5; - n 8; - swarmCorrection - { - type none; - } - } - - - (air in oil) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (oil in air) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (air and oil) - { - type segregated; - - m 0.5; - n 8; - swarmCorrection - { - type none; - } - } - - - (air in mercury) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (mercury in air) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (air and mercury) - { - type segregated; - - m 0.5; - n 8; - swarmCorrection - { - type none; - } - } - - - - (water in oil) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (oil in water) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (water and oil) - { - type segregated; - - m 0.5; - n 8; - swarmCorrection - { - type none; - } - } - - - (water in mercury) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (mercury in water) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (water and mercury) - { - type segregated; - - m 0.5; - n 8; - swarmCorrection - { - type none; - } - } - - - - (oil in mercury) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (mercury in oil) - { - type SchillerNaumann; - - residualRe 1e-3; - swarmCorrection - { - type none; - } - } - - (oil and mercury) - { - type segregated; - - m 0.5; - n 8; - swarmCorrection - { - type none; - } - } -); - -virtualMass -( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (air in oil) - { - type constantCoefficient; - Cvm 0.5; - } - - (air in mercury) - { - type constantCoefficient; - Cvm 0.5; - } -); - -heatTransfer -( - (air in water) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (water in air) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (air in oil) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (oil in air) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (air in mercury) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (mercury in air) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - - (water in oil) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (oil in water) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (water in mercury) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (mercury in water) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - - (oil in mercury) - { - type RanzMarshall; - residualAlpha 1e-3; - } - - (mercury in oil) - { - type RanzMarshall; - residualAlpha 1e-3; - } -); - -phaseTransfer -(); - -lift -(); - -wallLubrication -(); - -turbulentDispersion -(); - -// Minimum allowable pressure -pMin 10000; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties index fe08329098..eec2d9dbf2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/phaseProperties @@ -51,77 +51,70 @@ blending } surfaceTension -( - (steam and water) +{ + steam_water { type constant; sigma 0.07; } -); +} saturation -( - (steam and water) +{ + steam_water { type constant; pSat 1e5; Tsat 372.76; } -); +} drag -( - (steam in water) +{ + steam_dispersedIn_water { type SchillerNaumann; residualRe 1e-3; - swarmCorrection - { - type none; - } } -); +} virtualMass -( - (steam in water) +{ + steam_dispersedIn_water { type constantCoefficient; Cvm 0.5; } -); +} -heatTransfer.steam -( - (steam in water) +heatTransfer +{ + steam_dispersedIn_water_inThe_steam { type spherical; residualAlpha 1e-4; } -); -heatTransfer.water -( - (steam in water) + steam_dispersedIn_water_inThe_water { type RanzMarshall; residualAlpha 1e-4; } -); +} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties index 182f68eee6..65181b6850 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/constant/phaseProperties @@ -138,38 +138,31 @@ blending } interfaceCompression -(); +{} surfaceTension -(); +{} drag -( - (particles in vapor) +{ + particles_dispersedIn_vapor { type timeScaleFiltered; minRelaxTime 1e-4; - dragModel { type aerosolDrag; - sigma 340e-12; - - swarmCorrection - { - type none; - } } } -); +} virtualMass -(); +{} heatTransfer -( - (particles in vapor) +{ + particles_dispersedIn_vapor { type timeScaleFiltered; minRelaxTime 1e-4; @@ -180,29 +173,29 @@ heatTransfer Nu 1; } } -); +} phaseTransfer -( - (particles in vapor) +{ + particles_dispersedIn_vapor { type reactionDriven; reactingPhase vapor; targetPhase particles; species (TiO2); } -); +} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties index 730a79c2d1..3423c49f38 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/constant/phaseProperties @@ -150,38 +150,31 @@ blending } interfaceCompression -(); +{} surfaceTension -(); +{} drag -( - (particles in vapor) +{ + particles_dispersedIn_vapor { type timeScaleFiltered; minRelaxTime 1e-4; - dragModel { type aerosolDrag; - sigma 340e-12; - - swarmCorrection - { - type none; - } } } -); +} virtualMass -(); +{} heatTransfer -( - (particles in vapor) +{ + particles_dispersedIn_vapor { type timeScaleFiltered; minRelaxTime 1e-4; @@ -192,29 +185,29 @@ heatTransfer Nu 1; } } -); +} phaseTransfer -( - (particles in vapor) +{ + particles_dispersedIn_vapor { type reactionDriven; reactingPhase vapor; targetPhase particles; species (TiO2 TiO2_s); } -); +} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties index d76f2f7b28..122a933311 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/trickleBed/constant/phaseProperties @@ -56,29 +56,17 @@ blending } surfaceTension -( - (air and water) +{ + air_water { type constant; sigma 0.07; } - - (air and solid) - { - type constant; - sigma 0; - } - - (solid and water) - { - type constant; - sigma 0; - } -); +} drag -( - (air and water) +{ + air_water { type AttouFerschneider; gas air; @@ -86,60 +74,38 @@ drag solid solid; E1 280; E2 4.8; - swarmCorrection - { - type none; - } } - (air and solid) + air_solid { - type AttouFerschneider; - gas air; - liquid water; - solid solid; - E1 280; - E2 4.8; - swarmCorrection - { - type none; - } + $air_water; } - (water and solid) + water_solid { - type AttouFerschneider; - gas air; - liquid water; - solid solid; - E1 280; - E2 4.8; - swarmCorrection - { - type none; - } + $air_water; } -); +} virtualMass -(); +{} heatTransfer -(); +{} phaseTransfer -(); +{} lift -(); +{} wallLubrication -(); +{} turbulentDispersion -(); +{} interfaceCompression -(); +{} // ************************************************************************* //