zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardise on British spelling: -ize -> -ise

Browse Source 
OpenFOAM is predominantly written in Britain with British spelling conventions
so -ise is preferred to -ize.
This commit is contained in:
Henry Weller
2021-06-01 19:11:58 +01:00
parent 55f751641e
commit ee777e4083
345 changed files with 1190 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files → applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/files
View File

@ -1,5 +1,5 @@
adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
adjointShapeOptimizationFoam.C
adjointShapeOptimisationFoam.C
EXE = $(FOAM_APPBIN)/adjointShapeOptimizationFoam
EXE = $(FOAM_APPBIN)/adjointShapeOptimisationFoam

0
applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options → applications/solvers/incompressible/adjointShapeOptimisationFoam/Make/options
View File

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H → applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointContinuityErrs.H
View File

@ -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

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C → applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
View File

@ -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

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H → applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
View File

@ -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

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C → applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
View File

@ -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

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H → applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
View File

@ -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

4
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C → applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
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,

0
applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H → applications/solvers/incompressible/adjointShapeOptimisationFoam/createFields.H
View File

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H → applications/solvers/incompressible/adjointShapeOptimisationFoam/createPhia.H
View File

@ -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

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/initAdjointContinuityErrs.H → applications/solvers/incompressible/adjointShapeOptimisationFoam/initAdjointContinuityErrs.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C
View File

@ -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<Switch>("normalize", false);
normalise_ = dict.lookupOrDefault<Switch>("normalise", false);
densityFunction_ = dict.lookupOrDefault<Switch>("densityFunction", false);
geometric_ = dict.lookupOrDefault<Switch>("geometric", false);
maxOrder_ = dict.lookupOrDefault("maxOrder", 3);

8
applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
View File

@ -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_;

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
View File

@ -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

6
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H
View File

@ -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:

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
View File

@ -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

2
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
View File

@ -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)

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H
View File

@ -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:

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H
View File

@ -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

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H
View File

@ -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

6
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
View File

@ -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;
}

4
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H
View File

@ -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

2
applications/test/PackedList/Make/options
View File

@ -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

4
applications/test/PackedList/Test-PackedList.C
View File

@ -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<nBits>::max_value() << nl
<< " packing: " << PackedList<nBits>::packing() << nl
<< " utilization: " << (nBits * offset) << nl;
<< " utilisation: " << (nBits * offset) << nl;
Info<< " Masking:" << nl
<< " shift << "

6
applications/test/router/Test-processorRouter.C
View File

@ -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<const labelList&>(procNeighbours(mesh))
);
// Collect centres of individual meshes (for visualization only)
// Collect centres of individual meshes (for visualisation only)
Gather<point> 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.
//

3
applications/test/tokenise/Make/files Normal file
View File

@ -0,0 +1,3 @@
Test-tokenise.C
EXE = $(FOAM_USER_APPBIN)/Test-tokenise

3
applications/test/tokenise/Make/options Normal file
View File

@ -0,0 +1,3 @@
# Check for consistent behaviour with non-optimised code
EXE_INC = \
-DFULLDEBUG -g -O0

10
applications/test/tokenize/Test-tokenize.C → applications/test/tokenise/Test-tokenise.C
View File

@ -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";
}

3
applications/test/tokenize/Make/files
View File

@ -1,3 +0,0 @@
Test-tokenize.C
EXE = $(FOAM_USER_APPBIN)/Test-tokenize

3
applications/test/tokenize/Make/options
View File

@ -1,3 +0,0 @@
# Check for consistent behaviour with non-optimized code
EXE_INC = \
-DFULLDEBUG -g -O0

10
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -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<label>()
);
// Synchronize coupledWantedPatch across coupled patches.
// Synchronise coupledWantedPatch across coupled patches.
syncTools::syncFaceList
(
subsetter.subMesh(),
@ -1015,7 +1015,7 @@ int main(int argc, char *argv[])
maxEqOp<label>()
);
// Synchronize cyclicWantedPatch across coupled patches.
// Synchronise cyclicWantedPatch across coupled patches.
syncTools::syncFaceList
(
subsetter.subMesh(),
@ -1023,7 +1023,7 @@ int main(int argc, char *argv[])
maxEqOp<label>()
);
// Synchronize cyclicWantedPatch across coupled patches.
// Synchronise cyclicWantedPatch across coupled patches.
syncTools::syncFaceList
(
subsetter.subMesh(),

6
applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
View File

@ -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
@ -1611,7 +1611,7 @@ int main(int argc, char *argv[])
// Mark zone cells, used for finding faces
boolList zoneCell(pShapeMesh.nCells(), false);
// shift cell indizes by 1
// Shift cell indices by 1
label nr=0;
for (label celli = (start() - 1); celli < end(); celli++)
{
@ -1731,7 +1731,7 @@ int main(int argc, char *argv[])
cellSet internal(pShapeMesh, name, end() - start());
// shift cell indizes by 1
// Shift cell indices by 1
for (label celli = start() - 1; celli <= end() - 1; celli++)
{
internal.insert(celli);

26
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View File

@ -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
@ -247,16 +247,16 @@ void readPoints
void addAndExtend
(
DynamicList<label>& indizes,
DynamicList<label>& indices,
label celli,
label val
)
{
if (indizes.size() < (celli+1))
if (indices.size() < (celli+1))
{
indizes.setSize(celli+1,-1);
indices.setSize(celli+1,-1);
}
indizes[celli] = val;
indices[celli] = val;
}
// Reads cells section. Read region as well? Not handled yet but should just
@ -1228,15 +1228,15 @@ int main(int argc, char *argv[])
forAll(faceZones.toc(), cnt)
{
word name = faceZones.toc()[cnt];
const labelList& oldIndizes = faceZones[name];
labelList indizes(oldIndizes.size());
const labelList& oldindices = faceZones[name];
labelList indices(oldindices.size());
Info<< " Face Zone " << name << " " << tab
<< oldIndizes.size() << endl;
<< oldindices.size() << endl;
forAll(indizes, i)
forAll(indices, i)
{
const label old = oldIndizes[i];
const label old = oldindices[i];
label nouveau = -1;
label c1 = -1, c2 = -1;
if (faceToCell[0].found(old))
@ -1285,13 +1285,13 @@ int main(int argc, char *argv[])
}
}
assert(nouveau > -1);
indizes[i] = nouveau;
indices[i] = nouveau;
}
fZones[cnt] = new faceZone
(
faceZones.toc()[cnt],
indizes,
boolList(indizes.size(),false),
indices,
boolList(indices.size(),false),
cnt,
mesh.faceZones()
);

14
applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
View File

@ -394,8 +394,8 @@ int main(int argc, char *argv[])
pointAlignment() += norms[nI];
}
pointAlignment().normalize();
pointAlignment().orthogonalize();
pointAlignment().normalise();
pointAlignment().orthogonalise();
}
else
{
@ -421,8 +421,8 @@ int main(int argc, char *argv[])
pointAlignment() += norms[nI];
}
pointAlignment().normalize();
pointAlignment().orthogonalize();
pointAlignment().normalise();
pointAlignment().orthogonalise();
}
else
{
@ -558,8 +558,8 @@ int main(int argc, char *argv[])
newTriad += tmpTriad;
}
newTriad.normalize();
newTriad.orthogonalize();
newTriad.normalise();
newTriad.orthogonalise();
// newTriad = newTriad.sortxyz();
label nFixed = 0;
@ -596,7 +596,7 @@ int main(int argc, char *argv[])
}
}
newTriad.orthogonalize();
newTriad.orthogonalise();
}
else if (nFixed == 3)
{

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -214,8 +214,8 @@ Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
}
}
tri.normalize();
tri.orthogonalize();
tri.normalise();
tri.orthogonalise();
tri = tri.sortxyz();
alignment = tri;
@ -292,8 +292,8 @@ void Foam::cellShapeControl::cellSizeAndAlignment
}
}
tri.normalize();
tri.orthogonalize();
tri.normalise();
tri.orthogonalise();
tri = tri.sortxyz();
alignment = tri;
@ -314,7 +314,7 @@ void Foam::cellShapeControl::cellSizeAndAlignment
if (!v.set(dir) || size == 0)
{
// Force orthogonalization of triad.
// Force orthogonalisation of triad.
scalar dotProd = great;
if (dir == 0)
@ -336,8 +336,8 @@ void Foam::cellShapeControl::cellSizeAndAlignment
v[dir] = v[0] ^ v[1];
}
v.normalize();
v.orthogonalize();
v.normalise();
v.orthogonalise();
Pout<< "Dot prod = " << dotProd << endl;
Pout<< "Alignment = " << v << endl;

10
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -385,8 +385,8 @@ void Foam::searchableSurfaceControl::initialVertices
pointAlignment() += norms[nI];
}
pointAlignment().normalize();
pointAlignment().orthogonalize();
pointAlignment().normalise();
pointAlignment().orthogonalise();
}
else
{
@ -412,8 +412,8 @@ void Foam::searchableSurfaceControl::initialVertices
pointAlignment() += norms[nI];
}
pointAlignment().normalize();
pointAlignment().orthogonalize();
pointAlignment().normalise();
pointAlignment().orthogonalise();
}
else
{

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -273,7 +273,7 @@ void Foam::smoothAlignmentSolver::applyBoundaryConditions
}
}
t.orthogonalize();
t.orthogonalise();
}
else if (nFixed == 3)
{
@ -390,8 +390,8 @@ void Foam::smoothAlignmentSolver::smoothAlignments
const triad& oldTriad = alignments[pI];
triad& newTriad = triadAv[pI];
newTriad.normalize();
newTriad.orthogonalize();
newTriad.normalise();
newTriad.orthogonalise();
// Enforce the boundary conditions
const triad& fixedAlignment = fixedAlignments[pI];

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -277,12 +277,12 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating
masterPtVec
);
// Specialize for size = 1 && baffle
// Specialise for size = 1 && baffle
if (mag((normalDir & nextNormalDir) - 1) < small)
{
if (inside)
{
// Info<< "Specialize for size 1 and baffle" << endl;
// Info<< "Specialise for size 1 and baffle" << endl;
vector s = ppDist*(edDir ^ normal);

2
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/files
View File

@ -6,7 +6,7 @@
# $(MarchingCubes)/data_access.cpp
# $(MarchingCubes)/fparser.cpp
# $(MarchingCubes)/fpoptimizer.cpp
# $(MarchingCubes)/fpoptimiser.cpp
# $(MarchingCubes)/MarchingCubes.cpp
# $(MarchingCubes)/mc_draw.cpp
# $(MarchingCubes)/morton.cpp

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -190,7 +190,7 @@ void Foam::CV2D::insertSurfaceNearestPointPairs()
// // Find where point is on triangle.
// // Note tolerance needed is relative one
// // (used in comparing normalized [0..1] triangle coordinates).
// // (used in comparing normalised [0..1] triangle coordinates).
// label nearType, nearLabel;
// triPointRef
// (

4
applications/utilities/mesh/manipulation/checkMesh/checkTools.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -110,7 +110,7 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
<< " cell zones: " << mesh.cellZones().size() << nl
<< endl;
// Construct shape recognizers
// Construct shape recognisers
hexMatcher hex;
prismMatcher prism;
wedgeMatcher wedge;

2
applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
View File

@ -78,7 +78,7 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
<< " cell zones: " << mesh.cellZones().size() << nl
<< endl;
// Construct shape recognizers
// Construct shape recognisers
hexMatcher hex;
prismMatcher prism;
wedgeMatcher wedge;

2
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View File

@ -429,7 +429,7 @@ void syncPoints
// reduction not strictly necessary.
// reduce(hasTransformation, orOp<bool>());
// Synchronize multiple shared points.
// Synchronise multiple shared points.
const globalMeshData& pd = mesh.globalData();
if (pd.nGlobalPoints() > 0)

6
applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
View File

@ -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
@ -176,10 +176,10 @@ int main(int argc, char *argv[])
hasWarned = true;
WarningInFunction
<< "Unrecognized OBJ command " << cmd << nl
<< "Unrecognised OBJ command " << cmd << nl
<< "In line " << lineStream.str()
<< " at linenumber " << lineNo << nl
<< "Only recognized commands are 'v' and 'l'.\n"
<< "Only recognised commands are 'v' and 'l'.\n"
<< "If this is a surface command use surfaceConvert instead"
<< " to convert to a file format that can be read by VTK"
<< endl;

2
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -603,7 +603,7 @@ int main(int argc, char *argv[])
{
argList::addNote
(
"Renumber mesh to minimize bandwidth"
"Renumber mesh to minimise bandwidth"
);
#include "addRegionOption.H"

4
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -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
@ -563,7 +563,7 @@ bool doCommand
{
// Set will have been modified.
// Synchronize for coupled patches.
// Synchronise for coupled patches.
if (!noSync) currentSet.sync(mesh);
// Write

4
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -289,7 +289,7 @@ int main(int argc, char *argv[])
);
source().applyToSet(action, currentSet());
// Synchronize for coupled patches.
// Synchronise for coupled patches.
if (!noSync) currentSet().sync(mesh);
currentSet().write();
fileHandler().flush();
@ -324,7 +324,7 @@ int main(int argc, char *argv[])
// Combine new value of currentSet with old one.
currentSet().subset(oldSet());
// Synchronize for coupled patches.
// Synchronise for coupled patches.
if (!noSync) currentSet().sync(mesh);
currentSet().write();
fileHandler().flush();

4
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H
View File

@ -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
@ -75,7 +75,7 @@ void ensightLagrangianField
IOstream::streamFormat format
);
//- Write generalized field components
//- Write generalised field components
template<class Type>
void ensightVolField
(

4
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkOpenFOAMTupleRemap.H
View File

@ -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
@ -38,7 +38,7 @@ template<class Type>
inline void vtkOpenFOAMTupleRemap(float vec[]);
// Template specialization for symmTensor
// Template specialisation for symmTensor
template<>
inline void vtkOpenFOAMTupleRemap<Foam::symmTensor>(float vec[])
{

4
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
View File

@ -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
@ -108,7 +108,7 @@ class vtkPVFoam
{
// Private classes
//- Bookkeeping for GUI checklists and the multi-block organization
//- Bookkeeping for GUI checklists and the multi-block organisation
class arrayRange
{
const char *name_;

4
applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.H
View File

@ -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
@ -86,7 +86,7 @@ class vtkPVblockMesh
{
// Private classes
//- Bookkeeping for GUI checklists and the multi-block organization
//- Bookkeeping for GUI checklists and the multi-block organisation
class arrayRange
{
const char *name_;

4
applications/utilities/surface/surfaceClean/collapseBase.C
View File

@ -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
@ -387,7 +387,7 @@ static void markRegion
if (faceToEdge[facei] == -1 || collapseRegion[facei] != -1)
{
FatalErrorInFunction
<< "Problem : crossed into uncollapsed/regionized face"
<< "Problem : crossed into uncollapsed/regionised face"
<< abort(FatalError);
}

4
applications/utilities/surface/surfaceCoarsen/bunnylod/bunnygut.C
View File

@ -88,7 +88,7 @@ void DrawModelTriangles() {
int p0= Map(tri[i].v[0],render_num);
int p1= Map(tri[i].v[1],render_num);
int p2= Map(tri[i].v[2],render_num);
// note: serious optimization opportunity here,
// note: serious optimisation opportunity here,
// by sorting the triangles the following "continue"
// could have been made into a "break" statement.
if(p0==p1 || p1==p2 || p2==p0) continue;
@ -107,7 +107,7 @@ void DrawModelTriangles() {
// therefore just use 1 face normal (flat shading)
Vector nrml = (v1-v0) * (v2-v1); // cross product
if(0<magnitude(nrml)) {
glNormal3fv(normalize(nrml));
glNormal3fv(normalise(nrml));
}
glVertex3fv(v0);
glVertex3fv(v1);

4
applications/utilities/surface/surfaceCoarsen/bunnylod/progmesh.C
View File

@ -93,7 +93,7 @@ void Triangle::ComputeNormal(){
Vector v2=vertex[2]->position;
normal = (v1-v0)*(v2-v1);
if(magnitude(normal)==0)return;
normal = normalize(normal);
normal = normalise(normal);
}
void Triangle::ReplaceVertex(Vertex *vold,Vertex *vnew) {
assert(vold && vnew);
@ -275,7 +275,7 @@ Vertex *MinimumCostEdge(){
// Find the edge that when collapsed will affect model the least.
// This function actually returns a Vertex, the second vertex
// of the edge (collapse candidate) is stored in the vertex data.
// Serious optimization opportunity here: this function currently
// Serious optimisation opportunity here: this function currently
// does a sequential search through an unsorted list :-(
// Our algorithm could be O(n*lg(n)) instead of O(n*n)
Vertex *mn=vertices[0];

4
applications/utilities/surface/surfaceCoarsen/bunnylod/vector.C
View File

@ -11,10 +11,10 @@ float sqr(float a) {return a*a;}
float magnitude(Vector v) {
return float(sqrt(sqr(v.x) + sqr( v.y)+ sqr(v.z)));
}
Vector normalize(Vector v) {
Vector normalise(Vector v) {
float d=magnitude(v);
if (d==0) {
printf("Can't normalize ZERO vector\n");
printf("Can't normalise ZERO vector\n");
assert(0);
d=0.1f;
}

4
applications/utilities/surface/surfaceCoarsen/bunnylod/vector.h
View File

@ -19,7 +19,7 @@ class Vector {
};
float magnitude(Vector v);
Vector normalize(Vector v);
Vector normalise(Vector v);
Vector operator+(Vector v1,Vector v2);
Vector operator-(Vector v);
@ -48,7 +48,7 @@ class Quaternion{
float r,x,y,z;
Quaternion(){x=y=z=0.0f;r=1.0f;};
Quaternion(Vector v,float t){
v=normalize(v);
v=normalise(v);
r=float(cos(t/2.0));
v=v*float(sin(t/2.0));
x=v.x;

8
applications/utilities/surface/surfaceCoarsen/bunnylod/winmain.C
View File

@ -91,7 +91,7 @@ void ComputeMouseVector(){
float x = spread * (MouseX-Width/2.0f) /(Height/2.0f);
Vector v(x ,y,-1);
// v=UserOrientation *v;
v=normalize(v);
v=normalise(v);
MouseVector = v;
}
@ -109,7 +109,7 @@ Quaternion VirtualTrackBall(Vector cop,Vector cor,Vector dir1,Vector dir2) {
Vector nrml = cor - cop;
// since trackball proportional to distance from cop
float fudgefactor = 1.0f/(magnitude(nrml) * 0.25f);
nrml = normalize(nrml);
nrml = normalise(nrml);
float dist = -(nrml^cor);
Vector u= planelineintersection(nrml,dist,cop,cop+dir1);
u=u-cor;
@ -133,7 +133,7 @@ Quaternion VirtualTrackBall(Vector cop,Vector cor,Vector dir1,Vector dir2) {
if(m>1)m=1; // avoid potential floating point error
Quaternion q(Vector(1.0f,0.0f,0.0f),0.0f);
if(m>0 && (angle=(float)asin(m))>3.14/180) {
axis = normalize(axis);
axis = normalise(axis);
q=Quaternion(axis,angle);
}
return q;
@ -425,7 +425,7 @@ int APIENTRY WinMain(HINSTANCE hCurrentInst, HINSTANCE hPreviousInst,
PostString("Demo by Stan Melax (c)1998",5,-5,20);
PostString("Model by Viewpoint Datalabs (c)1996",5,-4,20);
char buf[128];
PostString("Mesh Reduction Algorithm (non-optimized)",1,0,5);
PostString("Mesh Reduction Algorithm (non-optimised)",1,0,5);
sprintf(buf,"was executed in %5.3f seconds",DeltaT);
PostString(buf,2,1,6);

4
applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
View File

@ -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
@ -164,7 +164,7 @@ int main(int argc, char *argv[])
int p1 = mapVertex(collapse_map, tri[i].v[1], render_num);
int p2 = mapVertex(collapse_map, tri[i].v[2], render_num);
// note: serious optimization opportunity here,
// note: serious optimisation opportunity here,
// by sorting the triangles the following "continue"
// could have been made into a "break" statement.
if (p0 == p1 || p1 == p2 || p2 == p0)

8
applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
View File

@ -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
@ -78,7 +78,7 @@ void dumpPoints(const triSurface& surf, const labelList& borderPoint)
fileName fName("borderPoints.obj");
Info<< "Dumping borderPoints as Lightwave .obj file to " << fName
<< "\nThis can be visualized with e.g. javaview (www.javaview.de)\n\n";
<< "\nThis can be visualised with e.g. javaview (www.javaview.de)\n\n";
OFstream os(fName);
@ -99,7 +99,7 @@ void dumpEdges(const triSurface& surf, const boolList& borderEdge)
fileName fName("borderEdges.obj");
Info<< "Dumping borderEdges as Lightwave .obj file to " << fName
<< "\nThis can be visualized with e.g. javaview (www.javaview.de)\n\n";
<< "\nThis can be visualised with e.g. javaview (www.javaview.de)\n\n";
OFstream os(fName);
@ -125,7 +125,7 @@ void dumpFaces
)
{
Info<< "Dumping connectedFaces as Lightwave .obj file to " << fName
<< "\nThis can be visualized with e.g. javaview (www.javaview.de)\n\n";
<< "\nThis can be visualised with e.g. javaview (www.javaview.de)\n\n";
OFstream os(fName);

6
bin/foamCleanTutorials
View File

@ -3,7 +3,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
@ -64,11 +64,11 @@ done
# (to avoid recursion)
if [ $# -eq 0 -a -f Allwclean ]
then
# Specialized script
# Specialised script
./Allwclean
elif [ $# -eq 0 -a -f Allclean ]
then
# Specialized script
# Specialised script
./Allclean
elif [ -d system ]
then

4
bin/tools/foamListBinDirs
View File

@ -3,7 +3,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
@ -57,7 +57,7 @@ archOptions="${2:-$WM_OPTIONS}"
exit 1
}
# base arch (w/o precision, optimization, etc)
# base arch (w/o precision, optimisation, etc)
# same as "$WM_ARCH$WM_COMPILER"
archCompiler=$(echo "$archOptions" | sed -e 's@[DS]P.*$@@')

4
bin/tools/foamListThirdPartyBinDirs
View File

@ -3,7 +3,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
@ -57,7 +57,7 @@ archOptions="${2:-$WM_OPTIONS}"
exit 1
}
# base arch (w/o precision, optimization, etc)
# base arch (w/o precision, optimisation, etc)
# same as "$WM_ARCH$WM_COMPILER"
archCompiler=$(echo "$archOptions" | sed -e 's@[DS]P.*$@@')

2
bin/tools/foamLog.db
View File

@ -15,7 +15,7 @@
#
#------------------------------------------------------------------------------
#- String to recognize new iteration by (usually same as 'Time')
#- String to recognise new iteration by (usually same as 'Time')
Separator/^[ \t]*Time = /Time =
#- Time value:

6
doc/Doxygen/Doxyfile
View File

@ -194,7 +194,7 @@ QT_AUTOBRIEF = NO
# tag to YES if you prefer the old behavior instead.
#
# Note that setting this tag to YES also means that rational rose comments are
# not recognized any more.
# not recognised any more.
# The default value is: NO.
MULTILINE_CPP_IS_BRIEF = NO
@ -2115,7 +2115,7 @@ HIDE_UNDOC_RELATIONS = YES
# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
# available from the path. This tool is part of Graphviz (see:
# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
# http://www.graphviz.org/), a graph visualisation toolkit from AT&T and Lucent
# Bell Labs. The other options in this section have no effect if this option is
# set to NO
# The default value is: NO.
@ -2334,7 +2334,7 @@ PLANTUML_INCLUDE_PATH =
# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
# that will be shown in the graph. If the number of nodes in a graph becomes
# larger than this value, doxygen will truncate the graph, which is visualized
# larger than this value, doxygen will truncate the graph, which is visualised
# by representing a node as a red box. Note that doxygen if the number of direct
# children of the root node in a graph is already larger than
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that

2
doc/codingStyleGuide.org
View File

@ -479,7 +479,7 @@
directories that only allows the initial comment block for the /.C/ files
through.
The layout of the application documentation has not yet been finalized,
The layout of the application documentation has not yet been finalised,
but foamToVTK shows an initial attempt.
*** Orthography

2
etc/caseDicts/postProcessing/visualization/streamlines → etc/caseDicts/postProcessing/visualisation/streamlines
View File

@ -10,7 +10,7 @@ Description
\*---------------------------------------------------------------------------*/
#includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
#includeEtc "caseDicts/postProcessing/visualisation/streamlines.cfg"
fields (U p);

0
etc/caseDicts/postProcessing/visualization/streamlines.cfg → etc/caseDicts/postProcessing/visualisation/streamlines.cfg
View File

2
etc/caseDicts/postProcessing/visualization/surfaces → etc/caseDicts/postProcessing/visualisation/surfaces
View File

@ -14,7 +14,7 @@ Description
\*---------------------------------------------------------------------------*/
#includeEtc "caseDicts/postProcessing/visualization/surfaces.cfg"
#includeEtc "caseDicts/postProcessing/visualisation/surfaces.cfg"
fields (p U);

0
etc/caseDicts/postProcessing/visualization/surfaces.cfg → etc/caseDicts/postProcessing/visualisation/surfaces.cfg
View File

4
etc/config.sh/bash_completion
View File

@ -49,7 +49,7 @@ _adiabaticFlameT_ ()
}
complete -o filenames -o nospace -F _adiabaticFlameT_ adiabaticFlameT
_adjointShapeOptimizationFoam_ ()
_adjointShapeOptimisationFoam_ ()
{
local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}"
@ -72,7 +72,7 @@ _adjointShapeOptimizationFoam_ ()
esac
COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
}
complete -o filenames -o nospace -F _adjointShapeOptimizationFoam_ adjointShapeOptimizationFoam
complete -o filenames -o nospace -F _adjointShapeOptimisationFoam_ adjointShapeOptimisationFoam
_ansysToFoam_ ()
{

4
src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.C
View File

@ -44,8 +44,8 @@ makeBaseMomentumTransportModel
#include "Stokes.H"
makeLaminarModel(Stokes);
#include "generalizedNewtonian.H"
makeLaminarModel(generalizedNewtonian);
#include "generalisedNewtonian.H"
makeLaminarModel(generalisedNewtonian);
#include "lambdaThixotropic.H"
makeLaminarModel(lambdaThixotropic);

4
src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C
View File

@ -44,8 +44,8 @@ makeBaseMomentumTransportModel
#include "Stokes.H"
makeLaminarModel(Stokes);
#include "generalizedNewtonian.H"
makeLaminarModel(generalizedNewtonian);
#include "generalisedNewtonian.H"
makeLaminarModel(generalisedNewtonian);
#include "lambdaThixotropic.H"
makeLaminarModel(lambdaThixotropic);

4
src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
View File

@ -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
@ -40,7 +40,7 @@ Description
simulate the behaviour of B.
This implementation is as described in the above paper except that the
triple correlation model of Donaldson is replaced with the generalized
triple correlation model of Donaldson is replaced with the generalised
gradient diffusion model of Daly and Harlow:
\verbatim
Daly, B. J., & Harlow, F. H. (1970).

18
src/MomentumTransportModels/momentumTransportModels/Make/files
View File

@ -62,14 +62,14 @@ RASBCs = RAS/derivedFvPatchFields
$(RASBCs)/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
$(RASBCs)/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
generalizedNewtonianViscosityModels = laminar/generalizedNewtonian/generalizedNewtonianViscosityModels
$(generalizedNewtonianViscosityModels)/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C
$(generalizedNewtonianViscosityModels)/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C
$(generalizedNewtonianViscosityModels)/CrossPowerLaw/CrossPowerLaw.C
$(generalizedNewtonianViscosityModels)/BirdCarreau/BirdCarreau.C
$(generalizedNewtonianViscosityModels)/Casson/Casson.C
$(generalizedNewtonianViscosityModels)/HerschelBulkley/HerschelBulkley.C
$(generalizedNewtonianViscosityModels)/powerLaw/powerLaw.C
$(generalizedNewtonianViscosityModels)/strainRateFunction/strainRateFunction.C
generalisedNewtonianViscosityModels = laminar/generalisedNewtonian/generalisedNewtonianViscosityModels
$(generalisedNewtonianViscosityModels)/generalisedNewtonianViscosityModel/generalisedNewtonianViscosityModel.C
$(generalisedNewtonianViscosityModels)/generalisedNewtonianViscosityModel/generalisedNewtonianViscosityModelNew.C
$(generalisedNewtonianViscosityModels)/CrossPowerLaw/CrossPowerLaw.C
$(generalisedNewtonianViscosityModels)/BirdCarreau/BirdCarreau.C
$(generalisedNewtonianViscosityModels)/Casson/Casson.C
$(generalisedNewtonianViscosityModels)/HerschelBulkley/HerschelBulkley.C
$(generalisedNewtonianViscosityModels)/powerLaw/powerLaw.C
$(generalisedNewtonianViscosityModels)/strainRateFunction/strainRateFunction.C
LIB = $(FOAM_LIBBIN)/libmomentumTransportModels

2
src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H
View File

@ -35,7 +35,7 @@ Description
Journal of fluid mechanics, 68(03), 537-566.
\endverbatim
Including the recommended generalized gradient diffusion model of
Including the recommended generalised gradient diffusion model of
Daly and Harlow:
\verbatim
Daly, B. J., & Harlow, F. H. (1970).

4
src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H
View File

@ -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
@ -25,7 +25,7 @@ Class
Foam::RASModels::RNGkEpsilon
Description
Renormalization group k-epsilon turbulence model for incompressible and
Renormalisation group k-epsilon turbulence model for incompressible and
compressible flows.
Reference:

2
src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H
View File

@ -36,7 +36,7 @@ Description
Journal of Fluid Mechanics, 227, 245-272.
\endverbatim
Including the generalized gradient diffusion model of
Including the generalised gradient diffusion model of
Daly and Harlow:
\verbatim
Daly, B. J., & Harlow, F. H. (1970).

4
src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ protected:
//- Maximum number of iterations to converge the lambda/thetat loop
label maxLambdaIter_;
//- Stabilization for division by the magnitude of the velocity
//- Stabilisation for division by the magnitude of the velocity
const dimensionedScalar deltaU_;

4
src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,7 +29,7 @@ Description
derivative of the stress tensor with support for multiple modes.
See http://en.wikipedia.org/wiki/Upper-convected_Maxwell_model
http://en.wikipedia.org/wiki/Generalized_Maxwell_model
http://en.wikipedia.org/wiki/Generalised_Maxwell_model
The model includes an additional viscosity (nu) from the transport
model from which it is instantiated, which makes it equivalent to

18
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.C → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonian.C
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "generalizedNewtonian.H"
#include "generalisedNewtonian.H"
#include "volFields.H"
#include "surfaceFields.H"
#include "fvcGrad.H"
@ -40,7 +40,7 @@ namespace laminarModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class BasicMomentumTransportModel>
generalizedNewtonian<BasicMomentumTransportModel>::generalizedNewtonian
generalisedNewtonian<BasicMomentumTransportModel>::generalisedNewtonian
(
const alphaField& alpha,
const rhoField& rho,
@ -63,7 +63,7 @@ generalizedNewtonian<BasicMomentumTransportModel>::generalizedNewtonian
viscosityModel_
(
generalizedNewtonianViscosityModel::New
generalisedNewtonianViscosityModel::New
(
this->coeffDict_
)
@ -92,7 +92,7 @@ generalizedNewtonian<BasicMomentumTransportModel>::generalizedNewtonian
template<class BasicMomentumTransportModel>
tmp<volScalarField>
generalizedNewtonian<BasicMomentumTransportModel>::strainRate() const
generalisedNewtonian<BasicMomentumTransportModel>::strainRate() const
{
return sqrt(2.0)*mag(symm(fvc::grad(this->U())));
}
@ -101,7 +101,7 @@ generalizedNewtonian<BasicMomentumTransportModel>::strainRate() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class BasicMomentumTransportModel>
bool generalizedNewtonian<BasicMomentumTransportModel>::read()
bool generalisedNewtonian<BasicMomentumTransportModel>::read()
{
viscosityModel_->read(this->coeffDict_);
@ -111,7 +111,7 @@ bool generalizedNewtonian<BasicMomentumTransportModel>::read()
template<class BasicMomentumTransportModel>
tmp<volScalarField>
generalizedNewtonian<BasicMomentumTransportModel>::nuEff() const
generalisedNewtonian<BasicMomentumTransportModel>::nuEff() const
{
return volScalarField::New
(
@ -123,7 +123,7 @@ generalizedNewtonian<BasicMomentumTransportModel>::nuEff() const
template<class BasicMomentumTransportModel>
tmp<scalarField>
generalizedNewtonian<BasicMomentumTransportModel>::nuEff
generalisedNewtonian<BasicMomentumTransportModel>::nuEff
(
const label patchi
) const
@ -133,7 +133,7 @@ generalizedNewtonian<BasicMomentumTransportModel>::nuEff
template<class BasicMomentumTransportModel>
void generalizedNewtonian<BasicMomentumTransportModel>::correct()
void generalisedNewtonian<BasicMomentumTransportModel>::correct()
{
nu_ = viscosityModel_->nu(this->nu(), strainRate());
laminarModel<BasicMomentumTransportModel>::correct();

32
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.H → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonian.H
View File

@ -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
@ -22,22 +22,22 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::laminarModels::generalizedNewtonian
Foam::laminarModels::generalisedNewtonian
Description
Momentum transport model for shear-dependent Non-Newtonian flow.
SourceFiles
generalizedNewtonian.C
generalisedNewtonian.C
\*---------------------------------------------------------------------------*/
#ifndef generalizedNewtonian_H
#define generalizedNewtonian_H
#ifndef generalisedNewtonian_H
#define generalisedNewtonian_H
#include "laminarModel.H"
#include "linearViscousStress.H"
#include "generalizedNewtonianViscosityModel.H"
#include "generalisedNewtonianViscosityModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -47,11 +47,11 @@ namespace laminarModels
{
/*---------------------------------------------------------------------------*\
Class generalizedNewtonian Declaration
Class generalisedNewtonian Declaration
\*---------------------------------------------------------------------------*/
template<class BasicMomentumTransportModel>
class generalizedNewtonian
class generalisedNewtonian
:
public linearViscousStress<laminarModel<BasicMomentumTransportModel>>
{
@ -61,7 +61,7 @@ protected:
// Protected data
//- Run-time selectable non-Newtonian viscosity model
autoPtr<generalizedNewtonianViscosityModel> viscosityModel_;
autoPtr<generalisedNewtonianViscosityModel> viscosityModel_;
//- The non-Newtonian viscosity field
volScalarField nu_;
@ -80,13 +80,13 @@ public:
//- Runtime type information
TypeName("generalizedNewtonian");
TypeName("generalisedNewtonian");
// Constructors
//- Construct from components
generalizedNewtonian
generalisedNewtonian
(
const alphaField& alpha,
const rhoField& rho,
@ -100,7 +100,7 @@ public:
// Selectors
//- Return a reference to the selected turbulence model
static autoPtr<generalizedNewtonian> New
static autoPtr<generalisedNewtonian> New
(
const alphaField& alpha,
const rhoField& rho,
@ -112,7 +112,7 @@ public:
//- Destructor
virtual ~generalizedNewtonian()
virtual ~generalisedNewtonian()
{}
@ -122,13 +122,13 @@ public:
virtual bool read();
//- Return the effective viscosity
// i.e. the generalizedNewtonian viscosity
// i.e. the generalisedNewtonian viscosity
virtual tmp<volScalarField> nuEff() const;
//- Return the effective viscosity on patch
virtual tmp<scalarField> nuEff(const label patchi) const;
//- Correct the generalizedNewtonian viscosity
//- Correct the generalisedNewtonian viscosity
virtual void correct();
};
@ -141,7 +141,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "generalizedNewtonian.C"
#include "generalisedNewtonian.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

16
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C
View File

@ -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
@ -33,12 +33,12 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
defineTypeNameAndDebug(BirdCarreau, 0);
addToRunTimeSelectionTable
(
generalizedNewtonianViscosityModel,
generalisedNewtonianViscosityModel,
BirdCarreau,
dictionary
);
@ -49,13 +49,13 @@ namespace generalizedNewtonianViscosityModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::laminarModels::generalizedNewtonianViscosityModels::BirdCarreau::
Foam::laminarModels::generalisedNewtonianViscosityModels::BirdCarreau::
BirdCarreau
(
const dictionary& viscosityProperties
)
:
generalizedNewtonianViscosityModel(viscosityProperties),
generalisedNewtonianViscosityModel(viscosityProperties),
nuInf_("nuInf", dimViscosity, 0),
k_("k", dimTime, 0),
tauStar_( "tauStar", dimViscosity/dimTime, 0),
@ -68,13 +68,13 @@ BirdCarreau
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::laminarModels::generalizedNewtonianViscosityModels::BirdCarreau::
bool Foam::laminarModels::generalisedNewtonianViscosityModels::BirdCarreau::
read
(
const dictionary& viscosityProperties
)
{
generalizedNewtonianViscosityModel::read(viscosityProperties);
generalisedNewtonianViscosityModel::read(viscosityProperties);
const dictionary& coeffs =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
@ -103,7 +103,7 @@ read
Foam::tmp<Foam::volScalarField>
Foam::laminarModels::generalizedNewtonianViscosityModels::BirdCarreau::
Foam::laminarModels::generalisedNewtonianViscosityModels::BirdCarreau::
nu
(
const volScalarField& nu0,

14
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H
View File

@ -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
@ -22,10 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::laminarModels::generalizedNewtonianViscosityModels::BirdCarreau
Foam::laminarModels::generalisedNewtonianViscosityModels::BirdCarreau
Description
Bird-Carreau generalized Newtonian viscosity model
Bird-Carreau generalised Newtonian viscosity model
The Bird-Carreau-Yasuda form is also supported if the optional \c a
coefficient is specified. \c a defaults to 2 for the Bird-Carreau model.
@ -67,7 +67,7 @@ SourceFiles
#ifndef BirdCarreau_H
#define BirdCarreau_H
#include "generalizedNewtonianViscosityModel.H"
#include "generalisedNewtonianViscosityModel.H"
#include "dimensionedScalar.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -76,7 +76,7 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
/*---------------------------------------------------------------------------*\
@ -85,7 +85,7 @@ namespace generalizedNewtonianViscosityModels
class BirdCarreau
:
public generalizedNewtonianViscosityModel
public generalisedNewtonianViscosityModel
{
// Private Data
@ -129,7 +129,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace generalizedNewtonianViscosityModels
} // End namespace generalisedNewtonianViscosityModels
} // End namespace laminarModels
} // End namespace Foam

16
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/Casson/Casson.C
View File

@ -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
@ -33,12 +33,12 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
defineTypeNameAndDebug(Casson, 0);
addToRunTimeSelectionTable
(
generalizedNewtonianViscosityModel,
generalisedNewtonianViscosityModel,
Casson,
dictionary
);
@ -49,12 +49,12 @@ namespace generalizedNewtonianViscosityModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::laminarModels::generalizedNewtonianViscosityModels::Casson::Casson
Foam::laminarModels::generalisedNewtonianViscosityModels::Casson::Casson
(
const dictionary& viscosityProperties
)
:
generalizedNewtonianViscosityModel(viscosityProperties),
generalisedNewtonianViscosityModel(viscosityProperties),
m_("m", dimViscosity, 0),
tau0_("tau0", dimViscosity/dimTime, 0),
nuMin_("nuMin", dimViscosity, 0),
@ -66,12 +66,12 @@ Foam::laminarModels::generalizedNewtonianViscosityModels::Casson::Casson
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::laminarModels::generalizedNewtonianViscosityModels::Casson::read
bool Foam::laminarModels::generalisedNewtonianViscosityModels::Casson::read
(
const dictionary& viscosityProperties
)
{
generalizedNewtonianViscosityModel::read(viscosityProperties);
generalisedNewtonianViscosityModel::read(viscosityProperties);
const dictionary& coeffs =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
@ -86,7 +86,7 @@ bool Foam::laminarModels::generalizedNewtonianViscosityModels::Casson::read
Foam::tmp<Foam::volScalarField>
Foam::laminarModels::generalizedNewtonianViscosityModels::Casson::
Foam::laminarModels::generalisedNewtonianViscosityModels::Casson::
nu
(
const volScalarField& nu0,

16
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/Casson/Casson.H
View File

@ -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
@ -22,16 +22,16 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::laminarModels::generalizedNewtonianViscosityModels::Casson
Foam::laminarModels::generalisedNewtonianViscosityModels::Casson
Description
Casson generalized Newtonian viscosity model
Casson generalised Newtonian viscosity model
References:
\verbatim
Casson, N. (1959).
Rheology of disperse systems.
In Proceedings of a Conference Organized by the
In Proceedings of a Conference Organised by the
British Society of Rheology.
Pergamon Press, New York.
@ -58,7 +58,7 @@ SourceFiles
#ifndef Casson_H
#define Casson_H
#include "generalizedNewtonianViscosityModel.H"
#include "generalisedNewtonianViscosityModel.H"
#include "dimensionedScalar.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -67,7 +67,7 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
@ -77,7 +77,7 @@ namespace generalizedNewtonianViscosityModels
class Casson
:
public generalizedNewtonianViscosityModel
public generalisedNewtonianViscosityModel
{
// Private Data
@ -120,7 +120,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace generalizedNewtonianViscosityModels
} // End namespace generalisedNewtonianViscosityModels
} // End namespace laminarModels
} // End namespace Foam

16
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C
View File

@ -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
@ -33,13 +33,13 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
defineTypeNameAndDebug(CrossPowerLaw, 0);
addToRunTimeSelectionTable
(
generalizedNewtonianViscosityModel,
generalisedNewtonianViscosityModel,
CrossPowerLaw,
dictionary
);
@ -50,13 +50,13 @@ namespace generalizedNewtonianViscosityModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::laminarModels::generalizedNewtonianViscosityModels::CrossPowerLaw::
Foam::laminarModels::generalisedNewtonianViscosityModels::CrossPowerLaw::
CrossPowerLaw
(
const dictionary& viscosityProperties
)
:
generalizedNewtonianViscosityModel(viscosityProperties),
generalisedNewtonianViscosityModel(viscosityProperties),
nuInf_("nuInf", dimViscosity, 0),
m_("m", dimTime, 0),
tauStar_( "tauStar", dimViscosity/dimTime, 0),
@ -68,13 +68,13 @@ CrossPowerLaw
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::laminarModels::generalizedNewtonianViscosityModels::CrossPowerLaw::
bool Foam::laminarModels::generalisedNewtonianViscosityModels::CrossPowerLaw::
read
(
const dictionary& viscosityProperties
)
{
generalizedNewtonianViscosityModel::read(viscosityProperties);
generalisedNewtonianViscosityModel::read(viscosityProperties);
const dictionary& coeffs =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
@ -97,7 +97,7 @@ read
Foam::tmp<Foam::volScalarField>
Foam::laminarModels::generalizedNewtonianViscosityModels::CrossPowerLaw::
Foam::laminarModels::generalisedNewtonianViscosityModels::CrossPowerLaw::
nu
(
const volScalarField& nu0,

14
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H
View File

@ -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
@ -22,10 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::laminarModels::generalizedNewtonianViscosityModels::CrossPowerLaw
Foam::laminarModels::generalisedNewtonianViscosityModels::CrossPowerLaw
Description
Cross-Power law generalized Newtonian viscosity model
Cross-Power law generalised Newtonian viscosity model
The strain rate coefficient can be specified either as the constant \c m or
the critical stress level at the transition to shear thinning \c
@ -62,7 +62,7 @@ SourceFiles
#ifndef CrossPowerLaw_H
#define CrossPowerLaw_H
#include "generalizedNewtonianViscosityModel.H"
#include "generalisedNewtonianViscosityModel.H"
#include "dimensionedScalar.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -71,7 +71,7 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
/*---------------------------------------------------------------------------*\
@ -80,7 +80,7 @@ namespace generalizedNewtonianViscosityModels
class CrossPowerLaw
:
public generalizedNewtonianViscosityModel
public generalisedNewtonianViscosityModel
{
// Private Data
@ -123,7 +123,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace generalizedNewtonianViscosityModels
} // End namespace generalisedNewtonianViscosityModels
} // End namespace laminarModels
} // End namespace Foam

16
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C
View File

@ -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
@ -33,13 +33,13 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
defineTypeNameAndDebug(HerschelBulkley, 0);
addToRunTimeSelectionTable
(
generalizedNewtonianViscosityModel,
generalisedNewtonianViscosityModel,
HerschelBulkley,
dictionary
);
@ -50,13 +50,13 @@ namespace generalizedNewtonianViscosityModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::laminarModels::generalizedNewtonianViscosityModels::HerschelBulkley::
Foam::laminarModels::generalisedNewtonianViscosityModels::HerschelBulkley::
HerschelBulkley
(
const dictionary& viscosityProperties
)
:
generalizedNewtonianViscosityModel(viscosityProperties),
generalisedNewtonianViscosityModel(viscosityProperties),
k_("k", dimViscosity, 0),
n_("n", dimless, 0),
tau0_("tau0", dimViscosity/dimTime, 0)
@ -67,13 +67,13 @@ HerschelBulkley
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::laminarModels::generalizedNewtonianViscosityModels::
bool Foam::laminarModels::generalisedNewtonianViscosityModels::
HerschelBulkley::read
(
const dictionary& viscosityProperties
)
{
generalizedNewtonianViscosityModel::read(viscosityProperties);
generalisedNewtonianViscosityModel::read(viscosityProperties);
const dictionary& coeffs =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
@ -87,7 +87,7 @@ HerschelBulkley::read
Foam::tmp<Foam::volScalarField>
Foam::laminarModels::generalizedNewtonianViscosityModels::HerschelBulkley::
Foam::laminarModels::generalisedNewtonianViscosityModels::HerschelBulkley::
nu
(
const volScalarField& nu0,

14
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H
View File

@ -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
@ -22,10 +22,10 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::laminarModels::generalizedNewtonianViscosityModels::HerschelBulkley
Foam::laminarModels::generalisedNewtonianViscosityModels::HerschelBulkley
Description
Herschel-Bulkley generalized Newtonian viscosity model
Herschel-Bulkley generalised Newtonian viscosity model
SourceFiles
HerschelBulkley.C
@ -35,7 +35,7 @@ SourceFiles
#ifndef HerschelBulkley_H
#define HerschelBulkley_H
#include "generalizedNewtonianViscosityModel.H"
#include "generalisedNewtonianViscosityModel.H"
#include "dimensionedScalar.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,7 +44,7 @@ namespace Foam
{
namespace laminarModels
{
namespace generalizedNewtonianViscosityModels
namespace generalisedNewtonianViscosityModels
{
/*---------------------------------------------------------------------------*\
@ -53,7 +53,7 @@ namespace generalizedNewtonianViscosityModels
class HerschelBulkley
:
public generalizedNewtonianViscosityModel
public generalisedNewtonianViscosityModel
{
// Private Data
@ -95,7 +95,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace generalizedNewtonianViscosityModels
} // End namespace generalisedNewtonianViscosityModels
} // End namespace laminarModels
} // End namespace Foam

14
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/generalisedNewtonianViscosityModel/generalisedNewtonianViscosityModel.C
View File

@ -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
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "generalizedNewtonianViscosityModel.H"
#include "generalisedNewtonianViscosityModel.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -31,16 +31,16 @@ namespace Foam
{
namespace laminarModels
{
defineTypeNameAndDebug(generalizedNewtonianViscosityModel, 0);
defineRunTimeSelectionTable(generalizedNewtonianViscosityModel, dictionary);
defineTypeNameAndDebug(generalisedNewtonianViscosityModel, 0);
defineRunTimeSelectionTable(generalisedNewtonianViscosityModel, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::laminarModels::generalizedNewtonianViscosityModel::
generalizedNewtonianViscosityModel
Foam::laminarModels::generalisedNewtonianViscosityModel::
generalisedNewtonianViscosityModel
(
const dictionary& viscosityProperties
)
@ -51,7 +51,7 @@ generalizedNewtonianViscosityModel
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::laminarModels::generalizedNewtonianViscosityModel::read
bool Foam::laminarModels::generalisedNewtonianViscosityModel::read
(
const dictionary& viscosityProperties
)

38
src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H → src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/generalisedNewtonianViscosityModel/generalisedNewtonianViscosityModel.H
View File

@ -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
@ -22,26 +22,26 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Namespace
Foam::laminarModels::generalizedNewtonianViscosityModels
Foam::laminarModels::generalisedNewtonianViscosityModels
Description
A namespace for various generalized Newtonian viscosity model
A namespace for various generalised Newtonian viscosity model
implementations.
Class
Foam::laminarModels::generalizedNewtonianViscosityModel
Foam::laminarModels::generalisedNewtonianViscosityModel
Description
An abstract base class for generalized Newtonian viscosity models.
An abstract base class for generalised Newtonian viscosity models.
SourceFiles
generalizedNewtonianViscosityModel.C
generalizedNewtonianViscosityModelNew.C
generalisedNewtonianViscosityModel.C
generalisedNewtonianViscosityModelNew.C
\*---------------------------------------------------------------------------*/
#ifndef generalizedNewtonianViscosityModel_H
#define generalizedNewtonianViscosityModel_H
#ifndef generalisedNewtonianViscosityModel_H
#define generalisedNewtonianViscosityModel_H
#include "dictionary.H"
#include "volFieldsFwd.H"
@ -55,10 +55,10 @@ namespace laminarModels
{
/*---------------------------------------------------------------------------*\
Class generalizedNewtonianViscosityModel Declaration
Class generalisedNewtonianViscosityModel Declaration
\*---------------------------------------------------------------------------*/
class generalizedNewtonianViscosityModel
class generalisedNewtonianViscosityModel
{
protected:
@ -70,7 +70,7 @@ protected:
public:
//- Runtime type information
TypeName("generalizedNewtonianViscosityModel");
TypeName("generalisedNewtonianViscosityModel");
// Declare run-time constructor selection table
@ -78,7 +78,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr,
generalizedNewtonianViscosityModel,
generalisedNewtonianViscosityModel,
dictionary,
(
const dictionary& viscosityProperties
@ -90,7 +90,7 @@ public:
// Selectors
//- Return a reference to the selected viscosity model
static autoPtr<generalizedNewtonianViscosityModel> New
static autoPtr<generalisedNewtonianViscosityModel> New
(
const dictionary& viscosityProperties
);
@ -99,20 +99,20 @@ public:
// Constructors
//- Construct from components
generalizedNewtonianViscosityModel
generalisedNewtonianViscosityModel
(
const dictionary& viscosityProperties
);
//- Disallow default bitwise copy construction
generalizedNewtonianViscosityModel
generalisedNewtonianViscosityModel
(
const generalizedNewtonianViscosityModel&
const generalisedNewtonianViscosityModel&
);
//- Destructor
virtual ~generalizedNewtonianViscosityModel()
virtual ~generalisedNewtonianViscosityModel()
{}
@ -138,7 +138,7 @@ public:
// Member Operators
//- Disallow default bitwise assignment
void operator=(const generalizedNewtonianViscosityModel&) = delete;
void operator=(const generalisedNewtonianViscosityModel&) = delete;
};

Some files were not shown because too many files have changed in this diff Show More