diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files b/applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/files similarity index 61% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/files index d42156d410..455d6af1db 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/files @@ -1,5 +1,5 @@ adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C -adjointShapeOptimizationFoam.C +adjointShapeOptimisationFoam.C -EXE = $(FOAM_APPBIN)/adjointShapeOptimizationFoam +EXE = $(FOAM_APPBIN)/adjointShapeOptimisationFoam diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/options similarity index 100% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/options diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointContinuityErrs.H similarity index 96% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointContinuityErrs.H index 3852b2ad97..8ca043cc72 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointContinuityErrs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C similarity index 98% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C index 1eb28e81a2..22d97bc719 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H similarity index 98% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H index b62f002470..ef27c34b07 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C similarity index 98% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C index d22db41465..587542c2f9 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H similarity index 98% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H index 683e5aa455..be373b8617 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C similarity index 99% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C index 475cb12fcf..47cfcce01c 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - adjointShapeOptimizationFoam + adjointShapeOptimisationFoam Description Steady-state solver for incompressible, turbulent flow of non-Newtonian @@ -31,7 +31,7 @@ Description References: \verbatim - "Implementation of a continuous adjoint for topology optimization of + "Implementation of a continuous adjoint for topology optimisation of ducted flows" C. Othmer, E. de Villiers, diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H similarity index 100% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H similarity index 96% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H index 1ad902f6bb..21a5bf7976 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/initAdjointContinuityErrs.H b/applications/solvers/incompressible/adjointShapeOptimisationFoam/initAdjointContinuityErrs.H similarity index 96% rename from applications/solvers/incompressible/adjointShapeOptimizationFoam/initAdjointContinuityErrs.H rename to applications/solvers/incompressible/adjointShapeOptimisationFoam/initAdjointContinuityErrs.H index 0c445fa1f8..f6819cb791 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/initAdjointContinuityErrs.H +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/initAdjointContinuityErrs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C index 543e6fe954..2db5149e9f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C @@ -250,7 +250,7 @@ void Foam::functionObjects::sizeDistribution::writeDistribution() } - if (normalize_) + if (normalise_) { if(sum(result) != 0) { @@ -460,7 +460,7 @@ bool Foam::functionObjects::sizeDistribution::read(const dictionary& dict) { fvMeshFunctionObject::read(dict); - normalize_ = dict.lookupOrDefault("normalize", false); + normalise_ = dict.lookupOrDefault("normalise", false); densityFunction_ = dict.lookupOrDefault("densityFunction", false); geometric_ = dict.lookupOrDefault("geometric", false); maxOrder_ = dict.lookupOrDefault("maxOrder", 3); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H index 744bcdd12c..682e4287d3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H @@ -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 @@ -57,7 +57,7 @@ Usage populationBalance | corresponding populationBalance | yes | functionType | number/volume/moments/stdDev | yes | coordinateType | used for density/moment calculation | yes | - normalize | normalize concentrations | no | no + normalise | normalise concentrations | no | no densityFunction | compute densityFunction | no | no logBased | use log of coordinate for density | no | no maxOrder | maxim order of moment output | no | 3 @@ -155,8 +155,8 @@ protected: //- List of volume-averaged diameters scalarField d_; - //- Normalize number/volume concentrations - Switch normalize_; + //- Normalise number/volume concentrations + Switch normalise_; //- Determines whether density function is calculated Switch densityFunction_; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H index cdd11c1b01..51f5af3301 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ Description Reference: \verbatim Enwald, H., Peirano, E., & Almstedt, A. E. (1996). - Eulerian two-phase flow theory applied to fluidization. + Eulerian two-phase flow theory applied to fluidisation. International Journal of Multiphase Flow, 22, 21-66. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H index d7e1467f72..8d3742985a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ Description Reference: \verbatim Enwald, H., Peirano, E., & Almstedt, A. E. (1996). - Eulerian two-phase flow theory applied to fluidization. + Eulerian two-phase flow theory applied to fluidisation. International Journal of Multiphase Flow, 22, 21-66. Eq. 106, p. 43. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H index e140c89867..46d085caa8 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ Description Reference: \verbatim Gidaspow, D. (1994). - Multiphase flow and fluidization: continuum and kinetic theory + Multiphase flow and fluidisation: continuum and kinetic theory descriptions. Academic press, New York. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H index bd648300cd..5fd4c9ff12 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,13 +30,13 @@ Description References: \verbatim Enwald, H., Peirano, E., & Almstedt, A. E. (1996). - Eulerian two-phase flow theory applied to fluidization. + Eulerian two-phase flow theory applied to fluidisation. International Journal of Multiphase Flow, 22, 21-66. This is identical to the Wen and Yu, Rowe model Table 3.6 p.56 in van Wachem, B. G. M. (2000). Derivation, implementation, and validation of computer simulation models - for gas-solid fluidized beds. + for gas-solid fluidised beds. PhD Thesis, TU Delft. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H index 1f90a8f833..a974769a44 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ Description Reference: \verbatim Enwald, H., Peirano, E., & Almstedt, A. E. (1996). - Eulerian two-phase flow theory applied to fluidization. + Eulerian two-phase flow theory applied to fluidisation. International Journal of Multiphase Flow, 22, 21-66. Eq. 86-87, p. 40. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H index b5c11c2727..304f13fabd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::heatTransferModels::Gunn Description - Gunn (1978) correlation for fixed and fluidized beds with Re < 10^5 + Gunn (1978) correlation for fixed and fluidised beds with Re < 10^5 and continuous phase fraction between 0.35 and 1. Reference: diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H index dd68ce2bb6..ba019f06f1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description \verbatim Reuge, N., Cadoret, L., Coufort-Saudejaud, C., Pannala, S., Syamlal, M., & Caussat, B. (2008). - Multifluid Eulerian modeling of dense gas–solids fluidized bed + Multifluid Eulerian modeling of dense gas–solids fluidised bed hydrodynamics: influence of the dissipation parameters. Chemical Engineering Science, 63(22), 5540-5551. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H index 05c961e5ae..91800ea4a7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description \verbatim Reuge, N., Cadoret, L., Coufort-Saudejaud, C., Pannala, S., Syamlal, M., & Caussat, B. (2008). - Multifluid Eulerian modeling of dense gas–solids fluidized bed + Multifluid Eulerian modeling of dense gas–solids fluidised bed hydrodynamics: influence of the dissipation parameters. Chemical Engineering Science, 63(22), 5540-5551. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 048c129f3d..fe8be86836 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -31,7 +31,7 @@ Description \verbatim van Wachem, B. G. M. (2000). Derivation, implementation, and validation of computer simulation models - for gas-solid fluidized beds. + for gas-solid fluidised beds. PhD Thesis, TU Delft. \endverbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H index fbb53828c1..abd8fad4d7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ Class Description Base class for modeling shape, i.e. a physical diameter of a sizeGroup. - This diameter may then be utilized for calculation of breakup, coalescence + This diameter may then be utilised for calculation of breakup, coalescence or drift rates, depending on the model implementation. SourceFiles diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H index 4857f0a220..38abb051a4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H @@ -68,7 +68,7 @@ class phaseModel label index_; //- Return the residual phase-fraction for given phase - // Used to stabilize the phase momentum as the phase-fraction -> 0 + // Used to stabilise the phase momentum as the phase-fraction -> 0 dimensionedScalar residualAlpha_; //- Optional maximum phase-fraction (e.g. packing limit) @@ -185,7 +185,7 @@ public: const phaseSystem& fluid() const; //- Return the residual phase-fraction for given phase - // Used to stabilize the phase momentum as the phase-fraction -> 0 + // Used to stabilise the phase momentum as the phase-fraction -> 0 const dimensionedScalar& residualAlpha() const; //- Return the maximum phase-fraction (e.g. packing limit) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H index 15b167e4f6..85f6014d57 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ Description \rho_c | Density of continuous phase [kg/m^3] \eta | Kolmogorov length scale [m] \Gamma(a,z) | Upper incomplete gamma function - Q(a,z) | Regularized upper incomplete gamma function + Q(a,z) | Regularised upper incomplete gamma function \Gamma(a) | Gamma function \endvartable diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H index 46d681ca74..f8fd78c2a2 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::diameterModels::coalescenceModels::BrownianCollisions Description - Model describing coagulation due to Brownian motion. Utilizes collisional + Model describing coagulation due to Brownian motion. Utilises collisional diameters and the Cunningham slip correction. The slip correction coefficient is implemented in the following form: diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H index 23ccd097ad..8e98c605a4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ Class Description Interpolation formula of Dahneke (1983) as presented by Otto et al. (1999). - Utilizes collisional diameters. + Utilises collisional diameters. References: \verbatim diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H index 5e4f1ce9dd..4949b4d65f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::diameterModels::coalescenceModels::ballisticCollisions Description - Model describing coagulation due to ballistic collisions. Utilizes + Model describing coagulation due to ballistic collisions. Utilises collisional diameters. SourceFiles diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H index 62de8663bd..a30b2be2d7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::diameterModels::coalescenceModels::turbulentShear Description - Model describing coagulation due to turbulent shear. Utilizes physical, i.e. + Model describing coagulation due to turbulent shear. Utilises physical, i.e. collisional diameters. SourceFiles diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C index 575c4e9d62..d0dca1d537 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -113,7 +113,7 @@ void Foam::diameterModels::nucleationModels::wallBoiling::precompute() << endl << " The nucleation rate in populationBalance " << popBal_.name() << " is set to zero." << endl - << " Adjust discretization over property space to" + << " Adjust discretisation over property space to" << " suppress this warning." << endl; } @@ -128,7 +128,7 @@ void Foam::diameterModels::nucleationModels::wallBoiling::precompute() << endl << " The nucleation rate in populationBalance " << popBal_.name() << " is set to zero." << endl - << " Adjust discretization over property space to" + << " Adjust discretisation over property space to" << " suppress this warning." << endl; } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H index ca214368e4..da83e1019e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H @@ -29,7 +29,7 @@ Description a class method (also called sectional or discrete method). The internal coordinate is set to the particle volume, so the equation is based on a transport equation of the volume-based number density function. The - discretization is done using the fixed pivot technique of Kumar and + discretisation is done using the fixed pivot technique of Kumar and Ramkrishna (1996). The source terms are written in a way that particle number and mass are preserved. Coalescence (coagulation), breakup, drift (growth and surface loss) as well as nucleation are supported. @@ -53,7 +53,7 @@ Description \verbatim Coalescence and breakup term formulation: Kumar, S., & Ramkrishna, D. (1996). - On the solution of population balance equations by discretization-I. A + On the solution of population balance equations by discretisation-I. A fixed pivot technique. Chemical Engineering Science, 51(8), 1311-1332. \endverbatim diff --git a/applications/test/PackedList/Make/options b/applications/test/PackedList/Make/options index 2b5401f1c0..dca846aef7 100644 --- a/applications/test/PackedList/Make/options +++ b/applications/test/PackedList/Make/options @@ -1,3 +1,3 @@ -# Check for consistent behaviour with non-optimized code +# Check for consistent behaviour with non-optimised code EXE_INC = \ -DFULLDEBUG -g -O0 diff --git a/applications/test/PackedList/Test-PackedList.C b/applications/test/PackedList/Test-PackedList.C index aa8992e45e..e70ecff790 100644 --- a/applications/test/PackedList/Test-PackedList.C +++ b/applications/test/PackedList/Test-PackedList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ inline void reportInfo() << "PackedList<" << nBits << ">" << nl << " max_value: " << PackedList::max_value() << nl << " packing: " << PackedList::packing() << nl - << " utilization: " << (nBits * offset) << nl; + << " utilisation: " << (nBits * offset) << nl; Info<< " Masking:" << nl << " shift << " diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C index 6182933325..9c1e9c51d0 100644 --- a/applications/test/router/Test-processorRouter.C +++ b/applications/test/router/Test-processorRouter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) static_cast(procNeighbours(mesh)) ); - // Collect centres of individual meshes (for visualization only) + // Collect centres of individual meshes (for visualisation only) Gather meshCentres(meshCentre(mesh)); if (!Pstream::master()) @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) // // Iterate over routing. Route as much as possible during each iteration - // and stop if all paths have been routed. No special ordering to maximize + // and stop if all paths have been routed. No special ordering to maximise // routing during one iteration. // diff --git a/applications/test/tokenise/Make/files b/applications/test/tokenise/Make/files new file mode 100644 index 0000000000..2a2d24f553 --- /dev/null +++ b/applications/test/tokenise/Make/files @@ -0,0 +1,3 @@ +Test-tokenise.C + +EXE = $(FOAM_USER_APPBIN)/Test-tokenise diff --git a/applications/test/tokenise/Make/options b/applications/test/tokenise/Make/options new file mode 100644 index 0000000000..dca846aef7 --- /dev/null +++ b/applications/test/tokenise/Make/options @@ -0,0 +1,3 @@ +# Check for consistent behaviour with non-optimised code +EXE_INC = \ + -DFULLDEBUG -g -O0 diff --git a/applications/test/tokenize/Test-tokenize.C b/applications/test/tokenise/Test-tokenise.C similarity index 92% rename from applications/test/tokenize/Test-tokenize.C rename to applications/test/tokenise/Test-tokenise.C index 3faff54b40..bb2f3d9907 100644 --- a/applications/test/tokenize/Test-tokenize.C +++ b/applications/test/tokenise/Test-tokenise.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License Application Description - Test the tokenizing of various things + Test the tokenising of various things \*---------------------------------------------------------------------------*/ #include "argList.H" @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) } } - Info<< "tokenized args " << repeat << " times in " + Info<< "tokenised args " << repeat << " times in " << timer.cpuTimeIncrement() << " s\n\n"; if (args.optionFound("file")) @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) if (count == 0) { - Info<< "tokenizing file: " << args["file"] << nl; + Info<< "tokenising file: " << args["file"] << nl; } while (is.good()) @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) } } - Info<< "tokenized file " << repeat << " times in " + Info<< "tokenised file " << repeat << " times in " << timer.cpuTimeIncrement() << " s\n\n"; } diff --git a/applications/test/tokenize/Make/files b/applications/test/tokenize/Make/files deleted file mode 100644 index b4ce91199e..0000000000 --- a/applications/test/tokenize/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -Test-tokenize.C - -EXE = $(FOAM_USER_APPBIN)/Test-tokenize diff --git a/applications/test/tokenize/Make/options b/applications/test/tokenize/Make/options deleted file mode 100644 index 2b5401f1c0..0000000000 --- a/applications/test/tokenize/Make/options +++ /dev/null @@ -1,3 +0,0 @@ -# Check for consistent behaviour with non-optimized code -EXE_INC = \ - -DFULLDEBUG -g -O0 diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index ae77014fb9..ad21d81632 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -999,7 +999,7 @@ int main(int argc, char *argv[]) // ~~~~~~~~~~~~~~~~~~~~~~ // - // Synchronize wantedPatch across coupled patches. + // Synchronise wantedPatch across coupled patches. syncTools::syncFaceList ( subsetter.subMesh(), @@ -1007,7 +1007,7 @@ int main(int argc, char *argv[]) maxEqOp