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

OpenFOAM: Rationalized the naming of scalar limits

Browse Source 
In early versions of OpenFOAM the scalar limits were simple macro replacements and the
names were capitalized to indicate this.  The scalar limits are now static
constants which is a huge improvement on the use of macros and for consistency
the names have been changed to camel-case to indicate this and improve
readability of the code:

    GREAT -> great
    ROOTGREAT -> rootGreat
    VGREAT -> vGreat
    ROOTVGREAT -> rootVGreat
    SMALL -> small
    ROOTSMALL -> rootSmall
    VSMALL -> vSmall
    ROOTVSMALL -> rootVSmall

The original capitalized are still currently supported but their use is
deprecated.
This commit is contained in:
Henry Weller
2018-01-25 09:46:37 +00:00
parent 2c882ab4a7
commit fc2b2d0c05
729 changed files with 2822 additions and 2809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/basic/potentialFoam/potentialFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -150,7 +150,7 @@ int main(int argc, char *argv[])
// Calculate the flow-direction filter tensor
volScalarField magSqrU(magSqr(U));
volSymmTensorField F(sqr(U)/(magSqrU + SMALL*average(magSqrU)));
volSymmTensorField F(sqr(U)/(magSqrU + small*average(magSqrU)));
// Calculate the divergence of the flow-direction filtered div(U*U)
// Filtering with the flow-direction generates a more reasonable

4
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -146,7 +146,7 @@ void PDRkEpsilon::correct()
volScalarField GR(drag.Gk());
volScalarField LI
(C4_*(Lobs + dimensionedScalar("minLength", dimLength, VSMALL)));
(C4_*(Lobs + dimensionedScalar("minLength", dimLength, vSmall)));
// Dissipation equation
tmp<fvScalarMatrix> epsEqn

4
applications/solvers/combustion/PDRFoam/bEqn.H
View File

@ -35,14 +35,14 @@ if (ign.ignited())
volScalarField mgb("mgb", mag(n));
dimensionedScalar dMgb("dMgb", mgb.dimensions(), SMALL);
dimensionedScalar dMgb("dMgb", mgb.dimensions(), small);
{
volScalarField bc(b*c);
dMgb += 1.0e-3*
(bc*mgb)().weightedAverage(mesh.V())
/(bc.weightedAverage(mesh.V()) + SMALL);
/(bc.weightedAverage(mesh.V()) + small);
}
mgb += dMgb;

10
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -91,14 +91,14 @@ Foam::laminarFlameSpeedModels::SCOPE::SCOPE
MaPolyL_(coeffsDict_.subDict("lowerMaPolynomial")),
MaPolyU_(coeffsDict_.subDict("upperMaPolynomial"))
{
SuPolyL_.ll = max(SuPolyL_.ll, LFL_) + SMALL;
SuPolyU_.ul = min(SuPolyU_.ul, UFL_) - SMALL;
SuPolyL_.ll = max(SuPolyL_.ll, LFL_) + small;
SuPolyU_.ul = min(SuPolyU_.ul, UFL_) - small;
SuPolyL_.lu = 0.5*(SuPolyL_.ul + SuPolyU_.ll);
SuPolyU_.lu = SuPolyL_.lu - SMALL;
SuPolyU_.lu = SuPolyL_.lu - small;
MaPolyL_.lu = 0.5*(MaPolyL_.ul + MaPolyU_.ll);
MaPolyU_.lu = MaPolyL_.lu - SMALL;
MaPolyU_.lu = MaPolyL_.lu - small;
if (debug)
{

4
applications/solvers/combustion/PDRFoam/setDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,7 +33,7 @@ Description
if (adjustTimeStep)
{
scalar maxDeltaTFact = maxCo/(CoNum + StCoNum + SMALL);
scalar maxDeltaTFact = maxCo/(CoNum + StCoNum + small);
scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
runTime.setDeltaT

4
applications/solvers/combustion/XiFoam/bEqn.H
View File

@ -17,8 +17,8 @@ if (ign.ignited())
dimensionedScalar dMgb = 1.0e-3*
(b*c*mgb)().weightedAverage(mesh.V())
/((b*c)().weightedAverage(mesh.V()) + SMALL)
+ dimensionedScalar("ddMgb", mgb.dimensions(), SMALL);
/((b*c)().weightedAverage(mesh.V()) + small)
+ dimensionedScalar("ddMgb", mgb.dimensions(), small);
mgb += dMgb;

16
applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,20 +33,20 @@ Description
if (adjustTimeStep)
{
if (CoNum == -GREAT)
if (CoNum == -great)
{
CoNum = SMALL;
CoNum = small;
}
if (DiNum == -GREAT)
if (DiNum == -great)
{
DiNum = SMALL;
DiNum = small;
}
const scalar TFactorFluid = maxCo/(CoNum + SMALL);
const scalar TFactorSolid = maxDi/(DiNum + SMALL);
const scalar TFactorFilm = maxCo/(surfaceFilm.CourantNumber() + SMALL);
const scalar TFactorFluid = maxCo/(CoNum + small);
const scalar TFactorSolid = maxDi/(DiNum + small);
const scalar TFactorFilm = maxCo/(surfaceFilm.CourantNumber() + small);
const scalar dt0 = runTime.deltaTValue();

12
applications/solvers/combustion/reactingFoam/setRDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,7 @@ License
scalar maxCo(readScalar(pimpleDict.lookup("maxCo")));
// Maximum time scale
scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great));
// Smoothing parameter (0-1) when smoothing iterations > 0
scalar rDeltaTSmoothingCoeff
@ -84,8 +84,8 @@ License
);
Info<< " Temperature = "
<< 1/(gMax(rDeltaTT.field()) + VSMALL) << ", "
<< 1/(gMin(rDeltaTT.field()) + VSMALL) << endl;
<< 1/(gMax(rDeltaTT.field()) + vSmall) << ", "
<< 1/(gMin(rDeltaTT.field()) + vSmall) << endl;
rDeltaT.ref() = max(rDeltaT(), rDeltaTT);
}
@ -136,8 +136,8 @@ License
if (foundY)
{
Info<< " Composition = "
<< 1/(gMax(rDeltaTY.field()) + VSMALL) << ", "
<< 1/(gMin(rDeltaTY.field()) + VSMALL) << endl;
<< 1/(gMax(rDeltaTY.field()) + vSmall) << ", "
<< 1/(gMin(rDeltaTY.field()) + vSmall) << endl;
rDeltaT.ref() = max(rDeltaT(), rDeltaTY);
}

4
applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -90,7 +90,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
{
if
(
mag(accommodationCoeff_) < SMALL
mag(accommodationCoeff_) < small
|| mag(accommodationCoeff_) > 2.0
)
{

4
applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -92,7 +92,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
{
if
(
mag(accommodationCoeff_) < SMALL
mag(accommodationCoeff_) < small
|| mag(accommodationCoeff_) > 2.0
)
{

2
applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H
View File

@ -20,7 +20,7 @@
scalar maxDeltaT
(
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great)
);
volScalarField rDeltaT0("rDeltaT0", rDeltaT);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleMultiRegionCourantNo.H
View File

@ -1,4 +1,4 @@
scalar CoNum = -GREAT;
scalar CoNum = -great;
forAll(fluidRegions, regionI)
{
CoNum = max

4
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
View File

@ -131,7 +131,7 @@ forAll(fluidRegions, i)
dimensionedScalar ghRef
(
mag(gFluid[i].value()) > SMALL
mag(gFluid[i].value()) > small
? gFluid[i]
& (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i]
: dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0)
@ -226,7 +226,7 @@ forAll(fluidRegions, i)
"rhoMax",
simpleDict,
dimDensity,
GREAT
great
)
)
);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
View File

@ -27,7 +27,7 @@
constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
dimensionedScalar compressibility = fvc::domainIntegrate(psi);
bool compressible = (compressibility.value() > SMALL);
bool compressible = (compressibility.value() > small);
// Solve pressure
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
View File

@ -1,4 +1,4 @@
scalar CoNum = -GREAT;
scalar CoNum = -great;
forAll(fluidRegions, regionI)
{

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
View File

@ -127,7 +127,7 @@ forAll(fluidRegions, i)
dimensionedScalar ghRef
(
mag(gFluid[i].value()) > SMALL
mag(gFluid[i].value()) > small
? gFluid[i]
& (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i]
: dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0)

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
View File

@ -1,6 +1,6 @@
bool closedVolume = p_rgh.needReference();
dimensionedScalar compressibility = fvc::domainIntegrate(psi);
bool compressible = (compressibility.value() > SMALL);
bool compressible = (compressibility.value() > small);
rho = thermo.rho();

12
applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,16 +31,16 @@ Description
if (adjustTimeStep)
{
if ((runTime.timeIndex() == 0) && ((CoNum > SMALL) || (DiNum > SMALL)))
if ((runTime.timeIndex() == 0) && ((CoNum > small) || (DiNum > small)))
{
if (CoNum < SMALL)
if (CoNum < small)
{
CoNum = SMALL;
CoNum = small;
}
if (DiNum < SMALL)
if (DiNum < small)
{
DiNum = SMALL;
DiNum = small;
}
runTime.setDeltaT

14
applications/solvers/heatTransfer/chtMultiRegionFoam/include/setMultiRegionDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,18 +33,18 @@ Description
if (adjustTimeStep)
{
if (CoNum == -GREAT)
if (CoNum == -great)
{
CoNum = SMALL;
CoNum = small;
}
if (DiNum == -GREAT)
if (DiNum == -great)
{
DiNum = SMALL;
DiNum = small;
}
scalar maxDeltaTFluid = maxCo/(CoNum + SMALL);
scalar maxDeltaTSolid = maxDi/(DiNum + SMALL);
scalar maxDeltaTFluid = maxCo/(CoNum + small);
scalar maxDeltaTSolid = maxDi/(DiNum + small);
scalar deltaTFluid =
min

2
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
View File

@ -1,4 +1,4 @@
scalar DiNum = -GREAT;
scalar DiNum = -great;
forAll(solidRegions, i)
{

4
applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -95,7 +95,7 @@ void Foam::adjointOutletVelocityFvPatchVectorField::updateCoeffs()
patch().lookupPatchField<volVectorField, vector>("U");
scalarField Un(mag(patch().nf() & Up));
vectorField UtHat((Up - patch().nf()*Un)/(Un + SMALL));
vectorField UtHat((Up - patch().nf()*Un)/(Un + small));
vectorField Uan(patch().nf()*(patch().nf() & patchInternalField()));

10
applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H
View File

@ -13,17 +13,17 @@
scalar uTau = ::sqrt(mag(tauw));
scalar yPlus = uTau*y[cellId]/(nu + ROOTVSMALL);
scalar yPlus = uTau*y[cellId]/(nu + rootVSmall);
scalar uPlus = magUp/(uTau + ROOTVSMALL);
scalar uPlus = magUp/(uTau + rootVSmall);
scalar nutPlus = nut/nu;
scalar kPlus = k/(sqr(uTau) + ROOTVSMALL);
scalar kPlus = k/(sqr(uTau) + rootVSmall);
scalar epsilonPlus = epsilon*nu/(pow4(uTau) + ROOTVSMALL);
scalar epsilonPlus = epsilon*nu/(pow4(uTau) + rootVSmall);
// scalar omegaPlus = omega*nu/(sqr(uTau) + ROOTVSMALL);
// scalar omegaPlus = omega*nu/(sqr(uTau) + rootVSmall);
scalar Rey = magUp*y[cellId]/nu;

8
applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,7 @@ License
scalar maxCo(readScalar(pimpleDict.lookup("maxCo")));
// Maximum time scale
scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great));
// Smoothing parameter (0-1) when smoothing iterations > 0
scalar rDeltaTSmoothingCoeff
@ -91,8 +91,8 @@ License
);
Info<< " Temperature = "
<< gMin(1/(rDeltaTT.field() + VSMALL)) << ", "
<< gMax(1/(rDeltaTT.field() + VSMALL)) << endl;
<< gMin(1/(rDeltaTT.field() + vSmall)) << ", "
<< gMax(1/(rDeltaTT.field() + vSmall)) << endl;
rDeltaT.ref() = max
(

4
applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ Description
if (adjustTimeStep)
{
const scalar maxDeltaTFact =
min(maxCo/(CoNum + SMALL), maxCo/(surfaceFilm.CourantNumber() + SMALL));
min(maxCo/(CoNum + small), maxCo/(surfaceFilm.CourantNumber() + small));
const scalar deltaTFact =
min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

8
applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,7 @@ License
scalar maxCo(readScalar(pimpleDict.lookup("maxCo")));
// Maximum time scale
scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great));
// Smoothing parameter (0-1) when smoothing iterations > 0
scalar rDeltaTSmoothingCoeff
@ -90,8 +90,8 @@ License
);
Info<< " Temperature = "
<< gMin(1/(rDeltaTT.field() + VSMALL)) << ", "
<< gMax(1/(rDeltaTT.field() + VSMALL)) << endl;
<< gMin(1/(rDeltaTT.field() + vSmall)) << ", "
<< gMax(1/(rDeltaTT.field() + vSmall)) << endl;
rDeltaT.ref() = max
(

2
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
View File

@ -59,7 +59,7 @@ dimensionedScalar rhoMax
"rhoMax",
simple.dict(),
dimDensity,
GREAT
great
)
);

2
applications/solvers/lagrangian/sprayFoam/createFields.H
View File

@ -59,7 +59,7 @@ dimensionedScalar rhoMax
"rhoMax",
pimple.dict(),
dimDensity,
GREAT
great
)
);

4
applications/solvers/multiphase/VoF/setDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ Description
if (adjustTimeStep)
{
scalar maxDeltaTFact =
min(maxCo/(CoNum + SMALL), maxAlphaCo/(alphaCoNum + SMALL));
min(maxCo/(CoNum + small), maxAlphaCo/(alphaCoNum + small));
scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

2
applications/solvers/multiphase/VoF/setRDeltaT.H
View File

@ -50,7 +50,7 @@
scalar maxDeltaT
(
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great)
);
volScalarField rDeltaT0("rDeltaT0", rDeltaT);

4
applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ Description
if (adjustTimeStep)
{
scalar maxDeltaTFact =
min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
min(maxCo/(CoNum + small), maxAcousticCo/(acousticCoNum + small));
scalar deltaTFact = min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);

