diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C index c740e670cb..bb860f3678 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,11 +52,7 @@ Foam::diameterModels::sizeGroup::sizeGroup IOobject::groupName ( name, - IOobject::groupName - ( - velocityGroup.phase().name(), - velocityGroup.popBalName() - ) + velocityGroup.phase().name() ), mesh.time().timeName(), mesh, diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C index 62c2d80b63..23e20f27ae 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C @@ -152,11 +152,7 @@ Foam::diameterModels::velocityGroup::velocityGroup IOobject::groupName ( "f", - IOobject::groupName - ( - phase.name(), - popBalName_ - ) + phase.name() ), phase.time().timeName(), phase.mesh(), diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 index f6cac58749..394faa960a 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.air.bubbles; + object f.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1.bubbles deleted file mode 100644 index 7b7b9b4da3..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air1.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 index f6cac58749..3e7e3883b3 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.air.bubbles; + object f.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2.bubbles deleted file mode 100644 index 4252541b78..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air2.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 similarity index 95% rename from test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 index 7eacf5a2a2..a7ee501541 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.air3.bubbles; + object f.air3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1 similarity index 95% rename from test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1 index 7b7b9b4da3..394faa960a 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1 @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.air1.bubbles; + object f.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2 new file mode 100644 index 0000000000..3e7e3883b3 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2.bubbles deleted file mode 100644 index 4252541b78..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air2.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3 new file mode 100644 index 0000000000..a7ee501541 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3.bubbles deleted file mode 100644 index 7eacf5a2a2..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air3.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1 new file mode 100644 index 0000000000..394faa960a --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1.bubbles deleted file mode 100644 index 7b7b9b4da3..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air1.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2 new file mode 100644 index 0000000000..3e7e3883b3 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2.bubbles deleted file mode 100644 index 4252541b78..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air2.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3 new file mode 100644 index 0000000000..a7ee501541 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3.bubbles deleted file mode 100644 index 7eacf5a2a2..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air3.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air new file mode 100644 index 0000000000..8a68320714 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1 similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1 index 3ba272279c..45fb304d95 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.air1.bubbles; + object f.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2 similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2 index df9109f7a8..9d0e53b783 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.air2.bubbles; + object f.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3 similarity index 96% rename from test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3.bubbles rename to test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3 index 24d4b5ba2a..db8a2fa83f 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3.bubbles +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.air3.bubbles; + object f.air3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvOptions b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvOptions index ab2eadd470..cb66a658eb 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvOptions +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,33 +18,25 @@ options { massSource { - type semiImplicitSource; + type massSource; selectionMode cellZone; cellZone injection; - volumeMode absolute; + massFlowRate 1e-3; - sources + phase air1; + rho thermo:rho.air1; + + fieldValues { - thermo:rho.air1 - { - explicit 1e-03; - implicit 0; - } - - U.air1 - { - explicit (0 2.78e-02 0); - implicit 0; - } - - f0.air1.bubbles - { - value 1.0; - explicit #calc "$value*$../thermo:rho.air1/explicit"; - implicit 0; - } + f0.air1 1; + f1.air1 0; + f2.air1 0; + f3.air1 0; + f4.air1 0; + f5.air1 0; + U.air1 (0 0 0); } } } diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air new file mode 100644 index 0000000000..8a68320714 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1 new file mode 100644 index 0000000000..394faa960a --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1.bubbles deleted file mode 100644 index 7b7b9b4da3..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air1.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2 new file mode 100644 index 0000000000..3e7e3883b3 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2.bubbles deleted file mode 100644 index 4252541b78..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air2.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3 new file mode 100644 index 0000000000..a7ee501541 --- /dev/null +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3 @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object f.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1.0; + +boundaryField +{ +} + +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3.bubbles b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3.bubbles deleted file mode 100644 index 7eacf5a2a2..0000000000 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3.bubbles +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object f.air3.bubbles; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air2.bubbles b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air1 similarity index 96% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air2.bubbles rename to tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air1 index 43b2db8362..70275d429d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air2.bubbles +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air1 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.air2.bubbles; + object f.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air1.bubbles b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air2 similarity index 96% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air1.bubbles rename to tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air2 index 456fb5900a..403cff5b43 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air1.bubbles +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/0/f.air2 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.air1.bubbles; + object f.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvOptions b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvOptions index a32133c7e3..e384173aab 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvOptions +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/constant/fvOptions @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,27 +19,24 @@ options { massSource { - type semiImplicitSource; + type massSource; selectionMode cellZone; cellZone injection; - volumeMode absolute; + massFlowRate 6e-7; - sources + phase air1; + rho thermo:rho.air1; + + fieldValues { - thermo:rho.air1 - { - explicit 6e-07; - implicit 0; - } - - f3.air1.bubbles - { - value 1.0; - explicit #calc "$value*$../thermo:rho.air1/explicit"; - implicit 0; - } + f1.air1 0; + f2.air1 0; + f3.air1 1; + f4.air1 0; + f5.air1 0; + U.air1 (0 0 0); } } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas2.bubbles b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas2.bubbles rename to tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas index 59297ea83b..c82a39ba8f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas2.bubbles +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.gas.bubbles; + object f.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas.bubbles b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas.bubbles rename to tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas index 59297ea83b..c82a39ba8f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/0/f.gas.bubbles +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.gas.bubbles; + object f.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas.bubbles b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas2 similarity index 97% rename from tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas.bubbles rename to tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas2 index 59297ea83b..c82a39ba8f 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas.bubbles +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/0/f.gas2 @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object f.gas.bubbles; + object f.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/f.particles.aggregates b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/f.particles similarity index 96% rename from tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/f.particles.aggregates rename to tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/f.particles index 203f0db6d6..b4050e79f2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/f.particles.aggregates +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/0/f.particles @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.particles.aggregates; + object f.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/f.particles.aggregates b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/f.particles similarity index 96% rename from tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/f.particles.aggregates rename to tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/f.particles index 203f0db6d6..b4050e79f2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/f.particles.aggregates +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/0/f.particles @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object f.particles.aggregates; + object f.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //