From 62c782367d8afc8caacc44a3064f8ffc0c79358c Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 11 Jun 2021 14:16:22 +0100 Subject: [PATCH] multiphaseEulerFoam: Formatting improvements to population balance test cases Patch contributed by Institute of Fluid Dynamics, Helmholtz-Zentrum Dresden - Rossendorf (HZDR) --- .../populationBalance/binaryBreakup/0/T.air1 | 11 ++-- .../populationBalance/binaryBreakup/0/T.air2 | 11 ++-- .../populationBalance/binaryBreakup/0/T.air3 | 11 ++-- .../populationBalance/binaryBreakup/0/T.water | 11 ++-- .../populationBalance/binaryBreakup/0/U.air1 | 7 +-- .../populationBalance/binaryBreakup/0/U.air2 | 7 +-- .../populationBalance/binaryBreakup/0/U.air3 | 7 +-- .../populationBalance/binaryBreakup/0/U.water | 7 +-- .../binaryBreakup/0/alpha.air1 | 4 +- .../binaryBreakup/0/alpha.air2 | 4 +- .../binaryBreakup/0/alpha.air3 | 4 +- .../binaryBreakup/0/alpha.water | 5 +- .../populationBalance/binaryBreakup/0/f.air1 | 4 +- .../populationBalance/binaryBreakup/0/f.air2 | 4 +- .../populationBalance/binaryBreakup/0/f.air3 | 4 +- .../populationBalance/binaryBreakup/0/p | 11 ++-- .../populationBalance/binaryBreakup/0/p_rgh | 11 ++-- .../populationBalance/binaryBreakup/Allclean | 6 +- .../populationBalance/binaryBreakup/Allrun | 11 ++-- .../binaryBreakup/constant/g | 1 - .../constant/thermophysicalProperties.air1 | 2 - .../constant/thermophysicalProperties.air2 | 2 - .../constant/thermophysicalProperties.air3 | 2 - .../constant/thermophysicalProperties.water | 6 +- .../binaryBreakup/system/blockMeshDict | 1 + .../binaryBreakup/system/fvSchemes | 2 +- .../binaryBreakup/system/fvSolution | 8 +-- .../binaryBreakup/validation/createGraphs | 10 ++-- .../populationBalance/breakup/0/T.air1 | 11 ++-- .../populationBalance/breakup/0/T.air2 | 11 ++-- .../populationBalance/breakup/0/T.air3 | 11 ++-- .../populationBalance/breakup/0/T.water | 11 ++-- .../populationBalance/breakup/0/U.air1 | 7 +-- .../populationBalance/breakup/0/U.air2 | 7 +-- .../populationBalance/breakup/0/U.air3 | 7 +-- .../populationBalance/breakup/0/U.water | 7 +-- .../populationBalance/breakup/0/alpha.air1 | 4 +- .../populationBalance/breakup/0/alpha.air2 | 4 +- .../populationBalance/breakup/0/alpha.air3 | 4 +- .../populationBalance/breakup/0/alpha.water | 5 +- .../populationBalance/breakup/0/f.air1 | 4 +- .../populationBalance/breakup/0/f.air2 | 4 +- .../populationBalance/breakup/0/f.air3 | 4 +- .../populationBalance/breakup/0/p | 11 ++-- .../populationBalance/breakup/0/p_rgh | 11 ++-- .../populationBalance/breakup/Allclean | 6 +- .../populationBalance/breakup/Allrun | 11 ++-- .../populationBalance/breakup/constant/g | 1 - .../constant/thermophysicalProperties.air1 | 2 - .../constant/thermophysicalProperties.air2 | 2 - .../constant/thermophysicalProperties.air3 | 2 - .../constant/thermophysicalProperties.water | 6 +- .../breakup/system/blockMeshDict | 1 + .../breakup/system/fvSchemes | 2 +- .../breakup/system/fvSolution | 8 +-- .../breakup/validation/createGraphs | 10 ++-- .../populationBalance/coalescence/0/T.air1 | 11 ++-- .../populationBalance/coalescence/0/T.air2 | 11 ++-- .../populationBalance/coalescence/0/T.air3 | 11 ++-- .../populationBalance/coalescence/0/T.water | 11 ++-- .../populationBalance/coalescence/0/U.air1 | 7 +-- .../populationBalance/coalescence/0/U.air2 | 7 +-- .../populationBalance/coalescence/0/U.air3 | 7 +-- .../populationBalance/coalescence/0/U.water | 7 +-- .../coalescence/0/alpha.air1 | 4 +- .../coalescence/0/alpha.air2 | 4 +- .../coalescence/0/alpha.air3 | 4 +- .../coalescence/0/alpha.water | 5 +- .../populationBalance/coalescence/0/f.air1 | 4 +- .../populationBalance/coalescence/0/f.air2 | 4 +- .../populationBalance/coalescence/0/f.air3 | 4 +- .../populationBalance/coalescence/0/p | 11 ++-- .../populationBalance/coalescence/0/p_rgh | 11 ++-- .../populationBalance/coalescence/Allclean | 6 +- .../populationBalance/coalescence/Allrun | 11 ++-- .../populationBalance/coalescence/constant/g | 1 - .../constant/thermophysicalProperties.air1 | 2 - .../constant/thermophysicalProperties.air2 | 2 - .../constant/thermophysicalProperties.air3 | 2 - .../constant/thermophysicalProperties.water | 6 +- .../coalescence/system/blockMeshDict | 1 + .../coalescence/system/fvSchemes | 2 +- .../coalescence/system/fvSolution | 8 +-- .../coalescence/validation/createGraphs | 8 +-- .../populationBalance/drift/0/T.air | 11 ++-- .../populationBalance/drift/0/T.water | 11 ++-- .../populationBalance/drift/0/U.air | 7 +-- .../populationBalance/drift/0/U.water | 7 +-- .../populationBalance/drift/0/alpha.air | 6 +- .../populationBalance/drift/0/f.air | 4 +- .../populationBalance/drift/0/p | 11 ++-- .../populationBalance/drift/0/p_rgh | 11 ++-- .../populationBalance/drift/Allclean | 6 +- .../populationBalance/drift/Allrun | 11 ++-- .../populationBalance/drift/constant/fvModels | 7 +-- .../populationBalance/drift/constant/g | 1 - .../drift/constant/phaseProperties | 60 +++++++++---------- .../constant/thermophysicalProperties.air | 5 +- .../constant/thermophysicalProperties.water | 5 +- .../drift/system/blockMeshDict | 17 +++--- .../populationBalance/drift/system/fvSchemes | 2 +- .../populationBalance/drift/system/fvSolution | 1 - .../drift/validation/createGraphs | 14 ++--- .../isothermalGrowth/0/T.air1 | 1 + .../isothermalGrowth/0/T.water | 1 + .../isothermalGrowth/0/U.air1 | 1 + .../isothermalGrowth/0/U.water | 1 + .../isothermalGrowth/0/alpha.air1 | 1 + .../isothermalGrowth/0/alpha.air2 | 1 + .../isothermalGrowth/0/alpha.air3 | 1 + .../isothermalGrowth/0/alpha.water | 1 + .../isothermalGrowth/0/f.air1 | 1 + .../isothermalGrowth/0/f.air2 | 1 + .../isothermalGrowth/0/f.air3 | 1 + .../populationBalance/isothermalGrowth/0/p | 1 + .../isothermalGrowth/0/p_rgh | 1 + .../isothermalGrowth/constant/fvModels | 2 +- .../isothermalGrowth/constant/g | 1 + .../isothermalGrowth/constant/hRef | 1 + .../constant/momentumTransport.air1 | 1 + .../constant/momentumTransport.air2 | 1 + .../constant/momentumTransport.air3 | 1 + .../constant/momentumTransport.water | 1 + .../constant/thermophysicalProperties.air1 | 1 + .../constant/thermophysicalProperties.air2 | 1 + .../constant/thermophysicalProperties.air3 | 1 + .../constant/thermophysicalProperties.water | 1 + .../isothermalGrowth/system/blockMeshDict | 1 + .../isothermalGrowth/system/controlDict | 37 ++++++------ .../isothermalGrowth/system/fvSchemes | 4 +- .../isothermalGrowth/system/fvSolution | 2 +- .../isothermalGrowth/system/topoSetDict | 1 + .../isothermalGrowth/validation/createGraphs | 16 +++-- .../populationBalance/negativeDrift/0/T.air | 11 ++-- .../populationBalance/negativeDrift/0/T.water | 11 ++-- .../populationBalance/negativeDrift/0/U.air | 7 +-- .../populationBalance/negativeDrift/0/U.water | 7 +-- .../negativeDrift/0/alpha.air | 6 +- .../populationBalance/negativeDrift/0/f.air | 4 +- .../populationBalance/negativeDrift/0/p | 11 ++-- .../populationBalance/negativeDrift/0/p_rgh | 11 ++-- .../populationBalance/negativeDrift/Allclean | 6 +- .../populationBalance/negativeDrift/Allrun | 11 ++-- .../negativeDrift/constant/fvModels | 9 ++- .../negativeDrift/constant/g | 1 - .../negativeDrift/constant/phaseProperties | 54 +++++++++-------- .../constant/thermophysicalProperties.air | 5 +- .../constant/thermophysicalProperties.water | 5 +- .../negativeDrift/system/blockMeshDict | 17 +++--- .../negativeDrift/system/fvSchemes | 2 +- .../negativeDrift/system/fvSolution | 1 - .../negativeDrift/validation/createGraphs | 14 ++--- .../0/T.air1 | 11 ++-- .../0/T.air2 | 11 ++-- .../0/T.air3 | 11 ++-- .../0/T.water | 11 ++-- .../0/U.air1 | 7 +-- .../0/U.air2 | 7 +-- .../0/U.air3 | 7 +-- .../0/U.water | 7 +-- .../0/alpha.air1 | 4 +- .../0/alpha.air2 | 4 +- .../0/alpha.air3 | 4 +- .../0/alpha.water | 5 +- .../0/f.air1 | 4 +- .../0/f.air2 | 4 +- .../0/f.air3 | 4 +- .../simultaneousCoalescenceAndBreakup/0/p | 11 ++-- .../simultaneousCoalescenceAndBreakup/0/p_rgh | 11 ++-- .../Allclean | 6 +- .../simultaneousCoalescenceAndBreakup/Allrun | 11 ++-- .../constant/g | 1 - .../constant/thermophysicalProperties.air1 | 2 - .../constant/thermophysicalProperties.air2 | 2 - .../constant/thermophysicalProperties.air3 | 2 - .../constant/thermophysicalProperties.water | 2 - .../system/blockMeshDict | 1 + .../system/fvSchemes | 2 +- .../system/fvSolution | 8 +-- .../validation/createGraphs | 20 +++---- 180 files changed, 523 insertions(+), 653 deletions(-) diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1 index 9fc0bf9aae..f650822453 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1 @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 0 1 0 0 0]; -internalField uniform 300; +internalField uniform 300; -boundaryField -{ -} +boundaryField {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2 index 3f1a11948d..640a8280ab 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2 @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 0 1 0 0 0]; -internalField uniform 300; +internalField uniform 300; -boundaryField -{ -} +boundaryField {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3 index f9395a7dda..05808a1637 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3 @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T.air3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 0 1 0 0 0]; -internalField uniform 300; +internalField uniform 300; -boundaryField -{ -} +boundaryField {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water index c678eb451c..b4ea29a60f 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 0 1 0 0 0]; -internalField uniform 300; +internalField uniform 300; -boundaryField -{ -} +boundaryField {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1 index 3fc39e1bdc..84f0747ec1 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1 @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; + location "0"; object U.air1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,8 +19,6 @@ dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0 0); -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2 index 8ac15fa83d..d1715da9b4 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2 @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; + location "0"; object U.air2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,8 +19,6 @@ dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0 0); -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3 index 99241ce7b8..ec585e1d04 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3 @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; + location "0"; object U.air3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,8 +19,6 @@ dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0 0); -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water index 85a2905d1c..326e870bd2 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; + location "0"; object U.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,8 +19,6 @@ dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0 0); -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1 index 9253947911..6005f7a187 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1 @@ -19,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 0; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2 index 4cef1edfe4..079497e274 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2 @@ -19,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 0; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3 index 3561b91e29..ee3adba9a5 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3 @@ -19,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 0.05; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water index a2927b04ae..cd3aafd822 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 0.95; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 index 394faa960a..c3f52c76e2 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 @@ -19,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 1.0; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 index 3e7e3883b3..27b0f27a7b 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 @@ -19,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 1.0; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 index a7ee501541..14454f3da9 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 @@ -19,8 +19,6 @@ dimensions [0 0 0 0 0 0 0]; internalField uniform 1.0; -boundaryField -{ -} +boundaryField {} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p index 75814dc0cb..9a9f4b636f 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 1e5; +internalField uniform 1e5; -boundaryField -{ -} +boundaryField {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh index fb9f37adc5..8744509a62 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 1e5; +internalField uniform 1e5; -boundaryField -{ -} +boundaryField {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean index a237612342..126f1dccce 100755 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean @@ -1,7 +1,11 @@ #!/bin/sh -cd ${0%/*} || exit 1 +# Run from this directory +cd "${0%/*}" || exit 1 +# Source clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f numberDensity.eps + +#------------------------------------------------------------------------------ diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun index 10a9274540..e3a4c6207e 100755 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun @@ -1,14 +1,13 @@ #!/bin/sh -cd ${0%/*} || exit 1 # run from this directory -# Source tutorial run functions +# Run from this directory +cd "${0%/*}" || exit 1 + +# Source run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Set application name -application=$(getApplication) - runApplication blockMesh -runApplication $application +runApplication $(getApplication) ( cd validation && ./createGraphs ) diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g index 24a8dfba51..716851f8f2 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g @@ -18,5 +18,4 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 0); - // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 index 50b70cf8dc..c16ea15668 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 @@ -30,7 +30,6 @@ mixture { specie { - nMoles 1; molWeight 28.9; } thermodynamics @@ -45,5 +44,4 @@ mixture } } - // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 index e74d22dc5d..b23344d0e8 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 @@ -30,7 +30,6 @@ mixture { specie { - nMoles 1; molWeight 28.9; } thermodynamics @@ -45,5 +44,4 @@ mixture } } - // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 index 3d725c0680..26bd163c0e 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 @@ -30,7 +30,6 @@ mixture { specie { - nMoles 1; molWeight 28.9; } thermodynamics @@ -45,5 +44,4 @@ mixture } } - // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water index 38a3615fad..397951e07c 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo eConst; + thermo hConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -30,7 +30,6 @@ mixture { specie { - nMoles 1; molWeight 18; } equationOfState @@ -39,7 +38,7 @@ mixture } thermodynamics { - Cv 4195; + Cp 4195; Hf 0; } transport @@ -49,5 +48,4 @@ mixture } } - // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict index 4e1960a31c..cc61afbb73 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; + location "system"; object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes index 656615a05a..c015424a5a 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { default none; - "div\(phi,alpha.*)" Gauss vanLeer; + "div\(phi,alpha.*\)" Gauss vanLeer; "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; "div\(alphaPhi.*,f.*\)" Gauss limitedLinear 1; diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution index 5c251621b0..904ef978ce 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution @@ -63,12 +63,6 @@ PIMPLE } relaxationFactors -{ - equations - { - "f.*" 1.0; - } -} - +{} // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs index 726eefb621..6f24463e18 100755 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs @@ -29,11 +29,11 @@ gnuplot<