6
applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,10 +32,10 @@ Description
if (adjustTimeStep)
{
if (CoNum > SMALL)
if (CoNum > small)
{
scalar maxDeltaTFact =
min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
min(maxCo/(CoNum + small), maxAcousticCo/(acousticCoNum + small));
runTime.setDeltaT
(

6
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -889,7 +889,7 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
scalar uTheta = tp().uTheta();
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
if (uTheta > small)
{
scalar thetaA = convertToRad*tp().thetaA(matched);
scalar thetaR = convertToRad*tp().thetaR(matched);
@ -909,7 +909,7 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
);
// Normalise nWall
nWall /= (mag(nWall) + SMALL);
nWall /= (mag(nWall) + small);
// Calculate Uwall resolved normal to the interface parallel to
// the interface

4
applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/BinghamPlastic/BinghamPlastic.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -106,7 +106,7 @@ Foam::mixtureViscosityModels::BinghamPlastic::mu
volScalarField mup(plastic::mu(muc));
dimensionedScalar tauySmall("tauySmall", tauy.dimensions(), SMALL);
dimensionedScalar tauySmall("tauySmall", tauy.dimensions(), small);
return min
(

4
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -73,7 +73,7 @@ void Foam::threePhaseInterfaceProperties::correctContactAngle
scalarField sumTwoPhaseAlpha
(
twoPhaseAlpha2 + twoPhaseAlpha3 + SMALL
twoPhaseAlpha2 + twoPhaseAlpha3 + small
);
twoPhaseAlpha2 /= sumTwoPhaseAlpha;

4
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -133,7 +133,7 @@ public:
return
(limitedAlpha2*sigma12_ + limitedAlpha3*sigma13_)
/(limitedAlpha2 + limitedAlpha3 + SMALL);
/(limitedAlpha2 + limitedAlpha3 + small);
}
tmp<volScalarField> sigmaK() const

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,7 +67,7 @@ int main(int argc, char *argv[])
(
"maxSlamVelocity",
dimVelocity,
fluid.lookupOrDefault<scalar>("maxSlamVelocity", GREAT)
fluid.lookupOrDefault<scalar>("maxSlamVelocity", great)
);
turbulence->validate();

6
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -296,7 +296,7 @@ void Foam::multiphaseSystem::correctContactAngle
scalar uTheta = tp().uTheta();
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
if (uTheta > small)
{
scalar thetaA = convertToRad*tp().thetaA(matched);
scalar thetaR = convertToRad*tp().thetaR(matched);
@ -316,7 +316,7 @@ void Foam::multiphaseSystem::correctContactAngle
);
// Normalise nWall
nWall /= (mag(nWall) + SMALL);
nWall /= (mag(nWall) + small);
// Calculate Uwall resolved normal to the interface parallel to
// the interface

6
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -459,7 +459,7 @@ void Foam::multiphaseMixture::correctContactAngle
scalar uTheta = tp().uTheta();
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
if (uTheta > small)
{
scalar thetaA = convertToRad*tp().thetaA(matched);
scalar thetaR = convertToRad*tp().thetaR(matched);
@ -479,7 +479,7 @@ void Foam::multiphaseMixture::correctContactAngle
);
// Normalise nWall
nWall /= (mag(nWall) + SMALL);
nWall /= (mag(nWall) + small);
// Calculate Uwall resolved normal to the interface parallel to
// the interface

6
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -93,7 +93,7 @@ alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
scalar df = 1 - 1.0/(ypt*kappa_*Prat[facei]);
scalar yptNew = ypt - f/df;
if (yptNew < VSMALL)
if (yptNew < vSmall)
{
ypsf[facei] = 0;
}
@ -194,7 +194,7 @@ alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::calcAlphat
scalar A = qDot[facei]*rhow[facei]*uTau[facei]*y[facei];
scalar B = qDot[facei]*Pr[facei]*yPlus[facei];
scalar C = Pr[facei]*0.5*rhow[facei]*uTau[facei]*sqr(magUp[facei]);
alphaEff = A/(B + C + VSMALL);
alphaEff = A/(B + C + vSmall);
}
else
{
@ -206,7 +206,7 @@ alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::calcAlphat
scalar C =
0.5*rhow[facei]*uTau[facei]
*(Prt_*sqr(magUp[facei]) + (Pr[facei] - Prt_)*sqr(magUc));
alphaEff = A/(B + C + VSMALL);
alphaEff = A/(B + C + vSmall);
}
// Update convective heat transfer turbulent thermal diffusivity

2
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
View File

@ -547,7 +547,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
const scalarField Al
(
fLiquid*4.8*exp( min(-Ja/80, log(VGREAT)))
fLiquid*4.8*exp( min(-Ja/80, log(vGreat)))
);
const scalarField A2(min(pi*sqr(dDep_)*N*Al/4, scalar(1)));

4
applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/IATEsource/wallBoiling.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
forAll(alphatw, facei)
{
if (dmdt[facei] > SMALL)
if (dmdt[facei] > small)
{
const label faceCelli = faceCells[facei];
R[faceCelli] =

8
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
View File

@ -185,8 +185,8 @@ update
(
sqr(X2)
*(
tau21*sqr(G21)/max(sqr(X1 + X2*G21), SMALL)
+ tau12*G12/max(sqr(X2 + X1*G12), SMALL)
tau21*sqr(G21)/max(sqr(X1 + X2*G21), small)
+ tau12*G12/max(sqr(X2 + X1*G12), small)
)
);
gamma2_ =
@ -194,8 +194,8 @@ update
(
sqr(X1)
*(
tau12*sqr(G12)/max(sqr(X2 + X1*G12), SMALL)
+ tau21*G21/max(sqr(X1 + X2*G21), SMALL)
tau12*sqr(G12)/max(sqr(X2 + X1*G12), small)
+ tau21*G21/max(sqr(X1 + X2*G21), small)
)
);
}

6
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -116,7 +116,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Yf
return
this->thermo_.Y()[speciesIndex]
*(scalar(1) - wRatioByP()*saturationModel_->pSat(Tf))
/max(scalar(1) - this->thermo_.Y()[saturatedIndex_], SMALL);
/max(scalar(1) - this->thermo_.Y()[saturatedIndex_], small);
}
}
@ -143,7 +143,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::YfPrime
return
- this->thermo_.Y()[speciesIndex]
*wRatioByP()*saturationModel_->pSatPrime(Tf)
/max(scalar(1) - this->thermo_.Y()[saturatedIndex_], SMALL);
/max(scalar(1) - this->thermo_.Y()[saturatedIndex_], small);
}
}

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.C
View File

@ -67,7 +67,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Lain::CdRe() const
return
neg(Re - 1.5)*16.0
+ pos0(Re - 1.5)*neg(Re - 80)*14.9*pow(Re, 0.22)
+ pos0(Re - 80)*neg(Re - 1500)*48*(1 - 2.21/sqrt(max(Re, SMALL)))
+ pos0(Re - 80)*neg(Re - 1500)*48*(1 - 2.21/sqrt(max(Re, small)))
+ pos0(Re - 1500)*2.61*Re;
}

4
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,7 +67,7 @@ Foam::virtualMassModels::Lamb::~Lamb()
Foam::tmp<Foam::volScalarField> Foam::virtualMassModels::Lamb::Cvm() const
{
volScalarField E(min(max(pair_.E(), SMALL), 1 - SMALL));
volScalarField E(min(max(pair_.E(), small), 1 - small));
volScalarField rtOmEsq(sqrt(1 - sqr(E)));
return

6
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -128,7 +128,7 @@ Foam::tmp<Foam::volScalarField> Foam::blendingMethods::linear::f1
max
(
(phase2 - minPartAlpha)
/(minFullAlpha - minPartAlpha + SMALL),
/(minFullAlpha - minPartAlpha + small),
scalar(0)
),
scalar(1)
@ -153,7 +153,7 @@ Foam::tmp<Foam::volScalarField> Foam::blendingMethods::linear::f2
max
(
(phase1 - minPartAlpha)
/(minFullAlpha - minPartAlpha + SMALL),
/(minFullAlpha - minPartAlpha + small),
scalar(0)
),
scalar(1)

8
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
View File

@ -108,7 +108,7 @@ HeatAndMassTransferPhaseSystem
(
"small",
heatTransferModel::dimK,
SMALL
small
)
),
zeroGradientFvPatchScalarField::typeName
@ -258,7 +258,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
/max
(
K1 + K2,
dimensionedScalar("small", heatTransferModel::dimK, SMALL)
dimensionedScalar("small", heatTransferModel::dimK, small)
)
);
@ -360,8 +360,8 @@ void Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::correctThermo()
);
// Limit the H[12] to avoid /0
H1.max(SMALL);
H2.max(SMALL);
H1.max(small);
H2.max(small);
Tf = (H1*T1 + H2*T2)/(H1 + H2);

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
View File

@ -470,7 +470,7 @@ correctThermo()
volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K());
volScalarField H2(this->heatTransferModels_[pair][pair.second()]->K());
dimensionedScalar HSmall("small", heatTransferModel::dimK, SMALL);
dimensionedScalar HSmall("small", heatTransferModel::dimK, small);
volScalarField mDotL
(

4
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
View File

@ -553,8 +553,8 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
);
// Limit the H[12] to avoid /0
H1.max(SMALL);
H2.max(SMALL);
H1.max(small);
H2.max(small);
Tf = (H1*T1 + H2*T2 + iDmdtNew*L)/(H1 + H2);

4
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C
View File

@ -74,7 +74,7 @@ Foam::diameterModels::velocityGroup::secondMoment() const
const sizeGroup& fi = sizeGroups_[i];
m2 += sqr(fi.d())*formFactor()*fi
*max(fi.phase(), SMALL)/fi.x();
*max(fi.phase(), small)/fi.x();
}
return tm2;
@ -106,7 +106,7 @@ Foam::diameterModels::velocityGroup::thirdMoment() const
const sizeGroup& fi = sizeGroups_[i];
m3 += pow3(fi.d())*formFactor()*fi
*max(fi.phase(), SMALL)/fi.x();
*max(fi.phase(), small)/fi.x();
}
return tm3;

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C
View File

@ -103,7 +103,7 @@ void Foam::diameterModels::driftModels::phaseChange::correct()
{
const sizeGroup& fi = *popBal_.sizeGroups()[i];
N_ += fi*max(fi.phase(), SMALL)/fi.x();
N_ += fi*max(fi.phase(), small)/fi.x();
}
}

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
View File

@ -178,7 +178,7 @@ nucleationRate
forAll(alphatw, facei)
{
if (dmdt[facei] > SMALL)
if (dmdt[facei] > small)
{
const label faceCelli = faceCells[facei];

4
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -405,7 +405,7 @@ void Foam::multiphaseSystem::correctContactAngle
scalar uTheta = tp().uTheta();
// Calculate the dynamic contact angle if required
if (uTheta > SMALL)
if (uTheta > small)
{
scalar thetaA = convertToRad*tp().thetaA(matched);
scalar thetaR = convertToRad*tp().thetaR(matched);
@ -425,7 +425,7 @@ void Foam::multiphaseSystem::correctContactAngle
);
// Normalise nWall
nWall /= (mag(nWall) + SMALL);
nWall /= (mag(nWall) + small);
// Calculate Uwall resolved normal to the interface parallel to
// the interface

2
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
View File

@ -10,7 +10,7 @@
scalar maxDeltaT
(
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great)
);
scalar rDeltaTSmoothingCoeff

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
View File

@ -10,7 +10,7 @@
scalar maxDeltaT
(
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
pimpleDict.lookupOrDefault<scalar>("maxDeltaT", great)
);
scalar rDeltaTSmoothingCoeff

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
View File

@ -230,7 +230,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
*gs0
*specularityCoefficient_.value()
*sqrt(3*Theta)
/max(6*(nu - nuFric)*alphaMax.value(), SMALL)
/max(6*(nu - nuFric)*alphaMax.value(), small)
);
this->valueFraction() = c/(c + patch().deltaCoeffs());

6
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
View File

@ -254,7 +254,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
*gs0
*(scalar(1) - sqr(restitutionCoefficient_.value()))
*sqrt(3*Theta)
/max(4*kappa*alphaMax.value(), SMALL)
/max(4*kappa*alphaMax.value(), small)
);
this->valueFraction() = c/(c + patch().deltaCoeffs());
@ -267,14 +267,14 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
this->refValue() = 0.0;
this->refGrad() =
pos0(alpha - SMALL)
pos0(alpha - small)
*constant::mathematical::pi
*specularityCoefficient_.value()
*alpha
*gs0
*sqrt(3*Theta)
*magSqr(U)
/max(6*kappa*alphaMax.value(), SMALL);
/max(6*kappa*alphaMax.value(), small);
this->valueFraction() = 0;
}

4
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
View File

@ -155,7 +155,7 @@ JohnsonJacksonSchaeffer::nu
0.5*pf[celli]*sin(phi_.value())
/(
sqrt((1.0/3.0)*sqr(tr(D[celli])) - invariantII(D[celli]))
+ SMALL
+ small
);
}
}
@ -174,7 +174,7 @@ JohnsonJacksonSchaeffer::nu
pf.boundaryField()[patchi]*sin(phi_.value())
/(
mag(U.boundaryField()[patchi].snGrad())
+ SMALL
+ small
)
);
}

6
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -144,7 +144,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
0.5*pf[celli]*sin(phi_.value())
/(
sqrt((1.0/3.0)*sqr(tr(D[celli])) - invariantII(D[celli]))
+ SMALL
+ small
);
}
}
@ -163,7 +163,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
pf.boundaryField()[patchi]*sin(phi_.value())
/(
mag(U.boundaryField()[patchi].snGrad())
+ SMALL
+ small
)
);
}

