diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index 64ddded3f4..44b585b880 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -142,10 +142,10 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const const scalarField upLocal(uPrimeCoef*sqrt((U & CT & U)*cellWidth)); - const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0)); + const scalarField deltaUp(upLocal*(max(scalar(1), pow(nr, 0.5)) - 1.0)); // Re use tN - N.primitiveFieldRef() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0); + N.primitiveFieldRef() = upLocal*(max(scalar(1), pow(nr, 0.5)) - 1.0); return tN; } diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H index 129e749fe8..2f028e45d2 100644 --- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H +++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H @@ -170,7 +170,7 @@ License rDeltaT = max ( rDeltaT, - (scalar(1.0) - rDeltaTDampingCoeff)*rDeltaT0 + (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0 ); } diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index c79f8d5062..defbf3fe22 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C @@ -120,7 +120,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField else { this->refValue() = *this; - this->valueFraction() = scalar(1.0); + this->valueFraction() = scalar(1); } } } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H index 6b67f0c730..2cc60f7b9b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H @@ -95,7 +95,7 @@ IOobject::NO_WRITE ), solidRegions[i], - dimensionedScalar("1", dimless, scalar(1.0)) + dimensionedScalar("1", dimless, scalar(1)) ) ); } diff --git a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H index 9eb96b281e..e3dd30ecf7 100644 --- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H +++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H @@ -101,7 +101,7 @@ if (mesh.changing()) pcorrEqn.setReferences ( validCells, - scalar(0.0), + scalar(0), true ); } diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H index c31ad040a1..3b2d3a77cf 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H @@ -122,7 +122,7 @@ License rDeltaT = max ( rDeltaT, - (scalar(1.0) - rDeltaTDampingCoeff)*rDeltaT0 + (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0 ); } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H index 28bc211e05..1a57519eac 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H @@ -121,7 +121,7 @@ License rDeltaT = max ( rDeltaT, - (scalar(1.0) - rDeltaTDampingCoeff)*rDeltaT0 + (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0 ); } diff --git a/applications/solvers/multiphase/VoF/setRDeltaT.H b/applications/solvers/multiphase/VoF/setRDeltaT.H index 26b237e795..f9725ec972 100644 --- a/applications/solvers/multiphase/VoF/setRDeltaT.H +++ b/applications/solvers/multiphase/VoF/setRDeltaT.H @@ -126,7 +126,7 @@ rDeltaT = max ( rDeltaT, - (scalar(1.0) - rDeltaTDampingCoeff)*rDeltaT0 + (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0 ); Info<< "Damped flow time scale min/max = " diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H index 7ced952047..643cd11572 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H @@ -25,7 +25,7 @@ mesh ), mesh, - dimensionedScalar("zero", dimless/dimTime, 0.0) + dimensionedScalar(dimless/dimTime, Zero) ) ); Sps.set @@ -40,7 +40,7 @@ mesh ), mesh, - dimensionedScalar("zero", dimless/dimTime, 0.0) + dimensionedScalar(dimless/dimTime, Zero) ) ); } diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C index 863474b36d..5fc2743ebd 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C @@ -90,7 +90,7 @@ Foam::InterfaceCompositionModel::getSpecieMassFraction IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", dimless, 0), + dimensionedScalar(dimless, Zero), zeroGradientFvPatchScalarField::typeName ) ); @@ -126,7 +126,7 @@ Foam::InterfaceCompositionModel::getSpecieMassFraction IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", dimless, 1), + dimensionedScalar("one", dimless, 1), zeroGradientFvPatchScalarField::typeName ) ); @@ -251,7 +251,7 @@ Foam::InterfaceCompositionModel::D p.mesh() ), p.mesh(), - dimensionedScalar("zero", dimArea/dimTime, 0) + dimensionedScalar(dimArea/dimTime, Zero) ) ); @@ -297,7 +297,7 @@ Foam::InterfaceCompositionModel::L p.mesh() ), p.mesh(), - dimensionedScalar("zero", dimEnergy/dimMass, 0), + dimensionedScalar(dimEnergy/dimMass, Zero), zeroGradientFvPatchScalarField::typeName ) ); diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C index 83cb21da76..02c4ec2108 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C @@ -166,7 +166,7 @@ Foam::meltingEvaporationModels::kineticGasEvaporation IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", dimDensity, 0) + dimensionedScalar(dimDensity, Zero) ) ); volScalarField& rhom = tRhom.ref(); @@ -184,7 +184,7 @@ Foam::meltingEvaporationModels::kineticGasEvaporation IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", dimTemperature, 0) + dimensionedScalar(dimTemperature, Zero) ) ); volScalarField& tDelta = tTdelta.ref(); @@ -198,7 +198,7 @@ Foam::meltingEvaporationModels::kineticGasEvaporation tDelta = max ( (T*Tmask - Tactivate_), - dimensionedScalar("T0", dimTemperature, 0.0) + dimensionedScalar("T0", dimTemperature, Zero) ); } else @@ -210,7 +210,7 @@ Foam::meltingEvaporationModels::kineticGasEvaporation tDelta = max ( Tmask*(Tactivate_ - T), - dimensionedScalar("T0", dimTemperature, 0.0) + dimensionedScalar("T0", dimTemperature, Zero) ); } diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C index 9f5e4af35a..eec86cb2b4 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C @@ -62,7 +62,7 @@ Foam::MassTransferPhaseSystem::MassTransferPhaseSystem IOobject::AUTO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, Zero) ) ); } @@ -95,7 +95,7 @@ Foam::MassTransferPhaseSystem::calculateL IOobject::NO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimEnergy/dimMass, 0) + dimensionedScalar(dimEnergy/dimMass, Zero) ) ); volScalarField& L = tL.ref(); @@ -155,7 +155,7 @@ Foam::MassTransferPhaseSystem::dmdt IOobject::NO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, Zero) ) ); @@ -221,12 +221,7 @@ Foam::MassTransferPhaseSystem::heatTransfer IOobject::NO_WRITE ), this->mesh(), - dimensionedScalar - ( - "zero", - dimDensity/dimTime, - 0 - ) + dimensionedScalar(dimDensity/dimTime, Zero) ) ); volScalarField& dmdtNetki = tdmdtNetki.ref(); diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 53dba24308..813eba4887 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -60,7 +60,7 @@ Foam::MovingPhaseModel::MovingPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero) ) {} @@ -127,7 +127,7 @@ diffNo() const U_.mesh() ), U_.mesh(), - dimensionedScalar("0", dimless, 0.0) + dimensionedScalar(dimless, Zero) ); } diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C index 2cf855f4d6..3edba54ace 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C @@ -52,7 +52,7 @@ Foam::StaticPhaseModel::StaticPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero) ), alphaPhi_ ( @@ -63,7 +63,7 @@ Foam::StaticPhaseModel::StaticPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero) ) {} @@ -90,7 +90,7 @@ Foam::StaticPhaseModel::phi() const U_.mesh() ), U_.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero) ); } @@ -99,7 +99,7 @@ template const Foam::surfaceScalarField& Foam::StaticPhaseModel::phi() { - phi_ = dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0); + phi_ = dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero); return phi_; } @@ -119,7 +119,7 @@ Foam::StaticPhaseModel::alphaPhi() const U_.mesh() ), U_.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero) ) ); } @@ -129,7 +129,7 @@ template Foam::surfaceScalarField& Foam::StaticPhaseModel::alphaPhi() { - alphaPhi_ = dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0); + alphaPhi_ = dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero); return alphaPhi_; } @@ -149,7 +149,7 @@ Foam::StaticPhaseModel::U() const U_.mesh() ), U_.mesh(), - dimensionedVector("zero", dimVelocity, vector::zero) + dimensionedVector(dimVelocity, Zero) ) ); } diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C index 0272ddf60b..5ba3132e6b 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C @@ -221,7 +221,7 @@ Foam::phaseSystem::phaseSystem IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("zero", dimVolume/dimTime, 0.0) + dimensionedScalar(dimVolume/dimTime, Zero) ), rhoPhi_ ( @@ -234,7 +234,7 @@ Foam::phaseSystem::phaseSystem IOobject::NO_WRITE ), mesh_, - dimensionedScalar("zero", dimMass/dimTime, 0.0) + dimensionedScalar(dimMass/dimTime, Zero) ), phaseModels_(generatePhaseModels(phaseNames_)), phasePairs_(), @@ -945,12 +945,7 @@ Foam::phaseSystem::surfaceTensionForce() const mesh_ ), mesh_, - dimensionedScalar - ( - "surfaceTensionForce", - dimensionSet(1, -2, -2, 0, 0), - 0.0 - ) + dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), Zero) ) ); @@ -1118,7 +1113,7 @@ Foam::tmp Foam::phaseSystem::nearInterface() const mesh_ ), mesh_, - dimensionedScalar("zero", dimless, 0.0) + dimensionedScalar(dimless, Zero) ) ); diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C index 94280fcd35..3910f68bcd 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C @@ -355,7 +355,7 @@ Foam::tmp Foam::twoPhaseMixtureEThermo::rho return ( - alpha1p*rho1().value() + (scalar(1.0) - alpha1p)*rho2().value() + alpha1p*rho1().value() + (scalar(1) - alpha1p)*rho2().value() ); } diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H index a6da0b4de1..cd96b9f5c0 100644 --- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H +++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H @@ -110,7 +110,7 @@ pcorrEqn.setReferences ( validCells, - scalar(0.0), + scalar(0), true ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C index f89804bb7d..cb8b54a8b8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C @@ -129,9 +129,9 @@ Foam::tmp Foam::blendingMethods::linear::f1 ( (phase1 - maxFullAlpha) /(maxPartAlpha - maxFullAlpha + SMALL), - scalar(0.0) + scalar(0) ), - scalar(1.0) + scalar(1) ); } @@ -154,9 +154,9 @@ Foam::tmp Foam::blendingMethods::linear::f2 ( (maxPartAlpha - phase2) /(maxPartAlpha - maxFullAlpha + SMALL), - scalar(0.0) + scalar(0) ), - scalar(1.0) + scalar(1) ); } diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index c94312d592..dc558b8664 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -65,7 +65,7 @@ scalar getMergeDistance args.readIfPresent("mergeTol", mergeTol); scalar writeTol = - Foam::pow(scalar(10.0), -scalar(IOstream::defaultPrecision())); + Foam::pow(scalar(10), -scalar(IOstream::defaultPrecision())); Info<< "Merge tolerance : " << mergeTol << nl << "Write tolerance : " << writeTol << endl; diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index 6e47c75a28..f85acfd9e0 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -554,7 +554,7 @@ scalar getMergeDistance(const polyMesh& mesh, const scalar mergeTol) { const scalar writeTol = std::pow ( - scalar(10.0), + scalar(10), -scalar(IOstream::defaultPrecision()) ); diff --git a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C index d3341b5b9e..8f6ca4415a 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C +++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C @@ -99,7 +99,7 @@ void Foam::writeFields ( radToDeg ( - Foam::acos(min(scalar(1.0), faceOrthogonality)) + Foam::acos(min(scalar(1), faceOrthogonality)) ) ); diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 530fda227b..f1b74976d2 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -106,7 +106,7 @@ scalar getMergeDistance args.readIfPresent("mergeTol", mergeTol); const scalar writeTol = - Foam::pow(scalar(10.0), -scalar(IOstream::defaultPrecision())); + Foam::pow(scalar(10), -scalar(IOstream::defaultPrecision())); Info<< "Merge tolerance : " << mergeTol << nl << "Write tolerance : " << writeTol << endl; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C index 218fdb555c..3dffb70027 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C @@ -174,7 +174,7 @@ tmp kkLOmega::phiBP(const volScalarField& Omega) const - CbpCrit_, scalar(0) ), - scalar(50.0) + scalar(50) ) ); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C index 5c5b870d74..7e01e7eba2 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -48,7 +48,7 @@ tmp LaunderSharmaKE::f2() const { return scalar(1) - - 0.3*exp(-min(sqr(sqr(k_)/(this->nu()*epsilon_)), scalar(50.0))); + - 0.3*exp(-min(sqr(sqr(k_)/(this->nu()*epsilon_)), scalar(50))); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C index 42bcdb54d1..d0119ad0ed 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -106,7 +106,7 @@ tmp SpalartAllmaras::fw ) *sqr(kappa_*y_) ), - scalar(10.0) + scalar(10) ) ); r.boundaryFieldRef() == 0.0; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C index 2763a97cf5..0c6fe242a3 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C @@ -341,7 +341,7 @@ void v2f::correct() const volScalarField Ceps1 ( "Ceps1", - 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))) + 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100))) ); // Update epsilon (and possibly G) at the wall diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C index ed7c4f35f6..519d11c34c 100644 --- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C +++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C @@ -578,7 +578,7 @@ void Foam::polyMeshFilter::checkMeshEdgesAndRelaxEdges } } - syncTools::syncEdgeList(mesh_, minEdgeLen_, minEqOp(), scalar(0.0)); + syncTools::syncEdgeList(mesh_, minEdgeLen_, minEqOp(), scalar(0)); for (label smoothIter = 0; smoothIter < maxSmoothIters(); ++smoothIter) { @@ -614,7 +614,7 @@ void Foam::polyMeshFilter::checkMeshEdgesAndRelaxEdges mesh_, minEdgeLen_, minEqOp(), - scalar(0.0) + scalar(0) ); } } @@ -824,7 +824,7 @@ void Foam::polyMeshFilter::mapOldMeshEdgeFieldToNewMesh newMesh, newMeshMinEdgeLen, maxEqOp(), - scalar(0.0) + scalar(0) ); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index 5f4122b704..a2f202f93b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C @@ -169,7 +169,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateValues Up -= nUp*n; // Remove any reverse flow - nUp = min(nUp, scalar(0.0)); + nUp = min(nUp, scalar(0)); const scalar flowRate = flowRate_->value(t); const scalar estimatedFlowRate = -gSum(rho*(this->patch().magSf()*nUp)); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C index dd9d58ae95..73429df1b1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C @@ -160,7 +160,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateValues Up -= nUp*n; // Remove any reverse flow - nUp = max(nUp, scalar(0.0)); + nUp = max(nUp, scalar(0)); const scalar flowRate = flowRate_->value(t); const scalar estimatedFlowRate = gSum(rho*(this->patch().magSf()*nUp)); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C index a585876bd4..31d6c14f2c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C @@ -148,9 +148,9 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs() db().lookupObject("g"); // scalar rhor = 1000; - // scalarField alphap1 = max(min(alphap, 1.0), 0.0); + // scalarField alphap1 = max(min(alphap, scalar(1)), scalar(0)); // valueFraction() = alphap1/(alphap1 + rhor*(1.0 - alphap1)); - valueFraction() = max(min(alphap, scalar(1.0)), scalar(0.0)); + valueFraction() = max(min(alphap, scalar(1)), scalar(0)); refValue() = pRefValue_ diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C index 003226f682..1462d08602 100644 --- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C +++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C @@ -897,7 +897,7 @@ void Foam::isoAdvection::applyBruteForceBounding() if (dict_.lookupOrDefault("clip", true)) { - alpha1_ = min(scalar(1.0), max(scalar(0.0), alpha1_)); + alpha1_ = min(scalar(1), max(scalar(0), alpha1_)); alpha1Changed = true; } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H index 8d2de37c9d..96da637507 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CoBlended/CoBlended.H @@ -249,7 +249,7 @@ public: return bf*tScheme1_().weights(vf) - + (scalar(1.0) - bf)*tScheme2_().weights(vf); + + (scalar(1) - bf)*tScheme2_().weights(vf); } @@ -265,7 +265,7 @@ public: return bf*tScheme1_().interpolate(vf) - + (scalar(1.0) - bf)*tScheme2_().interpolate(vf); + + (scalar(1) - bf)*tScheme2_().interpolate(vf); } @@ -294,7 +294,7 @@ public: ( bf * tScheme1_().correction(vf) - + (scalar(1.0) - bf) + + (scalar(1) - bf) * tScheme2_().correction(vf) ); } @@ -311,7 +311,7 @@ public: { return ( - (scalar(1.0) - bf) + (scalar(1) - bf) * tScheme2_().correction(vf) ); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H index 02bf60416a..544c9c7185 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H @@ -276,7 +276,7 @@ public: return bf*tScheme1_().weights(vf) - + (scalar(1.0) - bf)*tScheme2_().weights(vf); + + (scalar(1) - bf)*tScheme2_().weights(vf); } @@ -292,7 +292,7 @@ public: return bf*tScheme1_().interpolate(vf) - + (scalar(1.0) - bf)*tScheme2_().interpolate(vf); + + (scalar(1) - bf)*tScheme2_().interpolate(vf); } @@ -321,7 +321,7 @@ public: ( bf * tScheme1_().correction(vf) - + (scalar(1.0) - bf) + + (scalar(1) - bf) * tScheme2_().correction(vf) ); } @@ -338,7 +338,7 @@ public: { return ( - (scalar(1.0) - bf) + (scalar(1) - bf) * tScheme2_().correction(vf) ); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H index 5e976f7fb4..dae9151a80 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H @@ -176,7 +176,7 @@ public: { return blendingFactor_*tScheme1_().weights(vf) - + (scalar(1.0) - blendingFactor_)*tScheme2_().weights(vf); + + (scalar(1) - blendingFactor_)*tScheme2_().weights(vf); } @@ -190,7 +190,7 @@ public: { return blendingFactor_*tScheme1_().interpolate(vf) - + (scalar(1.0) - blendingFactor_)*tScheme2_().interpolate(vf); + + (scalar(1) - blendingFactor_)*tScheme2_().interpolate(vf); } @@ -217,7 +217,7 @@ public: ( blendingFactor_ * tScheme1_().correction(vf) - + (scalar(1.0) - blendingFactor_) + + (scalar(1) - blendingFactor_) * tScheme2_().correction(vf) ); } @@ -234,7 +234,7 @@ public: { return ( - (scalar(1.0) - blendingFactor_) + (scalar(1) - blendingFactor_) * tScheme2_().correction(vf) ); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H index 26a3ffe536..6dd38230e6 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/limiterBlended/limiterBlended.H @@ -197,7 +197,7 @@ public: ( blendingFactor * tScheme1_().correction(vf) - + (scalar(1.0) - blendingFactor) + + (scalar(1) - blendingFactor) * tScheme2_().correction(vf) ); } @@ -214,7 +214,7 @@ public: { return ( - (scalar(1.0) - blendingFactor) + (scalar(1) - blendingFactor) * tScheme2_().correction(vf) ); } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H index 8478a92939..94838a6cf3 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localBlended/localBlended.H @@ -209,7 +209,7 @@ public: ( blendingFactor * tScheme1_().correction(vf) - + (scalar(1.0) - blendingFactor) + + (scalar(1) - blendingFactor) * tScheme2_().correction(vf) ); } @@ -226,7 +226,7 @@ public: { return ( - (scalar(1.0) - blendingFactor) + (scalar(1) - blendingFactor) * tScheme2_().correction(vf) ); } diff --git a/src/functionObjects/utilities/residuals/residuals.C b/src/functionObjects/utilities/residuals/residuals.C index 0c20bb61c0..907fcdd205 100644 --- a/src/functionObjects/utilities/residuals/residuals.C +++ b/src/functionObjects/utilities/residuals/residuals.C @@ -130,7 +130,7 @@ void Foam::functionObjects::residuals::writeField(const word& fieldName) const false ), mesh_, - dimensionedScalar("0", dimless, 0), + dimensionedScalar(dimless, Zero), zeroGradientFvPatchField::typeName ); diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 86ccd10f6e..520a061e58 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -106,7 +106,7 @@ void reactingOneDim::updateqr() // qr is positive going in the solid // If the surface is emitting the radiative flux is set to zero - qrBf[patchi] = max(qrBf[patchi], scalar(0.0)); + qrBf[patchi] = max(qrBf[patchi], scalar(0)); } const vectorField& cellC = regionMesh().cellCentres(); diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C index 86680da8d9..ebd0bedcdd 100644 --- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C +++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C @@ -336,9 +336,9 @@ void filmPyrolysisRadiativeCoupledMixedFvPatchScalarField::updateCoeffs() max ( (filmDelta - filmDeltaDry_)/(filmDeltaWet_ - filmDeltaDry_), - scalar(0.0) + scalar(0) ), - scalar(1.0) + scalar(1) ) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C index 7ea255e419..5233f12504 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C @@ -212,7 +212,7 @@ tmp curvatureSeparation::calcCosAngle volCosAngle.write(); } - return max(min(cosAngle, scalar(1.0)), scalar(-1.0)); + return max(min(cosAngle, scalar(1)), scalar(-1)); } diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C index b91b863829..4ad9415154 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C @@ -155,7 +155,7 @@ void thixotropicViscosity::correct max ( -film.rhoSp(), - dimensionedScalar("zero", film.rhoSp().dimensions(), 0) + dimensionedScalar(film.rhoSp().dimensions(), Zero) )/(deltaRho + deltaRho0), lambda_ ) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C index 4d4660cce7..ec9d134ee8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/waxSolventViscosity/waxSolventViscosity.C @@ -123,7 +123,7 @@ waxSolventViscosity::waxSolventViscosity IOobject::AUTO_WRITE ), film.regionMesh(), - dimensionedScalar("zero", dimDynamicViscosity, 0), + dimensionedScalar(dimDynamicViscosity, Zero), zeroGradientFvPatchScalarField::typeName ), muWaxModel_ @@ -146,7 +146,7 @@ waxSolventViscosity::waxSolventViscosity IOobject::AUTO_WRITE ), film.regionMesh(), - dimensionedScalar("zero", dimDynamicViscosity, 0), + dimensionedScalar(dimDynamicViscosity, Zero), zeroGradientFvPatchScalarField::typeName ), muSolventModel_ diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C index 06d976e1b4..a810a952a9 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C @@ -196,7 +196,7 @@ void waxSolventEvaporation::correctModel false ), film.regionMesh(), - dimensionedScalar("zero", dimDensity*dimVelocity, 0) + dimensionedScalar(dimDensity*dimVelocity, Zero) ); volScalarField::Internal evapRateInf @@ -211,7 +211,7 @@ void waxSolventEvaporation::correctModel false ), film.regionMesh(), - dimensionedScalar("zero", dimDensity*dimVelocity, 0) + dimensionedScalar(dimDensity*dimVelocity, Zero) ); bool filmPresent = false; @@ -321,7 +321,7 @@ void waxSolventEvaporation::correctModel max ( -film.rhoSp()(), - dimensionedScalar("zero", film.rhoSp().dimensions(), 0) + dimensionedScalar(film.rhoSp().dimensions(), Zero) ) ); diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C index c5d0e74109..daf961381f 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C @@ -209,12 +209,7 @@ Foam::basicThermo::basicThermo IOobject::NO_WRITE ), mesh, - dimensionedScalar - ( - "zero", - dimensionSet(1, -1, -1, 0, 0), - Zero - ) + dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero) ), dpdt_(lookupOrDefault("dpdt", true)) @@ -259,12 +254,7 @@ Foam::basicThermo::basicThermo IOobject::NO_WRITE ), mesh, - dimensionedScalar - ( - "zero", - dimensionSet(1, -1, -1, 0, 0), - Zero - ) + dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero) ) {} @@ -306,12 +296,7 @@ Foam::basicThermo::basicThermo IOobject::NO_WRITE ), mesh, - dimensionedScalar - ( - "zero", - dimensionSet(1, -1, -1, 0, 0), - Zero - ) + dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero) ), dpdt_(lookupOrDefault("dpdt", true)) diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C index f693549581..a3a89feddd 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C @@ -169,7 +169,7 @@ void Foam::radiation::MarshakRadiationFvPatchScalarField::updateCoeffs() const scalarField& emissivity = temissivity(); - const scalarField Ep(emissivity/(2.0*(scalar(2.0) - emissivity))); + const scalarField Ep(emissivity/(2.0*(scalar(2) - emissivity))); // Set value fraction valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C index c92ff74ced..40e78d3bd3 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C @@ -168,7 +168,7 @@ updateCoeffs() const scalarField& emissivity = temissivity(); - const scalarField Ep(emissivity/(2.0*(scalar(2.0) - emissivity))); + const scalarField Ep(emissivity/(2.0*(scalar(2) - emissivity))); // Set value fraction valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 98906aac4b..47c0d82931 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -212,7 +212,7 @@ updateCoeffs() valueFraction()[faceI] = 1.0; refValue()[faceI] = ( - Ir[faceI]*(scalar(1.0) - emissivity[faceI]) + Ir[faceI]*(scalar(1) - emissivity[faceI]) + emissivity[faceI]*physicoChemical::sigma.value() * pow4(Tp[faceI]) )/pi; diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C index 78402206e4..af7b79b5d1 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C @@ -532,7 +532,7 @@ Foam::radiation::fvDOM::Ru() const false ), mesh_, - dimensionedScalar("zero", dimensionSet(1, -1, -3, 0, 0), 0) + dimensionedScalar(dimensionSet(1, -1, -3, 0, 0), Zero) ) ); diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C index f080c95979..4a4219882b 100644 --- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C +++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C @@ -144,11 +144,11 @@ void Foam::singleStepReactingMixture::fresCorrect() const label speciei = reaction.lhs()[i].index; if (speciei == fuelIndex_) { - fres_[speciei] = max(YFuel - YO2/s_, scalar(0.0)); + fres_[speciei] = max(YFuel - YO2/s_, scalar(0)); } else if (speciei == O2Index) { - fres_[speciei] = max(YO2 - YFuel*s_, scalar(0.0)); + fres_[speciei] = max(YO2 - YFuel*s_, scalar(0)); } } diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C index f99ac1ba9b..b98b178c55 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C @@ -194,8 +194,8 @@ heSolidThermo // TBD. initialise psi, mu (at heThermo level) since these do not // get initialised. Move to heThermo constructor? - this->mu_ == dimensionedScalar("zero", this->mu_.dimensions(), 0.0); - this->psi_ == dimensionedScalar("zero", this->psi_.dimensions(), 0.0); + this->mu_ == dimensionedScalar(this->mu_.dimensions(), Zero); + this->psi_ == dimensionedScalar(this->psi_.dimensions(), Zero); } diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C index 0b00651645..5a165c83ec 100644 --- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C +++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C @@ -63,7 +63,7 @@ Foam::viscosityModels::powerLaw::calcNu() const dimensionedScalar("one", dimTime, 1.0)*strainRate(), dimensionedScalar("SMALL", dimless, SMALL) ), - n_.value() - scalar(1.0) + n_.value() - scalar(1) ) ) ); diff --git a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C index 0c9198a40f..d7555afbb1 100644 --- a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C +++ b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C @@ -64,7 +64,7 @@ Foam::fv::multiphaseMangrovesSource::dragCoeff(const volVectorField& U) const IOobject::NO_WRITE ), mesh_, - dimensionedScalar("0", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, Zero) ); volScalarField& dragCoeff = tdragCoeff.ref(); @@ -110,7 +110,7 @@ Foam::fv::multiphaseMangrovesSource::inertiaCoeff() const IOobject::NO_WRITE ), mesh_, - dimensionedScalar("0", dimless, 0) + dimensionedScalar(dimless, Zero) ); volScalarField& inertiaCoeff = tinertiaCoeff.ref(); diff --git a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C index 039904c85f..01a1083b2a 100644 --- a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C +++ b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C @@ -66,7 +66,7 @@ Foam::fv::multiphaseMangrovesTurbulenceModel::kCoeff IOobject::NO_WRITE ), mesh_, - dimensionedScalar("0", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, Zero) ); volScalarField& kCoeff = tkCoeff.ref(); @@ -112,7 +112,7 @@ Foam::fv::multiphaseMangrovesTurbulenceModel::epsilonCoeff IOobject::NO_WRITE ), mesh_, - dimensionedScalar("0", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, Zero) ); volScalarField& epsilonCoeff = tepsilonCoeff.ref(); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C index 1e6b0068a3..4fbbd66d79 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C +++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) ), mesh.C()/magSqr(mesh.C()) ); - radialDirection.replace(vector::Z, scalar(0.0)); + radialDirection.replace(vector::Z, scalar(0)); radialDirection /= sqrt(magSqr(radialDirection)); radialDirection.write(); @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) ), transform2Tangencial & mesh.C() ); - angularDirection.replace(vector::Z, scalar(0.0)); + angularDirection.replace(vector::Z, scalar(0)); angularDirection /= sqrt(magSqr(angularDirection)); angularDirection.write();