4
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,7 +88,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R
forAll(R, celli)
{
if (alpha[celli] < alphaMax - SMALL)
if (alpha[celli] < alphaMax - small)
{
const scalar cbrtAlphaMaxMAlpha = cbrtAlphaMax - cbrt(alpha[celli]);

4
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
forAll(alphatw, facei)
{
if (dmdt[facei] > SMALL)
if (dmdt[facei] > small)
{
const label faceCelli = faceCells[facei];
R[faceCelli] =

4
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,7 +67,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Lain::CdRe() const
return
neg(Re - 1.5)*16.0
+ pos0(Re - 1.5)*neg(Re - 80.0)*14.9*pow(Re, 0.22)
+ pos0(Re - 80.0)*neg(Re - 1500.0)*48*(1.0 - 2.21/sqrt(max(Re, SMALL)))
+ pos0(Re - 80.0)*neg(Re - 1500.0)*48*(1.0 - 2.21/sqrt(max(Re, small)))
+ pos0(Re - 1500.0)*2.61*Re;
}

4
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,7 +67,7 @@ Foam::virtualMassModels::Lamb::~Lamb()
Foam::tmp<Foam::volScalarField> Foam::virtualMassModels::Lamb::Cvm() const
{
volScalarField E(min(max(pair_.E(), SMALL), 1 - SMALL));
volScalarField E(min(max(pair_.E(), small), 1 - small));
volScalarField rtOmEsq(sqrt(1 - sqr(E)));
return

4
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -230,7 +230,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
*gs0
*specularityCoefficient_.value()
*sqrt(3.0*Theta)
/max(6.0*(nu - nuFric)*alphaMax.value(), SMALL)
/max(6.0*(nu - nuFric)*alphaMax.value(), small)
);
this->valueFraction() = c/(c + patch().deltaCoeffs());

8
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -254,7 +254,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
*gs0
*(scalar(1) - sqr(restitutionCoefficient_.value()))
*sqrt(3.0*Theta)
/max(4.0*kappa*alphaMax.value(), SMALL)
/max(4.0*kappa*alphaMax.value(), small)
);
this->valueFraction() = c/(c + patch().deltaCoeffs());
@ -267,14 +267,14 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
this->refValue() = 0.0;
this->refGrad() =
pos0(alpha - SMALL)
pos0(alpha - small)
*constant::mathematical::pi
*specularityCoefficient_.value()
*alpha
*gs0
*sqrt(3.0*Theta)
*magSqr(U)
/max(6.0*kappa*alphaMax.value(), SMALL);
/max(6.0*kappa*alphaMax.value(), small);
this->valueFraction() = 0.0;
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -155,7 +155,7 @@ JohnsonJacksonSchaeffer::nu
0.5*pf[celli]*sin(phi_.value())
/(
sqrt((1.0/3.0)*sqr(tr(D[celli])) - invariantII(D[celli]))
+ SMALL
+ small
);
}
}
@ -174,7 +174,7 @@ JohnsonJacksonSchaeffer::nu
pf.boundaryField()[patchi]*sin(phi_.value())
/(
mag(U.boundaryField()[patchi].snGrad())
+ SMALL
+ small
)
);
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -144,7 +144,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
0.5*pf[celli]*sin(phi_.value())
/(
sqrt((1.0/3.0)*sqr(tr(D[celli])) - invariantII(D[celli]))
+ SMALL
+ small
);
}
}
@ -163,7 +163,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
pf.boundaryField()[patchi]*sin(phi_.value())
/(
mag(U.boundaryField()[patchi].snGrad())
+ SMALL
+ small
)
);
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -128,7 +128,7 @@ Foam::tmp<Foam::volScalarField> Foam::blendingMethods::linear::f1
max
(
(phase1 - maxFullAlpha)
/(maxPartAlpha - maxFullAlpha + SMALL),
/(maxPartAlpha - maxFullAlpha + small),
scalar(0)
),
scalar(1)
@ -153,7 +153,7 @@ Foam::tmp<Foam::volScalarField> Foam::blendingMethods::linear::f2
max
(
(maxPartAlpha - phase2)
/(maxPartAlpha - maxFullAlpha + SMALL),
/(maxPartAlpha - maxFullAlpha + small),
scalar(0)
),
scalar(1)

4
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,7 +89,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R() const
forAll(R, celli)
{
if (alpha[celli] < alphaMax - SMALL)
if (alpha[celli] < alphaMax - small)
{
scalar cbrtAlphaMaxMAlpha = cbrtAlphaMax - cbrt(alpha[celli]);

4
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
View File

@ -8,10 +8,10 @@ if (!(runTime.timeIndex() % 5))
dimensionedScalar intKineticPower = fvc::domainIntegrate(kineticPower);
Info<< "kineticPower = " << intKineticPower.value() << endl;
scalar smi = intKineticPower.value()/(intKineticEnergy.value() + VSMALL);
scalar smi = intKineticPower.value()/(intKineticEnergy.value() + vSmall);
Info<< "smi = " << smi << endl;
if (smi < -SMALL)
if (smi < -small)
{
Info<< "Resetting Dcorr to 0" << endl;
Dcorr == dimensionedVector("0", Dcorr.dimensions(), Zero);

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -189,7 +189,7 @@ using namespace Foam;
// }
// }
//
// extrudeN /= mag(extrudeN)+VSMALL;
// extrudeN /= mag(extrudeN)+vSmall;
//
// return textrudeN;
//}

6
applications/test/Polynomial/Test-Polynomial.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -164,12 +164,12 @@ int main(int argc, char *argv[])
Info<< " px, pxTest = " << px << ", " << pxTest << endl;
Info<< " ipx, ipxTest = " << ipx << ", " << ipxTest << endl;
if (mag(px - pxTest) > SMALL)
if (mag(px - pxTest) > small)
{
Info<< " *** WARNING: px != pxTest: " << px - pxTest << endl;
}
if (mag(ipx - ipxTest) > SMALL)
if (mag(ipx - ipxTest) > small)
{
Info<< " *** WARNING: ipx != ipxTest: " << ipx - ipxTest << endl;
}

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -150,7 +150,7 @@ int main(int argc, char *argv[])
const scalar totalVol = gSum(mesh.V());
// Face removal engine. No checking for not merging boundary faces.
removeFaces faceRemover(mesh, GREAT);
removeFaces faceRemover(mesh, great);
while (runTime.loop())

6
applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -66,8 +66,8 @@ int main(int argc, char *argv[])
efem.points()
);
bb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
bb.min() -= point(rootVSmall, rootVSmall, rootVSmall);
bb.max() += point(rootVSmall, rootVSmall, rootVSmall);
labelList allEdges(identity(efem.edges().size()));

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -87,7 +87,7 @@ int main(int argc, char *argv[])
- quaternion(quaternion::rotationSequence(rs), angles)
.eulerAngles(quaternion::rotationSequence(rs))
)
> SMALL
> small
)
{
FatalErrorInFunction

6
applications/test/router/router.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -147,7 +147,7 @@ void Foam::router::fixWeights
// to choose one. Here: smallest angle to vector end-start
vector n(coords_[endNodeI] - coords_[startNodeI]);
scalar maxCosAngle = -GREAT;
scalar maxCosAngle = -great;
forAll(myNeighbours, neighbourI)
{
@ -159,7 +159,7 @@ void Foam::router::fixWeights
scalar magN2 = mag(n2);
if (magN2 > SMALL)
if (magN2 > small)
{
n2 /= mag(n2);

24
applications/test/syncTools/Test-syncTools.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -209,7 +209,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
{
// Create some data. Use slightly perturbed positions.
Map<point> sparseData;
pointField fullData(mesh.nPoints(), point(GREAT, GREAT, GREAT));
pointField fullData(mesh.nPoints(), point(great, great, great));
forAll(localPoints, i)
{
@ -235,7 +235,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
mesh,
fullData,
minMagSqrEqOp<point>(),
point(GREAT, GREAT, GREAT)
point(great, great, great)
// true // apply separation
);
@ -245,7 +245,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
{
const point& fullPt = fullData[meshPointi];
if (fullPt != point(GREAT, GREAT, GREAT))
if (fullPt != point(great, great, great))
{
const point& sparsePt = sparseData[meshPointi];
@ -285,7 +285,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
{
// Create some data. Use slightly perturbed positions.
EdgeMap<point> sparseData;
pointField fullData(mesh.nEdges(), point(GREAT, GREAT, GREAT));
pointField fullData(mesh.nEdges(), point(great, great, great));
const edgeList& edges = allBoundary.edges();
const labelList meshEdges = allBoundary.meshEdges
@ -319,7 +319,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
mesh,
fullData,
minMagSqrEqOp<point>(),
point(GREAT, GREAT, GREAT)
point(great, great, great)
);
// Compare.
@ -328,7 +328,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
{
const point& fullPt = fullData[meshEdgeI];
if (fullPt != point(GREAT, GREAT, GREAT))
if (fullPt != point(great, great, great))
{
const point& sparsePt = sparseData[mesh.edges()[meshEdgeI]];
@ -384,12 +384,12 @@ void testPointSync(const polyMesh& mesh, Random& rndGen)
mesh,
syncedPoints,
minMagSqrEqOp<point>(),
point(GREAT, GREAT, GREAT)
point(great, great, great)
);
forAll(syncedPoints, pointi)
{
if (mag(syncedPoints[pointi] - mesh.points()[pointi]) > SMALL)
if (mag(syncedPoints[pointi] - mesh.points()[pointi]) > small)
{
FatalErrorInFunction
<< "Point " << pointi
@ -458,14 +458,14 @@ void testEdgeSync(const polyMesh& mesh, Random& rndGen)
mesh,
syncedMids,
minMagSqrEqOp<point>(),
point(GREAT, GREAT, GREAT)
point(great, great, great)
);
forAll(syncedMids, edgeI)
{
point eMid = edges[edgeI].centre(mesh.points());
if (mag(syncedMids[edgeI] - eMid) > SMALL)
if (mag(syncedMids[edgeI] - eMid) > small)
{
FatalErrorInFunction
<< "Edge " << edgeI
@ -534,7 +534,7 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen)
forAll(syncedFc, facei)
{
if (mag(syncedFc[facei] - mesh.faceCentres()[facei]) > SMALL)
if (mag(syncedFc[facei] - mesh.faceCentres()[facei]) > small)
{
FatalErrorInFunction
<< "Face " << facei

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -171,7 +171,7 @@ int main(int argc, char *argv[])
Info<< "Sum inside and outside: " << volIn + volOut << endl;
if (mag(volIn + volOut - makeTetPointRef(tetA).mag()) > SMALL)
if (mag(volIn + volOut - makeTetPointRef(tetA).mag()) > small)
{
FatalErrorInFunction
<< "Tet volumes do not sum up to input tet."

16
applications/test/vectorTools/Test-vectorTools.C
View File

@ -35,8 +35,8 @@ int main()
vector b(2.0, 2.0, 2.0);
test(a, b, 0.0);
test(a, b, VSMALL);
test(a, b, SMALL);
test(a, b, vSmall);
test(a, b, small);
test(a, b, 1e-3);
test(a, b, 1e-1);
@ -44,8 +44,8 @@ int main()
b = vector(0,2,0);
test(a, b, 0.0);
test(a, b, VSMALL);
test(a, b, SMALL);
test(a, b, vSmall);
test(a, b, small);
test(a, b, 1e-3);
test(a, b, 1e-1);
@ -53,8 +53,8 @@ int main()
b = vector(-1,0,0);
test(a, b, 0.0);
test(a, b, VSMALL);
test(a, b, SMALL);
test(a, b, vSmall);
test(a, b, small);
test(a, b, 1e-3);
test(a, b, 1e-1);
@ -62,8 +62,8 @@ int main()
b = vector(-1,2,0);
test(a, b, 0.0);
test(a, b, VSMALL);
test(a, b, SMALL);
test(a, b, vSmall);
test(a, b, small);
test(a, b, 1e-3);
test(a, b, 1e-1);

18
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,20 +108,20 @@ scalar getEdgeStats(const primitiveMesh& mesh, const direction excludeCmpt)
label nY = 0;
label nZ = 0;
scalar minX = GREAT;
scalar maxX = -GREAT;
scalar minX = great;
scalar maxX = -great;
vector x(1, 0, 0);
scalar minY = GREAT;
scalar maxY = -GREAT;
scalar minY = great;
scalar maxY = -great;
vector y(0, 1, 0);
scalar minZ = GREAT;
scalar maxZ = -GREAT;
scalar minZ = great;
scalar maxZ = -great;
vector z(0, 0, 1);
scalar minOther = GREAT;
scalar maxOther = -GREAT;
scalar minOther = great;
scalar maxOther = -great;
const edgeList& edges = mesh.edges();

4
applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -135,7 +135,7 @@ label mergePatchFaces
}
else
{
mesh.checkFacePyramids(false, -SMALL, &errorFaces);
mesh.checkFacePyramids(false, -small, &errorFaces);
}
// Sets where the master is in error

16
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,10 +72,10 @@ label findPoint(const primitivePatch& pp, const point& nearPoint)
const labelList& meshPoints = pp.meshPoints();
// Find nearest and next nearest
scalar minDistSqr = GREAT;
scalar minDistSqr = great;
label minI = -1;
scalar almostMinDistSqr = GREAT;
scalar almostMinDistSqr = great;
label almostMinI = -1;
forAll(meshPoints, i)
@ -136,10 +136,10 @@ label findEdge
const edgeList& edges = pp.edges();
// Find nearest and next nearest
scalar minDist = GREAT;
scalar minDist = great;
label minI = -1;
scalar almostMinDist = GREAT;
scalar almostMinDist = great;
label almostMinI = -1;
forAll(edges, edgeI)
@ -218,10 +218,10 @@ label findFace
const pointField& points = pp.points();
// Find nearest and next nearest
scalar minDist = GREAT;
scalar minDist = great;
label minI = -1;
scalar almostMinDist = GREAT;
scalar almostMinDist = great;
label almostMinI = -1;
forAll(pp, patchFacei)
@ -289,7 +289,7 @@ label findCell(const primitiveMesh& mesh, const point& nearPoint)
const labelList& cPoints = mesh.cellPoints()[celli];
label minI = -1;
scalar minDistSqr = GREAT;
scalar minDistSqr = great;
forAll(cPoints, i)
{

18
applications/utilities/mesh/advanced/selectCells/edgeStats.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -127,20 +127,20 @@ Foam::scalar Foam::edgeStats::minLen(Ostream& os) const
label nY = 0;
label nZ = 0;
scalar minX = GREAT;
scalar maxX = -GREAT;
scalar minX = great;
scalar maxX = -great;
vector x(1, 0, 0);
scalar minY = GREAT;
scalar maxY = -GREAT;
scalar minY = great;
scalar maxY = -great;
vector y(0, 1, 0);
scalar minZ = GREAT;
scalar maxZ = -GREAT;
scalar minZ = great;
scalar maxZ = -great;
vector z(0, 0, 1);
scalar minOther = GREAT;
scalar maxOther = -GREAT;
scalar minOther = great;
scalar maxOther = -great;
const edgeList& edges = mesh_.edges();

14
applications/utilities/mesh/advanced/splitCells/splitCells.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -133,7 +133,7 @@ bool largerAngle
// which quadrant angle is. (Is correct for unwarped faces only!)
// Correct for non-outwards pointing normal.
vector c1c0(mesh.faceCentres()[f1] - mesh.faceCentres()[f0]);
c1c0 /= mag(c1c0) + VSMALL;
c1c0 /= mag(c1c0) + vSmall;
scalar fcCosAngle = n0 & c1c0;
@ -282,10 +282,10 @@ bool splitHex
loop[3] = ev.vertToEVert(e[1]);
scalarField loopWeights(4);
loopWeights[0] = -GREAT;
loopWeights[1] = -GREAT;
loopWeights[2] = -GREAT;
loopWeights[3] = -GREAT;
loopWeights[0] = -great;
loopWeights[1] = -great;
loopWeights[2] = -great;
loopWeights[3] = -great;
cutCells.append(celli);
cellLoops.append(loop);
@ -393,7 +393,7 @@ void collectCuts
// Cut information per mesh entity
boolList vertIsCut(mesh.nPoints(), false);
boolList edgeIsCut(mesh.nEdges(), false);
scalarField edgeWeight(mesh.nEdges(), -GREAT);
scalarField edgeWeight(mesh.nEdges(), -great);
forAllConstIter(cellSet, cellsToCut, iter)
{

6
applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -247,7 +247,7 @@ int main(int argc, char *argv[])
// N^2 algorithm, sorry but I cannot quickly come up with
// something better.
scalar sqrMergeTol = GREAT;
scalar sqrMergeTol = great;
forAll(blockPFaces, blockPFaceLabel)
{
@ -533,7 +533,7 @@ int main(int argc, char *argv[])
}
// Scale the points
if (scaleFactor > 1.0 + SMALL || scaleFactor < 1.0 - SMALL)
if (scaleFactor > 1.0 + small || scaleFactor < 1.0 - small)
{
points *= scaleFactor;
}

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -1251,7 +1251,7 @@ int main(int argc, char *argv[])
if (own[j] == c1)
{
const face& f = boundaryFaces[old];
if (mag(centers[j]- f.centre(points)) < SMALL)
if (mag(centers[j]- f.centre(points)) < small)
{
noveau = j;
break;

8
applications/utilities/mesh/conversion/kivaToFoam/checkPatch.H
View File

@ -39,10 +39,10 @@
if
(
mag(points[quadFace[0]].y()) < SMALL
&& mag(points[quadFace[1]].y()) < SMALL
&& mag(points[quadFace[2]].y()) < SMALL
&& mag(points[quadFace[3]].y()) < SMALL
mag(points[quadFace[0]].y()) < small
&& mag(points[quadFace[1]].y()) < small
&& mag(points[quadFace[2]].y()) < small
&& mag(points[quadFace[3]].y()) < small
)
{
bcIndex = SYMMETRYPLANE;

4
applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -107,7 +107,7 @@ int main(int argc, char *argv[])
}
}
scalar zHeadMin = -GREAT;
scalar zHeadMin = -great;
args.optionReadIfPresent("zHeadMin", zHeadMin);
#include "readKivaGrid.H"

10
applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
View File

@ -134,7 +134,7 @@ for (label i=0; i<nPoints; i++)
forAll(edges, ei)
{
if (edges[ei].mag(points) < SMALL)
if (edges[ei].mag(points) < small)
{
label start = pointMap[edges[ei].start()];
while (start != pointMap[start])
@ -325,7 +325,7 @@ if
&& pFaces[CYLINDERHEAD][0].size()
)
{
scalar minz = GREAT;
scalar minz = great;
forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
{
@ -337,7 +337,7 @@ if
}
}
minz += SMALL;
minz += small;
SLList<face> newLinerFaces;
@ -345,7 +345,7 @@ if
{
const face& pf = iter();
scalar minfz = GREAT;
scalar minfz = great;
forAll(pf, pfi)
{
minfz = min(minfz, points[pf[pfi]].z());
@ -374,7 +374,7 @@ if
{
const face& pf = iter();
scalar minfz = GREAT;
scalar minfz = great;
forAll(pf, pfi)
{
minfz = min(minfz, points[pf[pfi]].z());

4
applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -55,7 +55,7 @@ void hexBlock::setHandedness()
vector y = p[vtxLabel(i, j+1, k)] - p[vtxLabel(i, j, k)];
vector z = p[vtxLabel(i, j, k+1)] - p[vtxLabel(i, j, k)];
if (mag(x) > SMALL && mag(y) > SMALL && mag(z) > SMALL)
if (mag(x) > small && mag(y) > small && mag(z) > small)
{
Info<< "Looking at cell "
<< i << ' ' << j << ' ' << k

8
applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -179,18 +179,18 @@ int main(int argc, char *argv[])
mergePoints
(
points,
SMALL,
small,
false,
oldToNew,
newPoints
);
Info<< "Merged points within " << SMALL << " distance. Merged from "
Info<< "Merged points within " << small << " distance. Merged from "
<< oldToNew.size() << " down to " << newPoints.size()
<< " points." << endl;
// Scale the points
if (scaleFactor > 1.0 + SMALL || scaleFactor < 1.0 - SMALL)
if (scaleFactor > 1.0 + small || scaleFactor < 1.0 - small)
{
newPoints *= scaleFactor;
}

26
applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,7 +89,7 @@ void Foam::starMesh::createCoupleMatches()
mag
(
-(masterFace.normal(points_) & slaveFace.normal(points_))/
(masterFace.mag(points_)*slaveFace.mag(points_) + VSMALL)
(masterFace.mag(points_)*slaveFace.mag(points_) + vSmall)
);
if (faceAreaAngle < 0.94)
@ -163,7 +163,7 @@ void Foam::starMesh::createCoupleMatches()
// Find common plane
vector n = masterFace.normal(points_);
n /= mag(n) + VSMALL;
n /= mag(n) + vSmall;
// Loop through all edges of the master face. For every edge,
// intersect it with all edges of the cutting face.
@ -202,7 +202,7 @@ void Foam::starMesh::createCoupleMatches()
<< "e: " << e << endl;
#endif
if (mag(det) > SMALL)
if (mag(det) > small)
{
// non-singular matrix. Look for intersection
scalar beta = ((S - P) & (n ^ d))/det;
@ -345,7 +345,7 @@ void Foam::starMesh::createCoupleMatches()
bool colinear = false;
if (mag(ps) < SMALL)
if (mag(ps) < small)
{
// colinear because P and S are the same point
colinear = true;
@ -548,7 +548,7 @@ void Foam::starMesh::createCoupleMatches()
{
label nextPointLabel = -1;
label usedI = -1;
scalar minAlpha = GREAT;
scalar minAlpha = great;
label i = 0;
@ -742,7 +742,7 @@ void Foam::starMesh::createCoupleMatches()
{
label nextPointLabel = -1;
label usedI = -1;
scalar minAlpha = GREAT;
scalar minAlpha = great;
label i = 0;
@ -1000,7 +1000,7 @@ void Foam::starMesh::createCoupleMatches()
// and exit.
vector planeNormal = newMasterFace.normal(points_);
planeNormal /= mag(planeNormal) + VSMALL;
planeNormal /= mag(planeNormal) + vSmall;
#ifdef DEBUG_RIGHT_HAND_WALK
Info<< "planeNormal: " << planeNormal << endl;
@ -1117,17 +1117,17 @@ void Foam::starMesh::createCoupleMatches()
// vector along the edge
vector ahead = curEdge.vec(points_);
ahead -= planeNormal*(planeNormal & ahead);
ahead /= mag(ahead) + VSMALL;
ahead /= mag(ahead) + vSmall;
// vector pointing right
vector right = ahead ^ planeNormal;
right /= mag(right) + VSMALL;
right /= mag(right) + vSmall;
// first edge taken for reference
edge nextEdge = edgesToConsider.first();
vector nextEdgeVec = nextEdge.vec(points_);
nextEdgeVec -= planeNormal*(planeNormal & nextEdgeVec);
nextEdgeVec /= mag(nextEdgeVec) + VSMALL;
nextEdgeVec /= mag(nextEdgeVec) + vSmall;
scalar rightTurn = nextEdgeVec & right;
scalar goStraight = nextEdgeVec & ahead;
@ -1148,7 +1148,7 @@ void Foam::starMesh::createCoupleMatches()
// right-hand walk rule
vector newDir = etcIter().vec(points_);
newDir -= planeNormal*(planeNormal & newDir);
newDir /= mag(newDir) + VSMALL;
newDir /= mag(newDir) + vSmall;
scalar curRightTurn = newDir & right;
scalar curGoStraight = newDir & ahead;
@ -1345,7 +1345,7 @@ void Foam::starMesh::createCoupleMatches()
(
masterFace.normal(points_)
& intersectedFace.normal(points_)
) < VSMALL
) < vSmall
)
{
intersectedFace.flip();

4
applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,7 +71,7 @@ void Foam::starMesh::mergeCoupleFacePoints()
label nPointsInCell = 0;
scalar pointMergeTol = GREAT;
scalar pointMergeTol = great;
forAll(curFaces, facei)
{

4
applications/utilities/mesh/conversion/star3ToFoam/readPoints.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -153,7 +153,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
starPointLabelLookup_[pointLabel] = p;
}
if (scaleFactor > 1.0 + SMALL || scaleFactor < 1.0 - SMALL)
if (scaleFactor > 1.0 + small || scaleFactor < 1.0 - small)
{
points_ *= scaleFactor;
}

4
applications/utilities/mesh/conversion/star3ToFoam/readSeparatedPoints.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,7 +97,7 @@ void Foam::starMesh::readPoints(const scalar scaleFactor)
starPointLabelLookup_[pointLabel] = p;
}
if (scaleFactor > 1.0 + SMALL || scaleFactor < 1.0 - SMALL)
if (scaleFactor > 1.0 + small || scaleFactor < 1.0 - small)
{
points_ *= scaleFactor;
}

4
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -605,7 +605,7 @@ int main(int argc, char *argv[])
// Check if wedge (has layer0 different from original patch points)
// If so move the mesh to starting position.
if (gMax(mag(layer0Points-extrudePatch.localPoints())) > SMALL)
if (gMax(mag(layer0Points-extrudePatch.localPoints())) > small)
{
Info<< "Moving mesh to layer0 points since differ from original"
<< " points - this can happen for wedge extrusions." << nl

4
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,7 @@ void Foam::extrude2DMesh::check2D() const
//void Foam::extrude2DMesh::findExtrudeDirection()
//{
// scalar minRange = GREAT;
// scalar minRange = great;
// for (direction dir = 0; dir < 3; dir++)
// {

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -186,7 +186,7 @@ Foam::tmp<Foam::pointField> buildPointField(const T& mesh)
{
tmp<pointField> tPoints
(
new pointField(mesh.vertexCount(), point(GREAT, GREAT, GREAT))
new pointField(mesh.vertexCount(), point(great, great, great))
);
pointField& points = tPoints.ref();
@ -543,7 +543,7 @@ int main(int argc, char *argv[])
scalar dist = mag(points[pI] - points[adjPointIndex]);
// dist = max(dist, SMALL);
// dist = max(dist, small);
triad tmpTriad = alignments[adjPointIndex];

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -136,7 +136,7 @@ void Foam::DelaunayMesh<Triangulation>::printInfo(Ostream& os) const
triInfoTable.add("Faces", Triangulation::number_of_finite_facets());
triInfoTable.add("Cells", Triangulation::number_of_finite_cells());
scalar minSize = GREAT;
scalar minSize = great;
scalar maxSize = 0;
for

20
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -565,14 +565,14 @@ bool Foam::backgroundMeshDecomposition::refineCell
// geometry.findSurfaceNearest
// (
// samplePoints,
// scalarField(samplePoints.size(), sqr(GREAT)),
// scalarField(samplePoints.size(), sqr(great)),
// hitInfo,
// hitSurfaces
// );
//
// // weightEstimate = 0.0;
//
// scalar minCellSize = GREAT;
// scalar minCellSize = great;
//
// forAll(samplePoints, i)
// {
@ -717,8 +717,8 @@ void Foam::backgroundMeshDecomposition::buildPatchAndTree()
Pstream::gatherList(allBackgroundMeshBounds_);
Pstream::scatterList(allBackgroundMeshBounds_);
point bbMin(GREAT, GREAT, GREAT);
point bbMax(-GREAT, -GREAT, -GREAT);
point bbMin(great, great, great);
point bbMax(-great, -great, -great);
forAll(allBackgroundMeshBounds_, proci)
{
@ -882,7 +882,7 @@ Foam::backgroundMeshDecomposition::distribute
forAll(icellWeights, cI)
{
if (icellWeights[cI] > 1 - SMALL)
if (icellWeights[cI] > 1 - small)
{
nOccupiedCells++;
}
@ -1122,7 +1122,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
{
// Candidate points may lie just outside a processor box, increase
// test range by using overlaps rather than contains
if (allBackgroundMeshBounds_[proci].overlaps(pt, sqr(SMALL*100)))
if (allBackgroundMeshBounds_[proci].overlaps(pt, sqr(small*100)))
{
toCandidateProc.append(proci);
testPoints.append(pt);
@ -1144,7 +1144,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
map().distribute(testPoints);
List<scalar> distanceSqrToCandidate(testPoints.size(), sqr(GREAT));
List<scalar> distanceSqrToCandidate(testPoints.size(), sqr(great));
// Test candidate points on candidate processors
forAll(testPoints, tPI)
@ -1152,7 +1152,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
pointIndexHit info = bFTreePtr_().findNearest
(
testPoints[tPI],
sqr(GREAT)
sqr(great)
);
if (info.hit())
@ -1183,7 +1183,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
ptBlockStart[pI]
);
scalar nearestProcDistSqr = GREAT;
scalar nearestProcDistSqr = great;
forAll(ptNearestProcResults, pPRI)
{

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