From 287603474a2ba46e6a815b4902662d7080bbab4a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 16 Apr 2016 18:34:41 +0100
Subject: [PATCH] vector::zero -> Zero
---
.../basic/potentialFoam/createFields.H | 2 +-
.../combustion/chemFoam/createFields.H | 2 +-
.../electromagnetics/magneticFoam/magnet.H | 6 +--
.../solid/createSolidFields.H | 2 +-
.../boundaryFoam/createFields.H | 2 +-
.../boundaryFoam/interrogateWallPatches.H | 2 +-
.../solvers/lagrangian/DPMFoam/DPMFoam.C | 4 +-
.../relativeVelocityModel.C | 2 +-
.../multiphaseEulerFoam/createFields.H | 2 +-
.../multiphaseSystem/multiphaseSystem.C | 4 +-
.../multiphaseSystem/phaseModel/phaseModel.C | 2 +-
.../multiphase/multiphaseEulerFoam/pEqn.H | 2 +-
.../potentialFreeSurfaceFoam/createFields.H | 2 +-
.../liftModels/noLift/noLift.C | 4 +-
.../noTurbulentDispersion.C | 4 +-
.../noWallLubrication/noWallLubrication.C | 6 +--
.../MomentumTransferPhaseSystem.C | 4 +-
.../MovingPhaseModel/MovingPhaseModel.C | 2 +-
.../phasePressureModel/phasePressureModel.C | 4 +-
.../liftModels/noLift/noLift.C | 4 +-
.../noTurbulentDispersion.C | 4 +-
.../noWallLubrication/noWallLubrication.C | 6 +--
.../phasePressureModel/phasePressureModel.C | 4 +-
.../tractionDisplacementFvPatchVectorField.C | 8 ++--
.../kineticEnergyLimiter.H | 2 +-
...DisplacementCorrectionFvPatchVectorField.C | 8 ++--
.../test/PatchTools/Test-PatchTools.C | 4 +-
.../test/mappedPatch/Test-MappedPatch.C | 4 +-
.../momentOfInertia/Test-momentOfInertia.C | 8 ++--
.../passiveParticle/Test-passiveParticle.C | 4 +-
.../test/pointField/Test-PointField.C | 4 +-
.../test/primitivePatch/Test-PrimitivePatch.C | 6 +--
.../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 16 ++++----
.../Optional/ccm26ToFoam/ccm26ToFoam.C | 2 +-
.../mesh/conversion/datToFoam/datToFoam.C | 6 +--
.../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 6 +--
.../extrudeToRegionMesh/extrudeToRegionMesh.C | 2 +-
.../backgroundMeshDecomposition.C | 4 +-
.../cellAspectRatioControl.C | 4 +-
.../cellShapeControl/cellShapeControl.C | 4 +-
.../cellShapeControlMesh.C | 2 +-
.../fileControl/fileControl.C | 6 +--
.../searchableSurfaceControl.C | 4 +-
.../conformalVoronoiMesh.C | 4 +-
.../conformalVoronoiMeshConformToSurface.C | 4 +-
.../featurePointConformerSpecialisations.C | 10 ++---
.../indexedCell/indexedCellI.H | 8 ++--
.../conformationSurfaces.C | 2 +-
.../autoDensity/autoDensity.C | 6 +--
.../generation/foamyMesh/foamyQuadMesh/CV2D.C | 2 +-
.../foamyQuadMesh/shortEdgeFilter2D.C | 2 +-
.../manipulation/checkMesh/checkGeometry.C | 2 +-
.../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 2 +-
.../PVFoamReader/vtkPVFoam/vtkPVFoam.C | 2 +-
.../postProcessing/wall/wallGradU/wallGradU.C | 4 +-
.../wall/wallShearStress/wallShearStress.C | 4 +-
.../viewFactorsGen/viewFactorsGen.C | 2 +-
.../surfaceBooleanFeatures.C | 2 +-
.../surfaceFeatureExtract.C | 6 +--
.../surface/surfaceInertia/surfaceInertia.C | 8 ++--
.../surfaceLambdaMuSmooth.C | 2 +-
.../surfaceSplitNonManifolds.C | 4 +-
.../primitives/DiagTensor/DiagTensor.H | 3 ++
.../primitives/DiagTensor/DiagTensorI.H | 7 ++++
.../anisotropicFilter/anisotropicFilter.C | 4 +-
.../fixedShearStressFvPatchVectorField.C | 4 +-
.../turbulenceModels/laminar/laminar.C | 2 +-
.../nonlinearEddyViscosity.C | 2 +-
src/dynamicMesh/boundaryMesh/boundaryMesh.C | 2 +-
.../extrudePatchMesh/extrudePatchMesh.C | 2 +-
src/dynamicMesh/meshCut/cellCuts/cellCuts.C | 2 +-
.../meshCut/cellLooper/geomCellLooper.C | 4 +-
.../directions/directionInfo/directionInfoI.H | 4 +-
.../meshCut/refineCell/refineCell.C | 4 +-
.../polyMeshGeometry/polyMeshGeometry.C | 12 +++---
.../polyMeshAdder/faceCoupleInfo.C | 2 +-
.../polyTopoChange/addObject/polyAddPoint.H | 4 +-
.../polyTopoChange/edgeCollapser.C | 10 ++---
.../modifyObject/polyModifyPoint.H | 4 +-
.../polyTopoChange/polyTopoChange.C | 2 +-
.../slidingInterfaceProjectPoints.C | 4 +-
.../extendedEdgeMesh/extendedEdgeMeshI.H | 4 +-
.../extendedEdgeMeshTemplates.C | 2 +-
.../extendedFeatureEdgeMeshI.H | 4 +-
.../extendedFeatureEdgeMeshTemplates.C | 2 +-
.../cfdTools/general/MRF/MRFZone.C | 2 +-
.../cfdTools/general/MRF/MRFZoneList.C | 2 +-
.../general/SRF/SRFModel/SRFModel/SRFModel.C | 2 +-
.../SRFFreestreamVelocityFvPatchVectorField.C | 4 +-
.../SRFVelocityFvPatchVectorField.C | 4 +-
.../DarcyForchheimer/DarcyForchheimer.C | 14 +++----
.../porosityModel/fixedCoeff/fixedCoeff.C | 10 ++---
.../porosityModel/porosityModel.C | 2 +-
.../activeBaffleVelocityFvPatchVectorField.C | 4 +-
...ureForceBaffleVelocityFvPatchVectorField.C | 2 +-
.../codedMixed/codedMixedFvPatchField.H | 4 +-
...malInletOutletVelocityFvPatchVectorField.C | 10 ++---
...erstitialInletVelocityFvPatchVectorField.C | 4 +-
...mappedVelocityFluxFixedValueFvPatchField.C | 4 +-
.../derived/noSlip/noSlipFvPatchVectorField.C | 6 +--
...utletPhaseMeanVelocityFvPatchVectorField.C | 12 +++---
...aseHydrostaticPressureFvPatchScalarField.C | 4 +-
...tedInletOutletVelocityFvPatchVectorField.C | 6 +--
...tOutletParSlipVelocityFvPatchVectorField.C | 6 +--
...ureInletOutletVelocityFvPatchVectorField.C | 14 +++----
...malInletOutletVelocityFvPatchVectorField.C | 6 +--
.../rotatingWallVelocityFvPatchVectorField.C | 2 +-
.../supersonicFreestreamFvPatchVectorField.C | 8 ++--
...ityHydrostaticPressureFvPatchScalarField.C | 4 +-
.../LeastSquaresGrad/LeastSquaresVectors.C | 2 +-
.../invDistLeastSquaresVectors.C | 6 +--
.../leastSquaresGrad/leastSquaresVectors.C | 6 +--
.../unweightedLeastSquaresVectors.C | 6 +--
.../constraint/cyclicACMI/cyclicACMIFvPatch.C | 2 +-
.../constraint/cyclicAMI/cyclicAMIFvPatch.C | 2 +-
.../advectionDiffusionPatchDistMethod.C | 4 +-
.../fvMesh/wallDist/wallDist/wallDist.C | 2 +-
.../schemes/linearUpwind/linearUpwindV.C | 4 +-
.../skewCorrected/skewCorrectionVectors.C | 2 +-
.../surfaceInterpolation.C | 2 +-
.../displacementSBRStressFvMotionSolver.C | 2 +-
.../displacementInterpolationMotionSolver.C | 2 +-
.../displacementLaplacianFvMotionSolver.C | 2 +-
.../displacementLayeredMotionMotionSolver.C | 4 +-
.../layeredSolver/pointEdgeStructuredWalkI.H | 4 +-
.../velocityLaplacianFvMotionSolver.C | 2 +-
...llatingDisplacementPointPatchVectorField.C | 6 +--
...OscillatingVelocityPointPatchVectorField.C | 6 +--
...llatingDisplacementPointPatchVectorField.C | 4 +-
...oscillatingVelocityPointPatchVectorField.C | 4 +-
...surfaceDisplacementPointPatchVectorField.C | 8 ++--
...aceSlipDisplacementPointPatchVectorField.C | 4 +-
.../waveDisplacementPointPatchVectorField.C | 8 ++--
.../actuationDiskSourceTemplates.C | 4 +-
.../meanVelocityForce/meanVelocityForce.C | 4 +-
.../radialActuationDiskSourceTemplates.C | 4 +-
.../derived/rotorDiskSource/rotorDiskSource.C | 22 +++++------
.../trimModel/targetCoeff/targetCoeffTrim.C | 10 ++---
.../tabulatedAccelerationSource.C | 4 +-
.../interRegionExplicitPorositySource.C | 8 ++--
.../clouds/Templates/DSMCCloud/DSMCCloud.C | 10 ++---
.../clouds/Templates/DSMCCloud/DSMCCloudI.H | 2 +-
.../Templates/DSMCParcel/DSMCParcelIO.C | 2 +-
src/lagrangian/basic/particle/particleI.H | 4 +-
.../basic/particle/particleTemplates.C | 4 +-
.../coalCloudList/coalCloudListI.H | 2 +-
.../Templates/KinematicCloud/KinematicCloud.C | 8 ++--
.../KinematicCloud/KinematicCloudI.H | 2 +-
.../CollidingParcel/CollidingParcelI.H | 8 ++--
.../CollidingParcel/CollidingParcelIO.C | 8 ++--
.../KinematicParcel/KinematicParcel.C | 6 +--
.../KinematicParcel/KinematicParcelI.H | 12 +++---
.../KinematicParcel/KinematicParcelIO.C | 8 ++--
.../Templates/MPPICParcel/MPPICParcelI.H | 4 +-
.../Templates/MPPICParcel/MPPICParcelIO.C | 4 +-
.../MPPICParcel/MPPICParcelTrackingDataI.H | 2 +-
.../ReactingMultiphaseParcel.C | 6 +--
.../Templates/ReactingParcel/ReactingParcel.C | 6 +--
.../Templates/ThermoParcel/ThermoParcel.C | 6 +--
.../ParticleCollector/ParticleCollector.C | 2 +-
.../ParticleForceList/ParticleForceList.C | 4 +-
.../PairCollision/PairCollision.C | 4 +-
.../PairSpringSliderDashpot.C | 6 +--
.../WallLocalSpringSliderDashpot.C | 2 +-
.../WallSpringSliderDashpot.C | 2 +-
.../ConeInjection/ConeInjection.C | 2 +-
.../ConeNozzleInjection/ConeNozzleInjection.C | 8 ++--
.../InflationInjection/InflationInjection.C | 2 +-
.../InjectionModel/InjectionModel.C | 6 +--
.../kinematicParcelInjectionData.C | 4 +-
.../InjectionModel/NoInjection/NoInjection.C | 4 +-
.../DistortedSphereDragForce.C | 4 +-
.../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C | 6 +--
.../Drag/NonSphereDrag/NonSphereDragForce.C | 4 +-
.../PlessisMasliyahDragForce.C | 4 +-
.../Drag/SphereDrag/SphereDragForce.C | 4 +-
.../Drag/WenYuDrag/WenYuDragForce.C | 4 +-
.../ParticleForces/Gravity/GravityForce.C | 4 +-
.../ParticleForces/Lift/LiftForce/LiftForce.C | 4 +-
.../NonInertialFrame/NonInertialFrameForce.C | 20 +++++-----
.../Paramagnetic/ParamagneticForce.C | 4 +-
.../ParticleForce/ParticleForce.C | 6 +--
.../PressureGradient/PressureGradientForce.C | 4 +-
.../Kinematic/ParticleForces/SRF/SRFForce.C | 4 +-
.../LocalInteraction/LocalInteraction.C | 6 +--
.../StandardWallInteraction.C | 4 +-
.../MPPIC/AveragingMethods/Moment/Moment.C | 4 +-
.../MPPIC/DampingModels/NoDamping/NoDamping.C | 4 +-
.../MPPIC/PackingModels/Explicit/Explicit.C | 2 +-
.../MPPIC/PackingModels/Implicit/Implicit.C | 2 +-
.../MPPIC/PackingModels/NoPacking/NoPacking.C | 4 +-
.../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 4 +-
.../molecule/mdTools/averageMDFields.H | 6 +--
.../calculateAutoCorrelationFunctions.H | 6 +--
.../molecule/mdTools/createMDFields.H | 8 ++--
.../mdTools/meanMomentumEnergyAndNMols.H | 8 ++--
.../molecule/mdTools/resetMDFields.H | 2 +-
.../molecule/mdTools/temperatureAndPressure.H | 4 +-
.../mdTools/temperatureAndPressureVariables.H | 4 +-
.../molecule/molecule/molecule.C | 10 ++---
.../molecule/molecule/moleculeI.H | 20 +++++-----
.../molecule/molecule/moleculeIO.C | 16 ++++----
.../molecule/moleculeCloud/moleculeCloud.C | 12 +++---
.../potential/potential/potential.C | 4 +-
.../Templates/SprayParcel/SprayParcelIO.C | 2 +-
.../GradientDispersionRAS.C | 4 +-
.../StochasticDispersionRAS.C | 4 +-
.../BrownianMotion/BrownianMotionForce.C | 2 +-
.../medialAxisMeshMover.C | 20 +++++-----
.../meshRefinement/meshRefinement.C | 2 +-
.../meshRefinement/meshRefinementRefine.C | 8 ++--
.../refinementFeatures/refinementFeatures.C | 4 +-
.../refinementSurfaces/refinementSurfaces.C | 4 +-
.../snappyHexMeshDriver/snappyLayerDriver.C | 16 ++++----
.../snappyLayerDriverShrink.C | 10 ++---
.../snappyHexMeshDriver/snappySnapDriver.C | 18 ++++-----
.../snappySnapDriverFeature.C | 38 +++++++++----------
.../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 16 ++++----
.../coordinateRotation/axesRotation.C | 2 +-
.../coordinateRotation/cylindrical.C | 14 +++----
.../coordinateSystems/coordinateSystem.C | 2 +-
src/meshTools/indexedOctree/treeDataFace.C | 4 +-
.../indexedOctree/treeDataPrimitivePatch.C | 2 +-
.../mappedPolyPatch/mappedPatchBase.C | 10 ++---
src/meshTools/meshTools/meshTools.C | 2 +-
.../momentOfInertia/momentOfInertia.C | 8 ++--
.../primitiveMeshGeometry.C | 10 ++---
.../searchableSurface/searchableBox.C | 2 +-
.../searchableSurface/searchableCylinder.C | 4 +-
.../searchableSurface/searchableDisk.C | 6 +--
.../searchableSurface/searchablePlane.C | 2 +-
.../searchableSurface/searchablePlate.C | 4 +-
.../searchableSurface/searchableSphere.C | 2 +-
.../searchableSurfaceWithGaps.C | 2 +-
.../searchableSurfacesQueries.C | 2 +-
.../searchableSurface/triSurfaceMesh.C | 6 +--
.../faceSources/regionToFace/regionToFace.C | 4 +-
.../booleanSurface/booleanSurface.C | 4 +-
.../surfaceLocation/surfaceLocation.C | 4 +-
.../triSurfaceSearch/triSurfaceRegionSearch.C | 4 +-
.../triSurfaceSearch/triSurfaceSearch.C | 2 +-
.../triSurfaceTools/triSurfaceTools.C | 2 +-
.../twoDPointCorrector/twoDPointCorrector.C | 4 +-
.../forces/forceCoeffs/forceCoeffs.C | 6 +--
.../functionObjects/forces/forces/forces.C | 22 +++++------
.../utilities/pressureTools/pressureTools.C | 2 +-
.../utilities/vorticity/vorticity.C | 4 +-
.../wallShearStress/wallShearStress.C | 4 +-
.../regionModel/regionModel1D/regionModel1D.C | 4 +-
.../singleLayerRegion/singleLayerRegion.C | 4 +-
.../kinematicSingleLayer.C | 8 ++--
.../filmTurbulenceModel/laminar/laminar.C | 2 +-
.../contactAngleForce/contactAngleForce.C | 2 +-
.../curvatureSeparation/curvatureSeparation.C | 2 +-
src/rigidBodyMeshMotion/rigidBodyMeshMotion.C | 2 +-
.../triSurfaceMeshPointSet.C | 4 +-
.../sampledSurface/isoSurface/isoSurface.C | 6 +--
.../isoSurface/isoSurfaceCell.C | 4 +-
...gidBodyDisplacementPointPatchVectorField.C | 6 +--
...gidBodyDisplacementPointPatchVectorField.C | 6 +--
...xDoFRigidBodyMotionOrientationConstraint.C | 4 +-
.../sixDoFRigidBodyMotionPointConstraint.C | 4 +-
.../linearAxialAngularSpring.C | 6 +--
.../restraints/linearDamper/linearDamper.C | 4 +-
.../restraints/linearSpring/linearSpring.C | 4 +-
.../sphericalAngularDamper.C | 4 +-
.../sphericalAngularSpring.C | 10 ++---
.../tabulatedAxialAngularSpring.C | 4 +-
.../sixDoFRigidBodyMotion.C | 10 ++---
.../sixDoFRigidBodyMotionState.C | 12 +++---
.../sixDoFRigidBodyMotionSolver.C | 4 +-
.../radiativeIntensityRay.C | 4 +-
.../faceTriangulation/faceTriangulation.C | 2 +-
273 files changed, 704 insertions(+), 696 deletions(-)
diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H
index a4e09d481f..80866b5779 100644
--- a/applications/solvers/basic/potentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/createFields.H
@@ -12,7 +12,7 @@ volVectorField U
mesh
);
-U = dimensionedVector("0", U.dimensions(), vector::zero);
+U = dimensionedVector("0", U.dimensions(), Zero);
surfaceScalarField phi
(
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index 698ca98463..2d2e9d1ebd 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -80,7 +80,7 @@
IOobject::NO_WRITE
),
mesh,
- dimensionedVector("zero", dimVelocity, vector::zero)
+ dimensionedVector("zero", dimVelocity, Zero)
);
#include "createPhi.H"
diff --git a/applications/solvers/electromagnetics/magneticFoam/magnet.H b/applications/solvers/electromagnetics/magneticFoam/magnet.H
index 031f64ca09..7e9b04a4c5 100644
--- a/applications/solvers/electromagnetics/magneticFoam/magnet.H
+++ b/applications/solvers/electromagnetics/magneticFoam/magnet.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -72,7 +72,7 @@ public:
inline magnet()
:
remanence_("Mr", dimensionSet(0, -1, 0, 0, 0, 1, 0), 0),
- orientation_(vector::zero)
+ orientation_(Zero)
{}
//- Construct from components
@@ -94,7 +94,7 @@ public:
inline magnet(Istream& is)
:
remanence_("Mr", dimensionSet(0, -1, 0, 0, 0, 1, 0), 0),
- orientation_(vector::zero)
+ orientation_(Zero)
{
is >> *this;
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index d80e053727..f900fba316 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -55,7 +55,7 @@
(
"zero",
tkappaByCp().dimensions(),
- symmTensor::zero
+ Zero
),
zeroGradientFvPatchSymmTensorField::typeName
)
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 0298c8339c..dff4b701f5 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -45,5 +45,5 @@ dimensionedVector gradP
(
"gradP",
dimensionSet(0, 1, -2, 0, 0),
- vector::zero
+ Zero
);
diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
index 513ca54a42..ca337512dc 100644
--- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -3,7 +3,7 @@
label faceId(-1);
label patchId(-1);
label nWallFaces(0);
-vector wallNormal(vector::zero);
+vector wallNormal(Zero);
const fvPatchList& patches = mesh.boundary();
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index 9e2208479d..728e3e45d2 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -102,14 +102,14 @@ int main(int argc, char *argv[])
(
"0",
cloudSU.dimensions()/dimVolume,
- vector::zero
+ Zero
),
zeroGradientFvPatchVectorField::typeName
);
cloudVolSUSu.internalField() = -cloudSU.source()/mesh.V();
cloudVolSUSu.correctBoundaryConditions();
- cloudSU.source() = vector::zero;
+ cloudSU.source() = Zero;
// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
index 5131d63e57..c8e3bb3721 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@@ -59,7 +59,7 @@ Foam::relativeVelocityModel::relativeVelocityModel
IOobject::AUTO_WRITE
),
alphac_.mesh(),
- dimensionedVector("Udm", dimVelocity, vector::zero)
+ dimensionedVector("Udm", dimVelocity, Zero)
)
{}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
index 0747583599..212160b83e 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
@@ -23,7 +23,7 @@ volVectorField U
IOobject::AUTO_WRITE
),
mesh,
- dimensionedVector("U", dimVelocity, vector::zero)
+ dimensionedVector("U", dimVelocity, Zero)
);
surfaceScalarField phi
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 27a5067edd..3f514904ec 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -634,7 +634,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
(
"Svm",
dimensionSet(1, -2, -2, 0, 0),
- vector::zero
+ Zero
)
)
);
@@ -677,7 +677,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
)
)
{
- tSvm.ref().boundaryField()[patchi] = vector::zero;
+ tSvm.ref().boundaryField()[patchi] = Zero;
}
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 2f5f833d20..7929a9d1ad 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -99,7 +99,7 @@ Foam::phaseModel::phaseModel
mesh
),
mesh,
- dimensionedVector("0", dimVelocity/dimTime, vector::zero)
+ dimensionedVector("0", dimVelocity/dimTime, Zero)
),
alphaPhi_
(
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 4cddb12921..bbcc36f4e7 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -264,7 +264,7 @@
mSfGradp = pEqnIncomp.flux()/rAUf;
- U = dimensionedVector("U", dimVelocity, vector::zero);
+ U = dimensionedVector("U", dimVelocity, Zero);
phasei = 0;
forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
index 40ba336dad..23845a4f75 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
@@ -49,7 +49,7 @@ volVectorField zeta
IOobject::AUTO_WRITE
),
mesh,
- dimensionedVector("zero", dimLength, vector::zero)
+ dimensionedVector("zero", dimLength, Zero)
);
Info<< "Creating field p_gh\n" << endl;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
index d4e13d5c7f..f8480dc69b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -101,7 +101,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
false
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 5845e3569a..2a65c1e1c6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -107,7 +107,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::F() const
mesh
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 8de7e30260..b35bd0ef8f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
false
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
@@ -108,7 +108,7 @@ Foam::wallLubricationModels::noWallLubrication::F() const
false
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 6ea8dadf59..b9859eb41d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -317,7 +317,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::F
false
),
this->mesh_,
- dimensionedVector("zero", liftModel::dimF, vector::zero)
+ dimensionedVector("zero", liftModel::dimF, Zero)
)
);
}
@@ -533,7 +533,7 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
false
),
this->mesh_,
- dimensionedVector("zero", liftModel::dimF, vector::zero)
+ dimensionedVector("zero", liftModel::dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index de31cefaa3..4563f191b9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -173,7 +173,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
fluid.mesh()
),
fluid.mesh(),
- dimensionedVector("0", dimAcceleration, vector::zero)
+ dimensionedVector("0", dimAcceleration, Zero)
),
divU_(NULL),
turbulence_
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index a9eb50af35..9d3b53c782 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -144,7 +144,7 @@ Foam::RASModels::phasePressureModel::R() const
(
"R",
dimensionSet(0, 2, -2, 0, 0),
- symmTensor::zero
+ Zero
)
)
);
@@ -227,7 +227,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const
(
"R",
rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
- symmTensor::zero
+ Zero
)
)
);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
index d4e13d5c7f..f8480dc69b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -101,7 +101,7 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
false
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 5845e3569a..2a65c1e1c6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -107,7 +107,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::F() const
mesh
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 8de7e30260..b35bd0ef8f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
false
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
@@ -108,7 +108,7 @@ Foam::wallLubricationModels::noWallLubrication::F() const
false
),
mesh,
- dimensionedVector("zero", dimF, vector::zero)
+ dimensionedVector("zero", dimF, Zero)
)
);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 3c8b16027f..0c5906d905 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -150,7 +150,7 @@ Foam::RASModels::phasePressureModel::R() const
(
"R",
dimensionSet(0, 2, -2, 0, 0),
- symmTensor::zero
+ Zero
)
)
);
@@ -233,7 +233,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const
(
"R",
rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
- symmTensor::zero
+ Zero
)
)
);
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
index 57f4e68589..49d62b804e 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,11 +42,11 @@ tractionDisplacementFvPatchVectorField
)
:
fixedGradientFvPatchVectorField(p, iF),
- traction_(p.size(), vector::zero),
+ traction_(p.size(), Zero),
pressure_(p.size(), 0.0)
{
fvPatchVectorField::operator=(patchInternalField());
- gradient() = vector::zero;
+ gradient() = Zero;
}
@@ -78,7 +78,7 @@ tractionDisplacementFvPatchVectorField
pressure_("pressure", dict, p.size())
{
fvPatchVectorField::operator=(patchInternalField());
- gradient() = vector::zero;
+ gradient() = Zero;
}
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
index 169c7f229f..589566e3a1 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H
@@ -14,6 +14,6 @@ if (!(runTime.timeIndex() % 5))
if (smi < -SMALL)
{
Info<< "Resetting Dcorr to 0" << endl;
- Dcorr == dimensionedVector("0", Dcorr.dimensions(), vector::zero);
+ Dcorr == dimensionedVector("0", Dcorr.dimensions(), Zero);
}
}
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
index debf1ee9a3..33c1e8a8c6 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,11 +42,11 @@ tractionDisplacementCorrectionFvPatchVectorField
)
:
fixedGradientFvPatchVectorField(p, iF),
- traction_(p.size(), vector::zero),
+ traction_(p.size(), Zero),
pressure_(p.size(), 0.0)
{
fvPatchVectorField::operator=(patchInternalField());
- gradient() = vector::zero;
+ gradient() = Zero;
}
@@ -78,7 +78,7 @@ tractionDisplacementCorrectionFvPatchVectorField
pressure_("pressure", dict, p.size())
{
fvPatchVectorField::operator=(patchInternalField());
- gradient() = vector::zero;
+ gradient() = Zero;
}
diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C
index 7807287900..094ea00f10 100644
--- a/applications/test/PatchTools/Test-PatchTools.C
+++ b/applications/test/PatchTools/Test-PatchTools.C
@@ -66,7 +66,7 @@ using namespace Foam;
// // (note:without calculating pointNormals
// // to avoid them being stored)
//
-// tmp<pointField> textrudeN(new pointField(p.nPoints(), vector::zero));
+// tmp<pointField> textrudeN(new pointField(p.nPoints(), Zero));
// pointField& extrudeN = textrudeN();
// {
// const faceList& localFaces = p.localFaces();
@@ -123,7 +123,7 @@ using namespace Foam;
// globalData.globalPointTransformedSlaves();
//
//
-// pointField coupledPointNormals(map.constructSize(), vector::zero);
+// pointField coupledPointNormals(map.constructSize(), Zero);
//
// forAll(meshPoints, patchPointI)
// {
diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C
index 9f0258dfec..d1a28a823a 100644
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
IOobject::AUTO_WRITE
),
mesh,
- dimensionedVector("zero", dimLength, vector::zero),
+ dimensionedVector("zero", dimLength, Zero),
patchFieldTypes
);
diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C
index a1d9c7c133..726454e3a1 100644
--- a/applications/test/momentOfInertia/Test-momentOfInertia.C
+++ b/applications/test/momentOfInertia/Test-momentOfInertia.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
point Cf = f.centre(pts);
- tensor J = tensor::zero;
+ tensor J = Zero;
J = f.inertia(pts, Cf, density);
@@ -141,8 +141,8 @@ int main(int argc, char *argv[])
tetFaces[3] = triFace(0, 1, 3);
scalar m = 0.0;
- vector cM = vector::zero;
- tensor J = tensor::zero;
+ vector cM = Zero;
+ tensor J = Zero;
momentOfInertia::massPropertiesSolid(pts, tetFaces, density, m, cM, J);
diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C
index 05c28602d2..68bea7b8ef 100644
--- a/applications/test/passiveParticle/Test-passiveParticle.C
+++ b/applications/test/passiveParticle/Test-passiveParticle.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
Pout<< "Starting particles:" << particles.size() << endl;
Pout<< "Adding a particle." << endl;
- particles.addParticle(new passiveParticle(mesh, vector::zero, -1));
+ particles.addParticle(new passiveParticle(mesh, Zero, -1));
forAllConstIter(passiveParticleCloud, particles, iter)
{
diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C
index b2524a2044..020fdb0e60 100644
--- a/applications/test/pointField/Test-PointField.C
+++ b/applications/test/pointField/Test-PointField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
IOobject::AUTO_WRITE
),
pMesh,
- dimensionedVector("fvmU", dimLength, vector::zero),
+ dimensionedVector("fvmU", dimLength, Zero),
pointPatchVectorField::calculatedType()
);
diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C
index 3f5e9161e3..c575782f4c 100644
--- a/applications/test/primitivePatch/Test-PrimitivePatch.C
+++ b/applications/test/primitivePatch/Test-PrimitivePatch.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -156,7 +156,7 @@ void writeEdgeFaces
OFstream efStream("edgeFaces.obj");
- pointField ctrs(localFaces.size(), vector::zero);
+ pointField ctrs(localFaces.size(), Zero);
forAll(localFaces, faceI)
{
@@ -188,7 +188,7 @@ void writeFaceFaces
OFstream ffStream("faceFaces.obj");
- pointField ctrs(localFaces.size(), vector::zero);
+ pointField ctrs(localFaces.size(), Zero);
forAll(localFaces, faceI)
{
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 8be739c5ff..0f6ad2efe3 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -1075,25 +1075,25 @@ int main(int argc, char *argv[])
(
subsetter.subMesh(),
map,
- vector::zero
+ Zero
);
initCreatedPatches<volSphericalTensorField>
(
subsetter.subMesh(),
map,
- sphericalTensor::zero
+ Zero
);
initCreatedPatches<volSymmTensorField>
(
subsetter.subMesh(),
map,
- symmTensor::zero
+ Zero
);
initCreatedPatches<volTensorField>
(
subsetter.subMesh(),
map,
- tensor::zero
+ Zero
);
initCreatedPatches<surfaceScalarField>
@@ -1106,25 +1106,25 @@ int main(int argc, char *argv[])
(
subsetter.subMesh(),
map,
- vector::zero
+ Zero
);
initCreatedPatches<surfaceSphericalTensorField>
(
subsetter.subMesh(),
map,
- sphericalTensor::zero
+ Zero
);
initCreatedPatches<surfaceSymmTensorField>
(
subsetter.subMesh(),
map,
- symmTensor::zero
+ Zero
);
initCreatedPatches<surfaceTensorField>
(
subsetter.subMesh(),
map,
- tensor::zero
+ Zero
);
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index 83ffb09f39..b95acd7978 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -213,7 +213,7 @@ void ReadVertices
// Convert to foamPoints
foamPoints.setSize(nVertices);
- foamPoints = vector::zero;
+ foamPoints = Zero;
foamPointMap.setSize(nVertices);
forAll(foamPointMap, i)
diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
index c10b7c761d..4ee10d1f15 100644
--- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
+++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
// We ignore the first layer of points in i and j the biconic meshes
label nPointsij = (iPoints - 1)*(jPoints - 1);
- pointField points(nPointsij, vector::zero);
+ pointField points(nPointsij, Zero);
for (direction comp = 0; comp < 2; comp++)
{
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
}
}
- pointField pointsWedge(nPointsij*2, vector::zero);
+ pointField pointsWedge(nPointsij*2, Zero);
fileName pointsFile(runTime.constantPath()/"points.tmp");
OFstream pFile(pointsFile);
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 10a4b189b5..1d28f046dc 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1089,9 +1089,9 @@ int main(int argc, char *argv[])
mesh.boundaryMesh(),
neighbPatchName,
cyclicPolyPatch::NOORDERING,
- vector::zero,
- vector::zero,
- vector::zero
+ Zero,
+ Zero,
+ Zero
);
}
else
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index ac12a39f4e..8c5c0c458c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -2296,7 +2296,7 @@ int main(int argc, char *argv[])
// Calculate region normals by reducing local region normals
pointField localRegionNormals(localToGlobalRegion.size());
{
- pointField localSum(localToGlobalRegion.size(), vector::zero);
+ pointField localSum(localToGlobalRegion.size(), Zero);
forAll(pointLocalRegions, faceI)
{
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
index 72a0b76e55..c1bf4ed7fe 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@@ -533,7 +533,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
// pointField samplePoints
// (
// volRes_*volRes_*volRes_,
-// vector::zero
+// Zero
// );
//
// // scalar sampleVol = cellBb.volume()/samplePoints.size();
@@ -1238,7 +1238,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
const point& e = ends[sI];
// Dummy point for treeBoundBox::intersects
- point p(vector::zero);
+ point p(Zero);
label nCandidates = 0;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
index bbd52ecfe7..191ddf53a9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -40,7 +40,7 @@ Foam::cellAspectRatioControl::cellAspectRatioControl
aspectRatioDict_.lookupOrDefault<vector>
(
"aspectRatioDirection",
- vector::zero
+ Zero
)
)
{
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
index 9e3e9e82ad..4283fb7c35 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
@@ -177,7 +177,7 @@ Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
shapeControlMesh_.barycentricCoords(pt, bary, ch);
- tensor alignment = tensor::zero;
+ tensor alignment = Zero;
if (shapeControlMesh_.dimension() < 3 || shapeControlMesh_.is_infinite(ch))
{
@@ -249,7 +249,7 @@ void Foam::cellShapeControl::cellSizeAndAlignment
shapeControlMesh_.barycentricCoords(pt, bary, ch);
- alignment = tensor::zero;
+ alignment = Zero;
size = 0;
if (shapeControlMesh_.dimension() < 3 || shapeControlMesh_.is_infinite(ch))
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index 24916fa50b..8c597b90f1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -601,7 +601,7 @@ void Foam::cellShapeControlMesh::distribute
Foam::tensorField Foam::cellShapeControlMesh::dumpAlignments() const
{
- tensorField alignmentsTmp(number_of_vertices(), tensor::zero);
+ tensorField alignmentsTmp(number_of_vertices(), Zero);
label count = 0;
for
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
index 921298660d..b2ed90169f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -119,7 +119,7 @@ Foam::fileControl::~fileControl()
//
// label nearest = 0;
//
-// tensor alignment = Foam::tensor::zero;
+// tensor alignment = Zero;
// forAll(bary, pI)
// {
// //alignment += bary[pI]*ch->vertex(pI)->alignment();
@@ -155,7 +155,7 @@ Foam::fileControl::~fileControl()
// size += bary[pI]*ch->vertex(pI)->size();
// }
//
-//// alignment = Foam::tensor::zero;
+//// alignment = Zero;
//// forAll(bary, pI)
//// {
//// alignment += bary[pI]*ch->vertex(pI)->alignment();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
index 851a773b06..ef565a405f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -100,7 +100,7 @@ addToRunTimeSelectionTable
//
// const tensor Rp = rotationTensor(vector(0,0,1), np);
//
-// vector na = vector::zero;
+// vector na = Zero;
//
// scalar smallestAngle = GREAT;
//
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 601fcc95a7..3b892fc44a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -1080,7 +1080,7 @@ void Foam::conformalVoronoiMesh::move()
vectorField displacementAccumulator
(
number_of_vertices(),
- vector::zero
+ Zero
);
PackedBoolList pointToBeRetained
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 638ae6a51b..e8013eb1c4 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -1581,7 +1581,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
// Do not allow infinite recursion
if (callCount > 7)
{
- displacement = vector::zero;
+ displacement = Zero;
return;
}
@@ -1630,7 +1630,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
if (magSqr(pt - surfHit.hitPoint()) <= searchDistanceSqr)
{
// Cannot limit displacement, point closer than tolerance
- displacement = vector::zero;
+ displacement = Zero;
return;
}
}
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index 56c5929343..826372dab3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -200,8 +200,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
Foam::point externalPtD;
Foam::point externalPtE;
- vector convexEdgePlaneCNormal(vector::zero);
- vector convexEdgePlaneDNormal(vector::zero);
+ vector convexEdgePlaneCNormal(Zero);
+ vector convexEdgePlaneDNormal(Zero);
const labelList& concaveEdgeNormals = edgeNormals[concaveEdgeI];
const labelList& convexEdgeANormals = edgeNormals[convexEdgesI[0]];
@@ -632,8 +632,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
Foam::point externalPtD;
Foam::point externalPtE;
- vector concaveEdgePlaneCNormal(vector::zero);
- vector concaveEdgePlaneDNormal(vector::zero);
+ vector concaveEdgePlaneCNormal(Zero);
+ vector concaveEdgePlaneDNormal(Zero);
const labelList& convexEdgeNormals = edgeNormals[convexEdgeI];
const labelList& concaveEdgeANormals = edgeNormals[concaveEdgesI[0]];
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
index 14695671d9..2b1d991a69 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/
-//#include "indexedCellChecks.H"
-
template<class Gt, class Cb>
Foam::tetCell CGAL::indexedCell<Gt, Cb>::unsortedVertexGlobalIndices
(
@@ -578,8 +576,8 @@ inline bool CGAL::indexedCell<Gt, Cb>::potentialCoplanarCell() const
if (nMasters == 2 && nSlaves == 2)
{
- Foam::vector vp0(Foam::vector::zero);
- Foam::vector vp1(Foam::vector::zero);
+ Foam::vector vp0(Foam::Zero);
+ Foam::vector vp1(Foam::Zero);
if
(
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index f79c96654d..47efc0e8fa 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -43,7 +43,7 @@ void Foam::conformationSurfaces::hasBoundedVolume
List<volumeType>& referenceVolumeTypes
) const
{
- vector sum(vector::zero);
+ vector sum(Zero);
label totalTriangles = 0;
forAll(surfaces_, s)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index 5ce01e23b5..e2d1001504 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -416,7 +416,7 @@ bool Foam::autoDensity::fillBox
label nLine = 6*(surfRes_ - 2);
- pointField linePoints(nLine, vector::zero);
+ pointField linePoints(nLine, Zero);
scalarField lineSizes(nLine, 0.0);
@@ -532,7 +532,7 @@ bool Foam::autoDensity::fillBox
pointField samplePoints
(
volRes_*volRes_*volRes_,
- vector::zero
+ Zero
);
vector delta = span/volRes_;
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index 8a0443e1a8..9a56358064 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -862,7 +862,7 @@ void Foam::CV2D::newPoints()
edgei = 0;
// Initialise the displacement for the centre and sum-weights
- vector2D disp = vector2D::zero;
+ vector2D disp = Zero;
scalar sumw = 0;
do
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
index 91da90bf77..e8caabad93 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C
@@ -426,7 +426,7 @@ Foam::shortEdgeFilter2D::filter()
label totalNewPoints = points.size() - nPointsToRemove;
- pointField newPoints(totalNewPoints, vector::zero);
+ pointField newPoints(totalNewPoints, Zero);
labelList newPointNumbers(points.size(), -1);
label numberRemoved = 0;
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 2060a4687e..5b7bb7708f 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -285,7 +285,7 @@ namespace Foam
label n = 0;
// Extract for every face the i'th position
- pointField ptsAtIndex(pts.size(), vector::zero);
+ pointField ptsAtIndex(pts.size(), Zero);
forAll(cpp, faceI)
{
const pointField& facePts = pts[faceI];
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index f30956dddb..836e84a6ab 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -704,7 +704,7 @@ void Foam::vtkPV3Foam::renderPatchNames(vtkRenderer* renderer, const bool show)
// Create storage for additional zone centres
forAll(zoneNFaces, zoneI)
{
- zoneCentre[patchI].append(vector::zero);
+ zoneCentre[patchI].append(Zero);
}
// Do averaging per individual zone
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 2bfefc267c..a55567dbe1 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -708,7 +708,7 @@ void Foam::vtkPVFoam::renderPatchNames
// Create storage for additional zone centres
forAll(zoneNFaces, zoneI)
{
- zoneCentre[patchI].append(vector::zero);
+ zoneCentre[patchI].append(Zero);
}
// Do averaging per individual zone
diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
index 7d58220a59..89fcc68dbc 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
+++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
(
"wallGradU",
U.dimensions()/dimLength,
- vector::zero
+ Zero
)
);
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index b834cd1871..89c9e9e58a 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
(
"wallShearStress",
sqr(dimLength)/sqr(dimTime),
- vector::zero
+ Zero
)
);
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index cdafdf3b20..9d247dabd6 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -738,7 +738,7 @@ int main(int argc, char *argv[])
{
const boundBox& box = mesh.bounds();
const Vector<label>& dirs = mesh.geometricD();
- vector emptyDir = vector::zero;
+ vector emptyDir = Zero;
forAll(dirs, i)
{
if (dirs[i] == -1)
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index b539946bc6..1acf1835a6 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -504,7 +504,7 @@ int main(int argc, char *argv[])
label nFeatEds = inter.cutEdges().size();
DynamicList<vector> normals(2*nFeatEds);
- vectorField edgeDirections(nFeatEds, vector::zero);
+ vectorField edgeDirections(nFeatEds, Zero);
DynamicList<extendedFeatureEdgeMesh::sideVolumeType> normalVolumeTypes
(
2*nFeatEds
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 2882e6af2a..cf8373b4c3 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -196,7 +196,7 @@ vectorField calcVertexNormals(const triSurface& surf)
Info<< "Calculating vertex normals" << endl;
- vectorField pointNormals(surf.nPoints(), vector::zero);
+ vectorField pointNormals(surf.nPoints(), Zero);
const pointField& points = surf.points();
const labelListList& pointFaces = surf.pointFaces();
@@ -276,8 +276,8 @@ triSurfacePointScalarField calcCurvature
const edgeList fEdges = f.edges();
// Calculate the edge vectors and the normal differences
- vectorField edgeVectors(f.size(), vector::zero);
- vectorField normalDifferences(f.size(), vector::zero);
+ vectorField edgeVectors(f.size(), Zero);
+ vectorField normalDifferences(f.size(), Zero);
forAll(fEdges, feI)
{
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index fa714c2bb5..d41147e0d2 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,14 +83,14 @@ int main(int argc, char *argv[])
const fileName surfFileName = args[1];
const scalar density = args.optionLookupOrDefault("density", 1.0);
- vector refPt = vector::zero;
+ vector refPt = Zero;
bool calcAroundRefPt = args.optionReadIfPresent("referencePoint", refPt);
triSurface surf(surfFileName);
scalar m = 0.0;
- vector cM = vector::zero;
- tensor J = tensor::zero;
+ vector cM = Zero;
+ tensor J = Zero;
if (args.optionFound("shellProperties"))
{
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index 46bbfdf395..9daa179437 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -56,7 +56,7 @@ tmp<pointField> avg
{
const labelListList& pointEdges = s.pointEdges();
- tmp<pointField> tavg(new pointField(s.nPoints(), vector::zero));
+ tmp<pointField> tavg(new pointField(s.nPoints(), Zero));
pointField& avg = tavg.ref();
forAll(pointEdges, vertI)
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index e3a4bc56de..3e69502c79 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -558,7 +558,7 @@ void calcPointVecs
// Determine vector as average of the vectors in the two faces.
// If there is only one face available use only one vector.
- vector midVec(vector::zero);
+ vector midVec(Zero);
if (face0I != -1)
{
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index cd61a57988..3973e00dac 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -77,6 +77,9 @@ public:
//- Construct null
inline DiagTensor();
+ //- Construct initialized to zero
+ inline DiagTensor(const Foam::zero);
+
//- Construct given VectorSpace
template<class Cmpt2>
inline DiagTensor(const VectorSpace<DiagTensor<Cmpt2>, Cmpt2, 3>&);
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 49ed7b8998..3faf0a22e7 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -33,6 +33,13 @@ inline Foam::DiagTensor<Cmpt>::DiagTensor()
{}
+template<class Cmpt>
+inline Foam::DiagTensor<Cmpt>::DiagTensor(const Foam::zero)
+:
+ VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>(Zero)
+{}
+
+
template<class Cmpt>
template<class Cmpt2>
inline Foam::DiagTensor<Cmpt>::DiagTensor
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index 8128591b42..0d326caa8c 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -57,7 +57,7 @@ Foam::anisotropicFilter::anisotropicFilter
mesh
),
mesh,
- dimensionedVector("zero", dimLength*dimLength, vector::zero),
+ dimensionedVector("zero", dimLength*dimLength, Zero),
calculatedFvPatchVectorField::typeName
)
{
@@ -94,7 +94,7 @@ Foam::anisotropicFilter::anisotropicFilter
mesh
),
mesh,
- dimensionedVector("zero", dimLength*dimLength, vector::zero),
+ dimensionedVector("zero", dimLength*dimLength, Zero),
calculatedFvPatchScalarField::typeName
)
{
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 979bd51893..db3e262477 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -39,7 +39,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
)
:
fixedValueFvPatchVectorField(p, iF),
- tau0_(vector::zero)
+ tau0_(Zero)
{}
@@ -51,7 +51,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
)
:
fixedValueFvPatchVectorField(p, iF),
- tau0_(dict.lookupOrDefault<vector>("tau", vector::zero))
+ tau0_(dict.lookupOrDefault<vector>("tau", Zero))
{
fvPatchField<vector>::operator=(patchInternalField());
}
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
index cb7a802655..2e60815a41 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C
@@ -240,7 +240,7 @@ Foam::laminar<BasicTurbulenceModel>::R() const
this->mesh_,
dimensionedSymmTensor
(
- "R", sqr(this->U_.dimensions()), symmTensor::zero
+ "R", sqr(this->U_.dimensions()), Zero
)
)
);
diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
index 409e9e8ca9..c38f806e26 100644
--- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C
@@ -67,7 +67,7 @@ Foam::nonlinearEddyViscosity<BasicTurbulenceModel>::nonlinearEddyViscosity
(
"nonlinearStress",
sqr(dimVelocity),
- symmTensor::zero
+ Zero
)
)
{}
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index aed63e9f62..29b9450f55 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -557,7 +557,7 @@ void Foam::boundaryMesh::read(const polyMesh& mesh)
{
const face& f = msh[faceI];
- point ctr(vector::zero);
+ point ctr(Zero);
forAll(f, fp)
{
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index d2e00ec96f..fc066d7e9e 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -203,7 +203,7 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
// Calculate region normals by reducing local region normals
pointField localRegionNormals(localToGlobalRegion.size());
{
- pointField localSum(localToGlobalRegion.size(), vector::zero);
+ pointField localSum(localToGlobalRegion.size(), Zero);
forAll(pointLocalRegions, faceI)
{
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 388a9f2ff5..c499fbcb5d 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -1208,7 +1208,7 @@ bool Foam::cellCuts::loopAnchorConsistent
// Get average position of anchor points.
- vector avg(vector::zero);
+ vector avg(Zero);
forAll(anchorPoints, ptI)
{
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
index 2b1310ab91..230948a42b 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -384,7 +384,7 @@ bool Foam::geomCellLooper::cut
// Get points on loop and centre of loop
pointField loopPoints(localLoop.size());
- point ctr(vector::zero);
+ point ctr(Zero);
forAll(localLoop, i)
{
diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
index c2c77f7384..d1c51df3f1 100644
--- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
+++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,7 +33,7 @@ License
inline Foam::directionInfo::directionInfo()
:
index_(-3),
- n_(vector::zero)
+ n_(Zero)
{}
diff --git a/src/dynamicMesh/meshCut/refineCell/refineCell.C b/src/dynamicMesh/meshCut/refineCell/refineCell.C
index 5517d34a66..bcc88ca8e1 100644
--- a/src/dynamicMesh/meshCut/refineCell/refineCell.C
+++ b/src/dynamicMesh/meshCut/refineCell/refineCell.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ License
Foam::refineCell::refineCell()
:
cellNo_(-1),
- direction_(vector::zero)
+ direction_(Zero)
{}
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index 2bd277acac..8738f58979 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
@@ -63,9 +63,9 @@ void Foam::polyMeshGeometry::updateFaceCentresAndAreas
}
else
{
- vector sumN = vector::zero;
+ vector sumN = Zero;
scalar sumA = 0.0;
- vector sumAc = vector::zero;
+ vector sumAc = Zero;
point fCentre = p[f[0]];
for (label pi = 1; pi < nPoints; pi++)
@@ -102,7 +102,7 @@ void Foam::polyMeshGeometry::updateCellCentresAndVols
)
{
// Clear the fields for accumulation
- UIndirectList<vector>(cellCentres_, changedCells) = vector::zero;
+ UIndirectList<vector>(cellCentres_, changedCells) = Zero;
UIndirectList<scalar>(cellVolumes_, changedCells) = 0.0;
const labelList& own = mesh_.faceOwner();
@@ -111,7 +111,7 @@ void Foam::polyMeshGeometry::updateCellCentresAndVols
// first estimate the approximate cell centre as the average of face centres
vectorField cEst(mesh_.nCells());
- UIndirectList<vector>(cEst, changedCells) = vector::zero;
+ UIndirectList<vector>(cEst, changedCells) = Zero;
scalarField nCellFaces(mesh_.nCells());
UIndirectList<scalar>(nCellFaces, changedCells) = 0.0;
@@ -1693,7 +1693,7 @@ bool Foam::polyMeshGeometry::checkFaceTwist
if (f.size() > 3)
{
- vector nf(vector::zero);
+ vector nf(Zero);
if (mesh.isInternalFace(faceI))
{
@@ -2118,7 +2118,7 @@ bool Foam::polyMeshGeometry::checkCellDeterminant
{
const cell& cFaces = cells[affectedCells[i]];
- tensor areaSum(tensor::zero);
+ tensor areaSum(Zero);
scalar magAreaSum = 0;
forAll(cFaces, cFaceI)
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 37b1cab458..8be41984af 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -184,7 +184,7 @@ void Foam::faceCoupleInfo::writePointsFaces() const
<< " at position " << c[cutFaceI].centre(c.points())
<< endl;
- equivMasterFaces[cutFaceI] = vector::zero;
+ equivMasterFaces[cutFaceI] = Zero;
}
}
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
index 3ec0ed0e7a..61fef2b33c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addObject/polyAddPoint.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -77,7 +77,7 @@ public:
//- Construct null. Used only for list construction
polyAddPoint()
:
- p_(vector::zero),
+ p_(Zero),
masterPointID_(-1),
zoneID_(-1),
inCell_(false)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 7ee5f74e14..5136f38376 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -209,7 +209,7 @@ void Foam::edgeCollapser::collapseToEdge
if (!maxPriorityPts.empty())
{
- Foam::point averagePt(vector::zero);
+ Foam::point averagePt(Zero);
forAll(maxPriorityPts, ptI)
{
@@ -259,7 +259,7 @@ void Foam::edgeCollapser::collapseToEdge
if (!maxPriorityPts.empty())
{
- Foam::point averagePt(vector::zero);
+ Foam::point averagePt(Zero);
forAll(maxPriorityPts, ptI)
{
@@ -321,7 +321,7 @@ void Foam::edgeCollapser::collapseToPoint
if (!maxPriorityPts.empty())
{
- Foam::point averagePt(vector::zero);
+ Foam::point averagePt(Zero);
forAll(maxPriorityPts, ptI)
{
@@ -580,7 +580,7 @@ Foam::edgeCollapser::collapseType Foam::edgeCollapser::collapseFace
const scalar fA = f.mag(pts);
- vector collapseAxis = vector::zero;
+ vector collapseAxis = Zero;
scalar aspectRatio = 1.0;
faceCollapseAxisAndAspectRatio(f, fC, collapseAxis, aspectRatio);
@@ -1035,7 +1035,7 @@ Foam::label Foam::edgeCollapser::syncCollapse
List<pointEdgeCollapse> allEdgeInfo
(
mesh_.nEdges(),
- pointEdgeCollapse(vector::zero, -1, -1)
+ pointEdgeCollapse(Zero, -1, -1)
);
// Mark selected edges for collapse
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H
index 23fa9b348d..efd18fa772 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/modifyObject/polyModifyPoint.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -81,7 +81,7 @@ public:
polyModifyPoint()
:
pointID_(-1),
- location_(vector::zero),
+ location_(Zero),
removeFromZone_(false),
zoneID_(-1),
inCell_(false)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index f7bd8e4808..d25e88975e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -3117,7 +3117,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
}
else
{
- renumberedMeshPoints[newPointI] = vector::zero;
+ renumberedMeshPoints[newPointI] = Zero;
}
}
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index e937c18d18..f87b08e6e2 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -250,7 +250,7 @@ bool Foam::slidingInterface::projectPoints() const
if (projectedSlavePointsPtr_) delete projectedSlavePointsPtr_;
projectedSlavePointsPtr_ =
- new pointField(slavePointFaceHits.size(), vector::zero);
+ new pointField(slavePointFaceHits.size(), Zero);
pointField& projectedSlavePoints = *projectedSlavePointsPtr_;
// Adjust projection to type of match
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
index 55d2911346..098f7e399e 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshI.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -136,7 +136,7 @@ inline Foam::vector Foam::extendedEdgeMesh::edgeDirection
<< e.start() << " " << e.end()
<< exit(FatalError);
- return vector::zero;
+ return Zero;
}
}
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
index a35d894a13..1f2051a336 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshTemplates.C
@@ -166,7 +166,7 @@ void Foam::extendedEdgeMesh::sortPointsAndEdges
);
}
- vector fC0tofC1(vector::zero);
+ vector fC0tofC1(Zero);
if (eFaces.size() == 2)
{
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
index 103d6c78cd..55cc8ffa62 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshI.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -133,7 +133,7 @@ inline Foam::vector Foam::extendedFeatureEdgeMesh::edgeDirection
<< e.start() << " " << e.end()
<< exit(FatalError);
- return vector::zero;
+ return Zero;
}
}
diff --git a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
index 8e9cc5b409..8aba7d0b59 100644
--- a/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
+++ b/src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C
@@ -166,7 +166,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
);
}
- vector fC0tofC1(vector::zero);
+ vector fC0tofC1(Zero);
if (eFaces.size() == 2)
{
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 0c902d6faa..90239b4984 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -423,7 +423,7 @@ void Foam::MRFZone::makeRelative(volVectorField& U) const
forAll(includedFaces_[patchi], i)
{
label patchFacei = includedFaces_[patchi][i];
- U.boundaryField()[patchi][patchFacei] = vector::zero;
+ U.boundaryField()[patchi][patchFacei] = Zero;
}
}
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
index 6b9cc1ca6f..271157b9a6 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
@@ -177,7 +177,7 @@ Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::DDt
U.mesh()
),
U.mesh(),
- dimensionedVector("0", U.dimensions()/dimTime, vector::zero)
+ dimensionedVector("0", U.dimensions()/dimTime, Zero)
)
);
volVectorField& acceleration = tacceleration.ref();
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index 93944c12bf..7077bc2f6b 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -62,7 +62,7 @@ Foam::SRF::SRFModel::SRFModel
origin_("origin", dimLength, lookup("origin")),
axis_(lookup("axis")),
SRFModelCoeffs_(subDict(type + "Coeffs")),
- omega_(dimensionedVector("omega", dimless/dimTime, vector::zero))
+ omega_(dimensionedVector("omega", dimless/dimTime, Zero))
{
// Normalise the axis
axis_ /= mag(axis_);
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
index b463e79d80..bfb1caf470 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,7 +42,7 @@ SRFFreestreamVelocityFvPatchVectorField
:
inletOutletFvPatchVectorField(p, iF),
relative_(false),
- UInf_(vector::zero)
+ UInf_(Zero)
{}
diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
index 2a17513700..ec59dbedfc 100644
--- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,7 +39,7 @@ Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField
:
fixedValueFvPatchVectorField(p, iF),
relative_(0),
- inletValue_(p.size(), vector::zero)
+ inletValue_(p.size(), Zero)
{}
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index 411b8dfc6b..ff87ca2e1d 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -84,7 +84,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
D_[zoneI].setSize(1);
F_[zoneI].setSize(1);
- D_[zoneI][0] = tensor::zero;
+ D_[zoneI][0] = Zero;
D_[zoneI][0].xx() = dXYZ_.value().x();
D_[zoneI][0].yy() = dXYZ_.value().y();
D_[zoneI][0].zz() = dXYZ_.value().z();
@@ -92,7 +92,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
D_[zoneI][0] = coordSys_.R().transformTensor(D_[zoneI][0]);
// leading 0.5 is from 1/2*rho
- F_[zoneI][0] = tensor::zero;
+ F_[zoneI][0] = Zero;
F_[zoneI][0].xx() = 0.5*fXYZ_.value().x();
F_[zoneI][0].yy() = 0.5*fXYZ_.value().y();
F_[zoneI][0].zz() = 0.5*fXYZ_.value().z();
@@ -111,13 +111,13 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
forAll(cells, i)
{
- D_[zoneI][i] = tensor::zero;
+ D_[zoneI][i] = Zero;
D_[zoneI][i].xx() = dXYZ_.value().x();
D_[zoneI][i].yy() = dXYZ_.value().y();
D_[zoneI][i].zz() = dXYZ_.value().z();
// leading 0.5 is from 1/2*rho
- F_[zoneI][i] = tensor::zero;
+ F_[zoneI][i] = Zero;
F_[zoneI][i].xx() = 0.5*fXYZ_.value().x();
F_[zoneI][i].yy() = 0.5*fXYZ_.value().y();
F_[zoneI][i].zz() = 0.5*fXYZ_.value().z();
@@ -143,7 +143,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
IOobject::NO_WRITE
),
mesh_,
- dimensionedTensor("0", dXYZ_.dimensions(), tensor::zero)
+ dimensionedTensor("0", dXYZ_.dimensions(), Zero)
);
volTensorField Fout
(
@@ -156,7 +156,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
IOobject::NO_WRITE
),
mesh_,
- dimensionedTensor("0", fXYZ_.dimensions(), tensor::zero)
+ dimensionedTensor("0", fXYZ_.dimensions(), Zero)
);
UIndirectList<tensor>(Dout, mesh_.cellZones()[cellZoneIDs_[0]]) = D_[0];
@@ -177,7 +177,7 @@ void Foam::porosityModels::DarcyForchheimer::calcForce
) const
{
scalarField Udiag(U.size(), 0.0);
- vectorField Usource(U.size(), vector::zero);
+ vectorField Usource(U.size(), Zero);
const scalarField& V = mesh_.V();
apply(Udiag, Usource, V, rho, mu, U);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
index 6525c6c2c3..35073cd36a 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
@@ -140,13 +140,13 @@ void Foam::porosityModels::fixedCoeff::calcTransformModelData()
alpha_[zoneI].setSize(1);
beta_[zoneI].setSize(1);
- alpha_[zoneI][0] = tensor::zero;
+ alpha_[zoneI][0] = Zero;
alpha_[zoneI][0].xx() = alphaXYZ_.value().x();
alpha_[zoneI][0].yy() = alphaXYZ_.value().y();
alpha_[zoneI][0].zz() = alphaXYZ_.value().z();
alpha_[zoneI][0] = coordSys_.R().transformTensor(alpha_[zoneI][0]);
- beta_[zoneI][0] = tensor::zero;
+ beta_[zoneI][0] = Zero;
beta_[zoneI][0].xx() = betaXYZ_.value().x();
beta_[zoneI][0].yy() = betaXYZ_.value().y();
beta_[zoneI][0].zz() = betaXYZ_.value().z();
@@ -164,12 +164,12 @@ void Foam::porosityModels::fixedCoeff::calcTransformModelData()
forAll(cells, i)
{
- alpha_[zoneI][i] = tensor::zero;
+ alpha_[zoneI][i] = Zero;
alpha_[zoneI][i].xx() = alphaXYZ_.value().x();
alpha_[zoneI][i].yy() = alphaXYZ_.value().y();
alpha_[zoneI][i].zz() = alphaXYZ_.value().z();
- beta_[zoneI][i] = tensor::zero;
+ beta_[zoneI][i] = Zero;
beta_[zoneI][i].xx() = betaXYZ_.value().x();
beta_[zoneI][i].yy() = betaXYZ_.value().y();
beta_[zoneI][i].zz() = betaXYZ_.value().z();
@@ -193,7 +193,7 @@ void Foam::porosityModels::fixedCoeff::calcForce
) const
{
scalarField Udiag(U.size(), 0.0);
- vectorField Usource(U.size(), vector::zero);
+ vectorField Usource(U.size(), Zero);
const scalarField& V = mesh_.V();
scalar rhoRef = readScalar(coeffs_.lookup("rhoRef"));
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 631f074ad9..0338e35154 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -154,7 +154,7 @@ Foam::tmp<Foam::vectorField> Foam::porosityModel::porosityModel::force
{
transformModelData();
- tmp<vectorField> tforce(new vectorField(U.size(), vector::zero));
+ tmp<vectorField> tforce(new vectorField(U.size(), Zero));
if (!cellZoneIDs_.empty())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 3b3667bbb5..1ce7a7d39f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -104,7 +104,7 @@ activeBaffleVelocityFvPatchVectorField
maxOpenFractionDelta_(readScalar(dict.lookup("maxOpenFractionDelta"))),
curTimeIndex_(-1)
{
- fvPatchVectorField::operator=(vector::zero);
+ fvPatchVectorField::operator=(Zero);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index cef5a6e58f..04d33d9b8a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -107,7 +107,7 @@ activePressureForceBaffleVelocityFvPatchVectorField
fBased_(readBool(dict.lookup("forceBased"))),
baffleActivated_(0)
{
- fvPatchVectorField::operator=(vector::zero);
+ fvPatchVectorField::operator=(Zero);
if (p.size() > 0)
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
index e774bf915c..9d6cf1ae72 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
@@ -50,7 +50,7 @@ Description
this->refValue() =
vector(1, 0, 0)
*min(10, 0.1*this->db().time().value());
- this->refGrad() = vector::zero;
+ this->refGrad() = Zero;
this->valueFraction() = 1.0;
#};
@@ -76,7 +76,7 @@ Description
code
#{
this->refValue() = min(10, 0.1*this->db().time().value());
- this->refGrad() = vector::zero;
+ this->refGrad() = Zero;
this->valueFraction() = 1.0;
#};
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
index b432f7884e..72f372ad91 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C
@@ -46,9 +46,9 @@ fixedNormalInletOutletVelocityFvPatchVectorField
fvPatchVectorField::New("fixedValue", p, iF)
)
{
- refValue() = vector::zero;
- refGrad() = vector::zero;
- valueFraction() = symmTensor::zero;
+ refValue() = Zero;
+ refGrad() = Zero;
+ valueFraction() = Zero;
}
@@ -70,8 +70,8 @@ fixedNormalInletOutletVelocityFvPatchVectorField
{
fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
refValue() = normalVelocity();
- refGrad() = vector::zero;
- valueFraction() = symmTensor::zero;
+ refGrad() = Zero;
+ valueFraction() = Zero;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
index e5f7a049f4..00f2a8307e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,7 +39,7 @@ interstitialInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchVectorField(p, iF),
- inletVelocity_(p.size(), vector::zero),
+ inletVelocity_(p.size(), Zero),
alphaName_("alpha")
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
index 713b94492e..be3e6304b9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -168,7 +168,7 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
{
case mappedPolyPatch::NEARESTFACE:
{
- vectorField allUValues(nbrMesh.nFaces(), vector::zero);
+ vectorField allUValues(nbrMesh.nFaces(), Zero);
scalarField allPhiValues(nbrMesh.nFaces(), 0.0);
forAll(UField.boundaryField(), patchI)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
index da715a6d29..b042164ca7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C
@@ -34,7 +34,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
const DimensionedField<vector, volMesh>& iF
)
:
- fixedValueFvPatchVectorField(p, iF, vector::zero)
+ fixedValueFvPatchVectorField(p, iF, Zero)
{}
@@ -45,7 +45,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
const dictionary& dict
)
:
- fixedValueFvPatchVectorField(p, iF, vector::zero)
+ fixedValueFvPatchVectorField(p, iF, Zero)
{}
@@ -57,7 +57,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchVectorField(p, iF, vector::zero)
+ fixedValueFvPatchVectorField(p, iF, Zero)
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index abf782bc90..4004a66362 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,8 +42,8 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
Umean_(0),
alphaName_("none")
{
- refValue() = vector::zero;
- refGrad() = vector::zero;
+ refValue() = Zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
@@ -75,8 +75,8 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
Umean_(readScalar(dict.lookup("Umean"))),
alphaName_(dict.lookup("alpha"))
{
- refValue() = vector::zero;
- refGrad() = vector::zero;
+ refValue() = Zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
if (dict.found("value"))
@@ -145,7 +145,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs()
// such that the phase mean is Umean_
if (Uzgmean >= Umean_)
{
- refValue() = vector::zero;
+ refValue() = Zero;
valueFraction() = 1.0 - Umean_/Uzgmean;
}
else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 09da151f98..85eae30419 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,7 +43,7 @@ phaseHydrostaticPressureFvPatchScalarField
phaseName_("alpha"),
rho_(0.0),
pRefValue_(0.0),
- pRefPoint_(vector::zero)
+ pRefPoint_(Zero)
{
this->refValue() = 0.0;
this->refGrad() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
index a6a18a61cc..a8b69d0040 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
inletDir_(p.size())
{
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
@@ -80,7 +80,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField
{
fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
index 0e15350470..e691e374b0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
rhoName_("rho")
{
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
@@ -78,7 +78,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField
{
fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
index 63f9707715..5b28ef39c5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,9 +41,9 @@ pressureInletOutletVelocityFvPatchVectorField
directionMixedFvPatchVectorField(p, iF),
phiName_("phi")
{
- refValue() = vector::zero;
- refGrad() = vector::zero;
- valueFraction() = symmTensor::zero;
+ refValue() = Zero;
+ refGrad() = Zero;
+ valueFraction() = Zero;
}
@@ -88,11 +88,11 @@ pressureInletOutletVelocityFvPatchVectorField
}
else
{
- refValue() = vector::zero;
+ refValue() = Zero;
}
- refGrad() = vector::zero;
- valueFraction() = symmTensor::zero;
+ refGrad() = Zero;
+ valueFraction() = Zero;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
index 70ce9adedc..79dd6a8c92 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField
rhoName_("rho")
{
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
@@ -78,7 +78,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField
{
fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 0.0;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 4262a54a3f..461481f5fb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -39,7 +39,7 @@ rotatingWallVelocityFvPatchVectorField
:
fixedValueFvPatchField<vector>(p, iF),
origin_(),
- axis_(vector::zero),
+ axis_(Zero),
omega_(0)
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index fb17d580b6..d2cf3bff2b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,13 +41,13 @@ supersonicFreestreamFvPatchVectorField
TName_("T"),
pName_("p"),
psiName_("thermo:psi"),
- UInf_(vector::zero),
+ UInf_(Zero),
pInf_(0),
TInf_(0),
gamma_(0)
{
refValue() = patchInternalField();
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 1;
}
@@ -82,7 +82,7 @@ supersonicFreestreamFvPatchVectorField
}
refValue() = *this;
- refGrad() = vector::zero;
+ refGrad() = Zero;
valueFraction() = 1;
if (pInf_ < SMALL)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index e43b61dede..6eea5de3bc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,7 +42,7 @@ uniformDensityHydrostaticPressureFvPatchScalarField
fixedValueFvPatchScalarField(p, iF),
rho_(0.0),
pRefValue_(0.0),
- pRefPoint_(vector::zero)
+ pRefPoint_(Zero)
{}
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
index 80054e1849..c0d37aa177 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
@@ -88,7 +88,7 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
dd -= dd0;
// Finalize the gradient weighting vectors
- lsvi[0] = vector::zero;
+ lsvi[0] = Zero;
for (label j=1; j<lsvi.size(); j++)
{
lsvi[j] = dd & lsvi[j];
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
index 493d650341..12ee0858f3 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
false
),
mesh_,
- dimensionedVector("zero", dimless/dimLength, vector::zero)
+ dimensionedVector("zero", dimless/dimLength, Zero)
),
nVectors_
(
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
false
),
mesh_,
- dimensionedVector("zero", dimless/dimLength, vector::zero)
+ dimensionedVector("zero", dimless/dimLength, Zero)
)
{
calcLeastSquaresVectors();
@@ -96,7 +96,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
const volVectorField& C = mesh.C();
// Set up temporary storage for the dd tensor (before inversion)
- symmTensorField dd(mesh_.nCells(), symmTensor::zero);
+ symmTensorField dd(mesh_.nCells(), Zero);
forAll(owner, facei)
{
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index a83990120c..3a6e8233fa 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
false
),
mesh_,
- dimensionedVector("zero", dimless/dimLength, vector::zero)
+ dimensionedVector("zero", dimless/dimLength, Zero)
),
nVectors_
(
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
false
),
mesh_,
- dimensionedVector("zero", dimless/dimLength, vector::zero)
+ dimensionedVector("zero", dimless/dimLength, Zero)
)
{
calcLeastSquaresVectors();
@@ -99,7 +99,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
// Set up temporary storage for the dd tensor (before inversion)
- symmTensorField dd(mesh_.nCells(), symmTensor::zero);
+ symmTensorField dd(mesh_.nCells(), Zero);
forAll(owner, facei)
{
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
index c025d6a2df..b6bb1475d0 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
@@ -51,7 +51,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
false
),
mesh_,
- dimensionedVector("zero", dimless/dimLength, vector::zero)
+ dimensionedVector("zero", dimless/dimLength, Zero)
),
nVectors_
(
@@ -65,7 +65,7 @@ Foam::leastSquaresVectors::leastSquaresVectors(const fvMesh& mesh)
false
),
mesh_,
- dimensionedVector("zero", dimless/dimLength, vector::zero)
+ dimensionedVector("zero", dimless/dimLength, Zero)
)
{
calcLeastSquaresVectors();
@@ -96,7 +96,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
const volVectorField& C = mesh.C();
// Set up temporary storage for the dd tensor (before inversion)
- symmTensorField dd(mesh_.nCells(), symmTensor::zero);
+ symmTensorField dd(mesh_.nCells(), Zero);
forAll(owner, facei)
{
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
index ed1d97fb19..174372192d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicACMI/cyclicACMIFvPatch.C
@@ -140,7 +140,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicACMIFvPatch::delta() const
(
interpolate
(
- vectorField(nbrPatchCoupled.size(), vector::zero),
+ vectorField(nbrPatchCoupled.size(), Zero),
nbrPatchNonOverlap.delta()()
)
);
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
index 69e940d12f..29439cc879 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicAMI/cyclicAMIFvPatch.C
@@ -102,7 +102,7 @@ Foam::tmp<Foam::vectorField> Foam::cyclicAMIFvPatch::delta() const
interpolate
(
nbrPatch.coupledFvPatch::delta(),
- vectorField(this->size(), vector::zero)
+ vectorField(this->size(), Zero)
);
}
else
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
index 88955afa56..87ca3336d1 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -105,7 +105,7 @@ bool Foam::patchDistMethods::advectionDiffusion::correct
false
),
mesh_,
- dimensionedVector("ny", dimless, vector::zero),
+ dimensionedVector("ny", dimless, Zero),
patchTypes<vector>(mesh_, patchIDs_)
);
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index 9ff12dd69c..ae5be722b1 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -49,7 +49,7 @@ void Foam::wallDist::constructn() const
mesh()
),
mesh(),
- dimensionedVector("n" & patchTypeName_, dimless, vector::zero),
+ dimensionedVector("n" & patchTypeName_, dimless, Zero),
patchDistMethod::patchTypes<vector>(mesh(), patchIDs_)
)
);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 608c573ad2..f8237e1d35 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -118,7 +118,7 @@ Foam::linearUpwindV<Type>::correction
{
if (maxCorrs < 0)
{
- sfCorr[facei] = vector::zero;
+ sfCorr[facei] = Zero;
}
else if (sfCorrs > maxCorrs)
{
@@ -185,7 +185,7 @@ Foam::linearUpwindV<Type>::correction
{
if (maxCorrs < 0)
{
- pSfCorr[facei] = vector::zero;
+ pSfCorr[facei] = Zero;
}
else if (pSfCorrs > maxCorrs)
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 445bf197e5..4e7bf60dd4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -98,7 +98,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
if (!patchSkewCorrVecs.coupled())
{
- patchSkewCorrVecs = vector::zero;
+ patchSkewCorrVecs = Zero;
}
else
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 2895e1256e..6195180a87 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -364,7 +364,7 @@ void Foam::surfaceInterpolation::makeNonOrthCorrectionVectors() const
if (!patchCorrVecs.coupled())
{
- patchCorrVecs = vector::zero;
+ patchCorrVecs = Zero;
}
else
{
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 1d4d885be4..42ddced8ee 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -74,7 +74,7 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
(
"cellDisplacement",
pointDisplacement().dimensions(),
- vector::zero
+ Zero
),
cellMotionBoundaryTypes<vector>(pointDisplacement().boundaryField())
),
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index b1a72eb6f8..7c3f889de1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -316,7 +316,7 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
pointField& curPoints = tcurPoints.ref();
// Interpolate the displacement of the face zones.
- vectorField zoneDisp(displacements_.size(), vector::zero);
+ vectorField zoneDisp(displacements_.size(), Zero);
forAll(zoneDisp, zoneI)
{
if (times_[zoneI].size())
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index 863f800d19..71fc5e1aa7 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -72,7 +72,7 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
(
"cellDisplacement",
pointDisplacement_.dimensions(),
- vector::zero
+ Zero
),
cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
),
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
index 0900344564..fa29dff619 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
@@ -164,7 +164,7 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
points0()[pointI], // location of data
vector::max, // not valid
0.0,
- vector::zero // passive data
+ Zero // passive data
);
}
}
@@ -182,7 +182,7 @@ void Foam::displacementLayeredMotionMotionSolver::walkStructured
mesh().edges()[edgeI].centre(points0()), // location of data
vector::max, // not valid
0.0,
- vector::zero
+ Zero
);
}
}
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
index d65fcc672b..a01394dd7a 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,7 +61,7 @@ inline Foam::pointEdgeStructuredWalk::pointEdgeStructuredWalk()
point0_(vector::max),
previousPoint_(vector::max),
dist_(0),
- data_(vector::zero)
+ data_(Zero)
{}
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index ba05811ba6..ccf29e4221 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -69,7 +69,7 @@ Foam::velocityLaplacianFvMotionSolver::velocityLaplacianFvMotionSolver
(
"cellMotionU",
pointMotionU_.dimensions(),
- vector::zero
+ Zero
),
cellMotionBoundaryTypes<vector>(pointMotionU_.boundaryField())
),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index d3514243de..c30708bf17 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,8 +44,8 @@ angularOscillatingDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
- axis_(vector::zero),
- origin_(vector::zero),
+ axis_(Zero),
+ origin_(Zero),
angle0_(0.0),
amplitude_(0.0),
omega_(0.0),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 2192763c5d..607189f57e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,8 +44,8 @@ angularOscillatingVelocityPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
- axis_(vector::zero),
- origin_(vector::zero),
+ axis_(Zero),
+ origin_(Zero),
angle0_(0.0),
amplitude_(0.0),
omega_(0.0),
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index 6e5811d388..50c25c9977 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ oscillatingDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
- amplitude_(vector::zero),
+ amplitude_(Zero),
omega_(0.0)
{}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index fdccc34d4f..fdc13505bf 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ oscillatingVelocityPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
- amplitude_(vector::zero),
+ amplitude_(Zero),
omega_(0.0),
p0_(p.localPoints())
{}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 00a99a9056..b2f3b35317 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -72,7 +72,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
const scalar projectLen = mag(mesh.bounds().max()-mesh.bounds().min());
// For case of fixed projection vector:
- vector projectVec(vector::zero);
+ vector projectVec(Zero);
if (projectMode_ == FIXEDNORMAL)
{
vector n = projectDir_/mag(projectDir_);
@@ -308,9 +308,9 @@ surfaceDisplacementPointPatchVectorField
)
:
fixedValuePointPatchVectorField(p, iF),
- velocity_(vector::zero),
+ velocity_(Zero),
projectMode_(NEAREST),
- projectDir_(vector::zero),
+ projectDir_(Zero),
wedgePlane_(-1)
{}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 3117758565..68cbdf0458 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -308,7 +308,7 @@ surfaceSlipDisplacementPointPatchVectorField
:
pointPatchVectorField(p, iF),
projectMode_(NEAREST),
- projectDir_(vector::zero),
+ projectDir_(Zero),
wedgePlane_(-1)
{}
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index 43a5cd9269..51d6921ef5 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,9 +39,9 @@ waveDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF),
- amplitude_(vector::zero),
+ amplitude_(Zero),
omega_(0.0),
- waveNumber_(vector::zero)
+ waveNumber_(Zero)
{}
@@ -56,7 +56,7 @@ waveDisplacementPointPatchVectorField
fixedValuePointPatchField<vector>(p, iF, dict),
amplitude_(dict.lookup("amplitude")),
omega_(readScalar(dict.lookup("omega"))),
- waveNumber_(dict.lookupOrDefault<vector>("waveNumber", vector::zero))
+ waveNumber_(dict.lookupOrDefault<vector>("waveNumber", Zero))
{
if (!dict.found("value"))
{
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
index 191bf9286f..78a1572df6 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -40,7 +40,7 @@ void Foam::fv::actuationDiskSource::addActuationDiskAxialInertialResistance
{
scalar a = 1.0 - Cp_/Ct_;
vector uniDiskDir = diskDir_/mag(diskDir_);
- tensor E(tensor::zero);
+ tensor E(Zero);
E.xx() = uniDiskDir.x();
E.yy() = uniDiskDir.y();
E.zz() = uniDiskDir.z();
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index f4a6ca68e6..65af46d7ac 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -204,7 +204,7 @@ void Foam::fv::meanVelocityForce::addSup
IOobject::NO_WRITE
),
mesh_,
- dimensionedVector("zero", eqn.dimensions()/dimVolume, vector::zero)
+ dimensionedVector("zero", eqn.dimensions()/dimVolume, Zero)
);
scalar gradP = gradP0_ + dGradP_;
diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
index 65290d600f..d475cb7316 100644
--- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,7 +46,7 @@ addRadialActuationDiskAxialInertialResistance
scalarField Tr(cells.size());
const vector uniDiskDir = diskDir_/mag(diskDir_);
- tensor E(tensor::zero);
+ tensor E(Zero);
E.xx() = uniDiskDir.x();
E.yy() = uniDiskDir.y();
E.zz() = uniDiskDir.z();
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index e88c02c664..1806a7acc0 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -135,7 +135,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
const vectorField& Sf = mesh_.Sf();
const scalarField& magSf = mesh_.magSf();
- vector n = vector::zero;
+ vector n = Zero;
// Calculate cell addressing for selected cells
labelList cellAddr(mesh_.nCells(), -1);
@@ -263,9 +263,9 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
void Foam::fv::rotorDiskSource::createCoordinateSystem()
{
// Construct the local rotor co-prdinate system
- vector origin(vector::zero);
- vector axis(vector::zero);
- vector refDir(vector::zero);
+ vector origin(Zero);
+ vector axis(Zero);
+ vector refDir(Zero);
geometryModeType gm =
geometryModeTypeNames_.read(coeffs_.lookup("geometryMode"));
@@ -289,7 +289,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
origin /= sumV;
// Determine first radial vector
- vector dx1(vector::zero);
+ vector dx1(Zero);
scalar magR = -GREAT;
forAll(cells_, i)
{
@@ -459,7 +459,7 @@ Foam::tmp<Foam::vectorField> Foam::fv::rotorDiskSource::inflowVelocity
}
}
- return tmp<vectorField>(new vectorField(mesh_.nCells(), vector::zero));
+ return tmp<vectorField>(new vectorField(mesh_.nCells(), Zero));
}
@@ -479,10 +479,10 @@ Foam::fv::rotorDiskSource::rotorDiskSource
omega_(0.0),
nBlades_(0),
inletFlow_(ifLocal),
- inletVelocity_(vector::zero),
+ inletVelocity_(Zero),
tipEffect_(1.0),
flap_(),
- x_(cells_.size(), vector::zero),
+ x_(cells_.size(), Zero),
R_(cells_.size(), I),
invR_(cells_.size(), I),
area_(cells_.size(), 0.0),
@@ -524,7 +524,7 @@ void Foam::fv::rotorDiskSource::addSup
(
"zero",
eqn.dimensions()/dimVolume,
- vector::zero
+ Zero
)
);
@@ -565,7 +565,7 @@ void Foam::fv::rotorDiskSource::addSup
(
"zero",
eqn.dimensions()/dimVolume,
- vector::zero
+ Zero
)
);
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index 1f9905b94b..e23a0643fd 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -63,7 +63,7 @@ Foam::vector Foam::targetCoeffTrim::calcCoeffs
scalar coeff1 = alpha_*sqr(rotor_.omega())*mathematical::pi;
- vector cf(vector::zero);
+ vector cf(Zero);
forAll(cells, i)
{
label cellI = cells[i];
@@ -119,9 +119,9 @@ void Foam::targetCoeffTrim::correctTrim
// iterate to find new pitch angles to achieve target force
scalar err = GREAT;
label iter = 0;
- tensor J(tensor::zero);
+ tensor J(Zero);
- vector old = vector::zero;
+ vector old = Zero;
while ((err > tol_) && (iter < nIter_))
{
// cache initial theta vector
@@ -199,8 +199,8 @@ Foam::targetCoeffTrim::targetCoeffTrim
trimModel(rotor, dict, typeName),
calcFrequency_(-1),
useCoeffs_(true),
- target_(vector::zero),
- theta_(vector::zero),
+ target_(Zero),
+ theta_(Zero),
nIter_(50),
tol_(1e-8),
relax_(1.0),
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index 6c23ae848a..5b70fbfbfc 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -59,7 +59,7 @@ Foam::fv::tabulatedAccelerationSource::tabulatedAccelerationSource
option(name, modelType, dict, mesh),
motion_(coeffs_, mesh.time()),
UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- g0_("g0", dimAcceleration, vector::zero)
+ g0_("g0", dimAcceleration, Zero)
{
fieldNames_.setSize(1, UName_);
applied_.setSize(1, false);
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index 306421495e..8c51b741ec 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -154,7 +154,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
IOobject::NO_WRITE
),
nbrMesh,
- dimensionedVector("zero", U.dimensions(), vector::zero)
+ dimensionedVector("zero", U.dimensions(), Zero)
);
// Map local velocity onto neighbour region
@@ -175,7 +175,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
vectorField& Usource = porosityEqn.source();
Udiag.setSize(eqn.diag().size(), 0.0);
- Usource.setSize(eqn.source().size(), vector::zero);
+ Usource.setSize(eqn.source().size(), Zero);
meshInterp().mapTgtToSrc(nbrEqn.diag(), plusEqOp<scalar>(), Udiag);
meshInterp().mapTgtToSrc(nbrEqn.source(), plusEqOp<vector>(), Usource);
@@ -208,7 +208,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
IOobject::NO_WRITE
),
nbrMesh,
- dimensionedVector("zero", U.dimensions(), vector::zero)
+ dimensionedVector("zero", U.dimensions(), Zero)
);
// Map local velocity onto neighbour region
@@ -276,7 +276,7 @@ void Foam::fv::interRegionExplicitPorositySource::addSup
vectorField& Usource = porosityEqn.source();
Udiag.setSize(eqn.diag().size(), 0.0);
- Usource.setSize(eqn.source().size(), vector::zero);
+ Usource.setSize(eqn.source().size(), Zero);
meshInterp().mapTgtToSrc(nbrEqn.diag(), plusEqOp<scalar>(), Udiag);
meshInterp().mapTgtToSrc(nbrEqn.source(), plusEqOp<vector>(), Usource);
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 90608e1f51..e635f1864c 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -392,7 +392,7 @@ void Foam::DSMCCloud<ParcelType>::resetFields()
(
"zero",
dimensionSet(1, -1, -2, 0, 0),
- vector::zero
+ Zero
);
rhoN_ = dimensionedScalar("zero", dimensionSet(0, -3, 0, 0, 0), VSMALL);
@@ -406,7 +406,7 @@ void Foam::DSMCCloud<ParcelType>::resetFields()
(
"zero",
dimensionSet(1, -2, -1, 0, 0),
- vector::zero
+ Zero
);
}
@@ -800,7 +800,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
(
"zero",
dimensionSet(1, -1, -2, 0, 0),
- vector::zero
+ Zero
)
),
rhoN_
@@ -896,7 +896,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
(
"zero",
dimensionSet(1, -2, -1, 0, 0),
- vector::zero
+ Zero
)
),
constProps_(),
@@ -934,7 +934,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
(
"zero",
dimensionSet(0, 1, -1, 0, 0),
- vector::zero
+ Zero
)
)
),
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 9e8465f475..58fec01633 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
@@ -276,7 +276,7 @@ inline Foam::scalar Foam::DSMCCloud<ParcelType>::massInSystem() const
template<class ParcelType>
inline Foam::vector Foam::DSMCCloud<ParcelType>::linearMomentumOfSystem() const
{
- vector linearMomentum(vector::zero);
+ vector linearMomentum(Zero);
forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
{
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index d9311e7fae..c47e7bff39 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
@@ -48,7 +48,7 @@ Foam::DSMCParcel<ParcelType>::DSMCParcel
)
:
ParcelType(mesh, is, readFields),
- U_(vector::zero),
+ U_(Zero),
Ei_(0.0),
typeId_(-1)
{
diff --git a/src/lagrangian/basic/particle/particleI.H b/src/lagrangian/basic/particle/particleI.H
index c1960b37d0..ca68468eb2 100644
--- a/src/lagrangian/basic/particle/particleI.H
+++ b/src/lagrangian/basic/particle/particleI.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -166,7 +166,7 @@ inline Foam::scalar Foam::particle::movingTetLambda
point b0 = b00 + stepFraction_*(b - b00);
// Normal of plane at start of tracking portion
- vector n0 = vector::zero;
+ vector n0 = Zero;
{
tetIndices tetIs(cellI, tetFaceI, tetPtI, mesh_);
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index 68bc5ab1e3..73b82985cd 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -820,7 +820,7 @@ void Foam::particle::hitWallFaces
lambdaDistanceTolerance
);
- pointHit hitInfo(vector::zero);
+ pointHit hitInfo(Zero);
if (mesh_.moving())
{
diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
index a249a875d1..c476221ece 100644
--- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
+++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
@@ -43,7 +43,7 @@ Foam::coalCloudList::UTrans() const
IOobject::NO_WRITE
),
mesh_,
- dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
+ dimensionedVector("zero", dimMass*dimVelocity, Zero)
)
);
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index c4f6899966..aa72f933dc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -367,7 +367,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
IOobject::AUTO_WRITE
),
mesh_,
- dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
+ dimensionedVector("zero", dimMass*dimVelocity, Zero)
)
),
UCoeff_
@@ -601,7 +601,7 @@ void Foam::KinematicCloud<CloudType>::restoreState()
template<class CloudType>
void Foam::KinematicCloud<CloudType>::resetSourceTerms()
{
- UTrans().field() = vector::zero;
+ UTrans().field() = Zero;
UCoeff().field() = 0.0;
}
@@ -729,7 +729,7 @@ void Foam::KinematicCloud<CloudType>::patchData
}
else
{
- Up = vector::zero;
+ Up = Zero;
}
}
else
@@ -739,7 +739,7 @@ void Foam::KinematicCloud<CloudType>::patchData
vector n00 = tetIs.oldFaceTri(mesh_).normal();
// Difference in normal over timestep
- vector dn = vector::zero;
+ vector dn = Zero;
if (mag(n00) > SMALL)
{
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 69b0eb60af..48b2a3a556 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -285,7 +285,7 @@ template<class CloudType>
inline Foam::vector
Foam::KinematicCloud<CloudType>::linearMomentumOfSystem() const
{
- vector linearMomentum(vector::zero);
+ vector linearMomentum(Zero);
forAllConstIter(typename KinematicCloud<CloudType>, *this, iter)
{
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
index cc5940fcda..f942425429 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -70,9 +70,9 @@ inline Foam::CollidingParcel<ParcelType>::CollidingParcel
)
:
ParcelType(owner, position, cellI, tetFaceI, tetPtI),
- f_(vector::zero),
- angularMomentum_(vector::zero),
- torque_(vector::zero),
+ f_(Zero),
+ angularMomentum_(Zero),
+ torque_(Zero),
collisionRecords_()
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
index 25aee6fa83..f0c2007e48 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,9 +52,9 @@ Foam::CollidingParcel<ParcelType>::CollidingParcel
)
:
ParcelType(mesh, is, readFields),
- f_(vector::zero),
- angularMomentum_(vector::zero),
- torque_(vector::zero),
+ f_(Zero),
+ angularMomentum_(Zero),
+ torque_(Zero),
collisionRecords_()
{
if (readFields)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index b7a2d9cf7c..3798650fc8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -113,13 +113,13 @@ void Foam::KinematicParcel<ParcelType>::calc
//~~~~~~~~
// Explicit momentum source for particle
- vector Su = vector::zero;
+ vector Su = Zero;
// Linearised momentum source coefficient
scalar Spu = 0.0;
// Momentum transfer from the particle to the carrier phase
- vector dUTrans = vector::zero;
+ vector dUTrans = Zero;
// Motion
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 2f998dd3a1..ca445b3f64 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -85,13 +85,13 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_(0),
d_(0.0),
dTarget_(0.0),
- U_(vector::zero),
+ U_(Zero),
rho_(0.0),
age_(0.0),
tTurb_(0.0),
- UTurb_(vector::zero),
+ UTurb_(Zero),
rhoc_(0.0),
- Uc_(vector::zero),
+ Uc_(Zero),
muc_(0.0)
{}
@@ -122,9 +122,9 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
rho_(constProps.rho0()),
age_(0.0),
tTurb_(0.0),
- UTurb_(vector::zero),
+ UTurb_(Zero),
rhoc_(0.0),
- Uc_(vector::zero),
+ Uc_(Zero),
muc_(0.0)
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 79ef7f29fa..9015582842 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,13 +58,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
nParticle_(0.0),
d_(0.0),
dTarget_(0.0),
- U_(vector::zero),
+ U_(Zero),
rho_(0.0),
age_(0.0),
tTurb_(0.0),
- UTurb_(vector::zero),
+ UTurb_(Zero),
rhoc_(0.0),
- Uc_(vector::zero),
+ Uc_(Zero),
muc_(0.0)
{
if (readFields)
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H
index ab01a6421d..1311ee5bab 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ inline Foam::MPPICParcel<ParcelType>::MPPICParcel
)
:
ParcelType(owner, position, cellI, tetFaceI, tetPtI),
- UCorrect_(vector::zero)
+ UCorrect_(Zero)
{}
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
index 78ec2af314..ab4eb3e0c9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,7 @@ Foam::MPPICParcel<ParcelType>::MPPICParcel
)
:
ParcelType(mesh, is, readFields),
- UCorrect_(vector::zero)
+ UCorrect_(Zero)
{
if (readFields)
{
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
index dbe94e219a..2be585ba41 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H
@@ -150,7 +150,7 @@ Foam::MPPICParcel<ParcelType>::TrackingData<CloudType>::updateAverages
volumeAverage_() = 0;
radiusAverage_() = 0;
rhoAverage_() = 0;
- uAverage_() = vector::zero;
+ uAverage_() = Zero;
uSqrAverage_() = 0;
frequencyAverage_() = 0;
massAverage_() = 0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 289127b18b..2e14674bb8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -197,13 +197,13 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
//~~~~~~~~
// Explicit momentum source for particle
- vector Su = vector::zero;
+ vector Su = Zero;
// Linearised momentum source coefficient
scalar Spu = 0.0;
// Momentum transfer from the particle to the carrier phase
- vector dUTrans = vector::zero;
+ vector dUTrans = Zero;
// Explicit enthalpy source for particle
scalar Sh = 0.0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 0a34b43108..4dac19bec2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -418,13 +418,13 @@ void Foam::ReactingParcel<ParcelType>::calc
// ~~~~~~~
// Explicit momentum source for particle
- vector Su = vector::zero;
+ vector Su = Zero;
// Linearised momentum source coefficient
scalar Spu = 0.0;
// Momentum transfer from the particle to the carrier phase
- vector dUTrans = vector::zero;
+ vector dUTrans = Zero;
// Explicit enthalpy source for particle
scalar Sh = 0.0;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index cbbf563fa4..8ae9e09d59 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -163,13 +163,13 @@ void Foam::ThermoParcel<ParcelType>::calc
// ~~~~~~~
// Explicit momentum source for particle
- vector Su = vector::zero;
+ vector Su = Zero;
// Linearised momentum source coefficient
scalar Spu = 0.0;
// Momentum transfer from the particle to the carrier phase
- vector dUTrans = vector::zero;
+ vector dUTrans = Zero;
// Explicit enthalpy source for particle
scalar Sh = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index ab54ee6617..dff3601186 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -174,7 +174,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
// set 4 quadrants for single sector cases
nS = 4;
- vector tangent = vector::zero;
+ vector tangent = Zero;
scalar magTangent = 0.0;
Random rnd(1234);
diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
index 1c7371f439..9ecc679c24 100644
--- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
+++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C
@@ -154,7 +154,7 @@ Foam::forceSuSp Foam::ParticleForceList<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
if (calcCoupled_)
{
@@ -178,7 +178,7 @@ Foam::forceSuSp Foam::ParticleForceList<CloudType>::calcNonCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
if (calcNonCoupled_)
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index c26194be06..fd21059d90 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -47,9 +47,9 @@ void Foam::PairCollision<CloudType>::preInteraction()
{
typename CloudType::parcelType& p = iter();
- p.f() = vector::zero;
+ p.f() = Zero;
- p.torque() = vector::zero;
+ p.torque() = Zero;
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index e2b92e630d..21064f7b85 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -271,8 +271,8 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
fT_AB = -mu_*mag(fN_AB)*USlip_AB/mag(USlip_AB);
- tangentialOverlap_AB = vector::zero;
- tangentialOverlap_BA = vector::zero;
+ tangentialOverlap_AB = Zero;
+ tangentialOverlap_BA = Zero;
}
else
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
index d8efdd992b..cbc6db3234 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
@@ -151,7 +151,7 @@ void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
fT_PW = -mu*mag(fN_PW)*USlip_PW/mag(USlip_PW);
- tangentialOverlap_PW = vector::zero;
+ tangentialOverlap_PW = Zero;
}
else
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index bafdb086d1..f41e124836 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -138,7 +138,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
fT_PW = -mu_*mag(fN_PW)*USlip_PW/mag(USlip_PW);
- tangentialOverlap_PW = vector::zero;
+ tangentialOverlap_PW = Zero;
}
else
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 34ef7c273f..0e65b0e519 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -107,7 +107,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
axis /= mag(axis);
- vector tangent = vector::zero;
+ vector tangent = Zero;
scalar magTangent = 0.0;
cachedRandom& rnd = this->owner().rndGen();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 89f885065e..a757a39f83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -152,9 +152,9 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
owner.rndGen()
)
),
- tanVec1_(vector::zero),
- tanVec2_(vector::zero),
- normal_(vector::zero),
+ tanVec1_(Zero),
+ tanVec2_(Zero),
+ normal_(Zero),
UMag_(0.0),
Cd_(owner.db().time(), "Cd"),
@@ -179,7 +179,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
direction_ /= mag(direction_);
// Determine direction vectors tangential to direction
- vector tangent = vector::zero;
+ vector tangent = Zero;
scalar magTangent = 0.0;
while(magTangent < SMALL)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index f33f45d86e..2ba1a53765 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -266,7 +266,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
(
vectorPairScalarPair
(
- Pair<vector>(mesh.cellCentres()[cI], vector::zero),
+ Pair<vector>(mesh.cellCentres()[cI], Zero),
Pair<scalar>(dSeed_, dNew)
)
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 18a3c22a99..1f5960b75f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -445,7 +445,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
label tetFaceI = -1;
label tetPtI = -1;
- vector pos = vector::zero;
+ vector pos = Zero;
setPositionAndCell
(
@@ -565,7 +565,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
label tetFaceI = -1;
label tetPtI = -1;
- vector pos = vector::zero;
+ vector pos = Zero;
setPositionAndCell
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
index f245d62751..12364b9dfe 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,7 +37,7 @@ namespace Foam
Foam::kinematicParcelInjectionData::kinematicParcelInjectionData()
:
x_(point::zero),
- U_(vector::zero),
+ U_(Zero),
d_(0.0),
rho_(0.0),
mDot_(0.0)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index cd28712ee8..6200468ad9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -116,7 +116,7 @@ void Foam::NoInjection<CloudType>::setProperties
)
{
// set particle velocity
- parcel.U() = vector::zero;
+ parcel.U() = Zero;
// set particle diameter
parcel.d() = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
index 7a3ec75ebd..7d66ae2b37 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -87,7 +87,7 @@ Foam::forceSuSp Foam::DistortedSphereDragForce<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
// Limit the drop distortion to y=0 (sphere) and y=1 (disk)
scalar y = min(max(p.y(), 0), 1);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
index a18ffbecdb..fde0072ae2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -108,7 +108,7 @@ Foam::forceSuSp Foam::ErgunWenYuDragForce<CloudType>::calcCoupled
{
return forceSuSp
(
- vector::zero,
+ Zero,
(mass/p.rho())
*(150.0*(1.0 - alphac)/alphac + 1.75*Re)*muc/(alphac*sqr(p.d()))
);
@@ -117,7 +117,7 @@ Foam::forceSuSp Foam::ErgunWenYuDragForce<CloudType>::calcCoupled
{
return forceSuSp
(
- vector::zero,
+ Zero,
(mass/p.rho())
*0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/(alphac*sqr(p.d()))
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
index 489079f524..3cbccc4787 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,7 +95,7 @@ Foam::forceSuSp Foam::NonSphereDragForce<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
value.Sp() = mass*0.75*muc*CdRe(Re)/(p.rho()*sqr(p.d()));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
index 970dee90f9..7e2914e16a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -121,7 +121,7 @@ Foam::forceSuSp Foam::PlessisMasliyahDragForce<CloudType>::calcCoupled
return forceSuSp
(
- vector::zero,
+ Zero,
(mass/p.rho())
*(A*(1.0 - alphac)/alphac + B*Re)*muc/(alphac*sqr(p.d()))
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C
index 4cb63e4781..b93c2650aa 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/SphereDrag/SphereDragForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -84,7 +84,7 @@ Foam::forceSuSp Foam::SphereDragForce<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
value.Sp() = mass*0.75*muc*CdRe(Re)/(p.rho()*sqr(p.d()));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
index 57356aa147..c6747ce768 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -103,7 +103,7 @@ Foam::forceSuSp Foam::WenYuDragForce<CloudType>::calcCoupled
return forceSuSp
(
- vector::zero,
+ Zero,
(mass/p.rho())
*0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/(alphac*sqr(p.d()))
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C
index d2bb31bc03..54f7dc9c63 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Gravity/GravityForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -67,7 +67,7 @@ Foam::forceSuSp Foam::GravityForce<CloudType>::calcNonCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
value.Su() = mass*g_*(1.0 - p.rhoc()/p.rho());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
index a4faceeec7..5ffcb390a0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -134,7 +134,7 @@ Foam::forceSuSp Foam::LiftForce<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
vector curlUc =
curlUcInterp().interpolate(p.position(), p.currentTetIndices());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index d0edd8a228..9630f242b2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
"linearAcceleration"
)
),
- W_(vector::zero),
+ W_(Zero),
omegaName_
(
this->coeffs().template lookupOrDefault<word>
@@ -54,7 +54,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
"angularVelocity"
)
),
- omega_(vector::zero),
+ omega_(Zero),
omegaDotName_
(
this->coeffs().template lookupOrDefault<word>
@@ -63,7 +63,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
"angularAcceleration"
)
),
- omegaDot_(vector::zero),
+ omegaDot_(Zero),
centreOfRotationName_
(
this->coeffs().template lookupOrDefault<word>
@@ -72,7 +72,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
"centreOfRotation"
)
),
- centreOfRotation_(vector::zero)
+ centreOfRotation_(Zero)
{}
@@ -106,10 +106,10 @@ Foam::NonInertialFrameForce<CloudType>::~NonInertialFrameForce()
template<class CloudType>
void Foam::NonInertialFrameForce<CloudType>::cacheFields(const bool store)
{
- W_ = vector::zero;
- omega_ = vector::zero;
- omegaDot_ = vector::zero;
- centreOfRotation_ = vector::zero;
+ W_ = Zero;
+ omega_ = Zero;
+ omegaDot_ = Zero;
+ centreOfRotation_ = Zero;
if (store)
{
@@ -186,7 +186,7 @@ Foam::forceSuSp Foam::NonInertialFrameForce<CloudType>::calcNonCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
const vector r = p.position() - centreOfRotation_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
index 62628e6178..00737cc110 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -103,7 +103,7 @@ Foam::forceSuSp Foam::ParamagneticForce<CloudType>::calcNonCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
const interpolation<vector>& HdotGradHInterp = *HdotGradHInterpPtr_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
index a5a07d7baa..b337b4222f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -86,7 +86,7 @@ Foam::forceSuSp Foam::ParticleForce<CloudType>::calcCoupled
) const
{
forceSuSp value;
- value.Su() = vector::zero;
+ value.Su() = Zero;
value.Sp() = 0.0;
return value;
@@ -104,7 +104,7 @@ Foam::forceSuSp Foam::ParticleForce<CloudType>::calcNonCoupled
) const
{
forceSuSp value;
- value.Su() = vector::zero;
+ value.Su() = Zero;
value.Sp() = 0.0;
return value;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
index 4949ed7bf1..eac19829f0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -125,7 +125,7 @@ Foam::forceSuSp Foam::PressureGradientForce<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
vector DUcDt =
DUcDtInterp().interpolate(p.position(), p.currentTetIndices());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C
index eed0c800d0..82fdca98e1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -86,7 +86,7 @@ Foam::forceSuSp Foam::SRFForce<CloudType>::calcNonCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
const typename SRF::SRFModel& srf = *srfPtr_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 441812b543..6bd49e57ac 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -197,7 +197,7 @@ bool Foam::LocalInteraction<CloudType>::correct
keepParticle = false;
active = false;
- U = vector::zero;
+ U = Zero;
nEscape_[patchI]++;
massEscape_[patchI] += dm;
if (writeFields_)
@@ -214,7 +214,7 @@ bool Foam::LocalInteraction<CloudType>::correct
keepParticle = true;
active = false;
- U = vector::zero;
+ U = Zero;
nStick_[patchI]++;
massStick_[patchI] += dm;
if (writeFields_)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index 74c7aa3efd..da19861aa1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -122,7 +122,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
{
keepParticle = false;
active = false;
- U = vector::zero;
+ U = Zero;
nEscape_++;
massEscape_ += p.mass()*p.nParticle();
break;
@@ -131,7 +131,7 @@ bool Foam::StandardWallInteraction<CloudType>::correct
{
keepParticle = true;
active = false;
- U = vector::zero;
+ U = Zero;
nStick_++;
break;
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
index 0a2d801b85..6fbade1dbf 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.C
@@ -41,7 +41,7 @@ Foam::AveragingMethods::Moment<Type>::Moment
dataX_(FieldField<Field, Type>::operator[](1)),
dataY_(FieldField<Field, Type>::operator[](2)),
dataZ_(FieldField<Field, Type>::operator[](3)),
- transform_(mesh.nCells(), symmTensor::zero),
+ transform_(mesh.nCells(), Zero),
scale_(0.5*pow(mesh.V(), 1.0/3.0))
{
scalar a = 1.0/24.0;
@@ -65,7 +65,7 @@ Foam::AveragingMethods::Moment<Type>::Moment
const List<tetIndices> cellTets =
polyMeshTetDecomposition::cellTetIndices(mesh, cellI);
- symmTensor A(symmTensor::zero);
+ symmTensor A(Zero);
forAll(cellTets, tetI)
{
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C
index c49bf78aa5..5d59f60147 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -63,7 +63,7 @@ Foam::vector Foam::DampingModels::NoDamping<CloudType>::velocityCorrection
const scalar deltaT
) const
{
- return vector::zero;
+ return Zero;
}
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
index d5bdc17687..f4d5d0fa58 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
@@ -162,7 +162,7 @@ Foam::vector Foam::PackingModels::Explicit<CloudType>::velocityCorrection
const vector uRelative = p.U() - uMean;
// correction velocity
- vector dU = vector::zero;
+ vector dU = Zero;
//// existing forces
//const scalar Re = p.Re(p.U(), p.d(), p.rhoc(), p.muc());
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index ad22dc25fb..31065b6191 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -253,7 +253,7 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
IOobject::NO_WRITE
),
mesh,
- dimensionedVector("zero", dimVelocity, vector::zero),
+ dimensionedVector("zero", dimVelocity, Zero),
fixedValueFvPatchField<vector>::typeName
);
U.internalField() = uAverage.internalField();
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C
index 92adbba777..bbd3327002 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -64,7 +64,7 @@ Foam::vector Foam::PackingModels::NoPacking<CloudType>::velocityCorrection
const scalar deltaT
) const
{
- return vector::zero;
+ return Zero;
}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 7f75237886..f5dcf903e1 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -87,7 +87,7 @@ Foam::vector Foam::ThermoSurfaceFilm<CloudType>::tangentVector
const vector& v
) const
{
- vector tangent = vector::zero;
+ vector tangent = Zero;
scalar magTangent = 0.0;
while (magTangent < SMALL)
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index a19febe07b..fe512038ae 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -41,7 +41,7 @@ if (runTime.outputTime())
Bulk velocity
\*-----------------------------------------------------------------------*/
- vectorField totalMomentum_sum(mesh.nCells(), vector::zero);
+ vectorField totalMomentum_sum(mesh.nCells(), Zero);
scalarField totalMass_sum(mesh.nCells(), 0.0);
@@ -71,7 +71,7 @@ if (runTime.outputTime())
}
else
{
- singleSpeciesVelocity[sSV] = vector::zero;
+ singleSpeciesVelocity[sSV] = Zero;
}
}
}
@@ -87,7 +87,7 @@ if (runTime.outputTime())
}
else
{
- itotalVelocity[tV] = vector::zero;
+ itotalVelocity[tV] = Zero;
}
}
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index 4b46bdd0df..29a94307ce 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,7 +39,7 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
{
- vector p = vector::zero;
+ vector p = Zero;
forAllConstIter(IDLList<molecule>, molecules, mol)
{
@@ -61,7 +61,7 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
{
- vector s = vector::zero;
+ vector s = Zero;
forAllConstIter(IDLList<molecule>, molecules, mol)
{
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index b730adb56e..83bcaa8ec7 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -15,7 +15,7 @@ List<scalarField> allSpeciesM_RU
List<vectorField> allSpeciesVelocitySum_RU
(
molecules.potential().nIds(),
- vectorField (mesh.nCells(), vector::zero)
+ vectorField (mesh.nCells(), Zero)
);
List<scalarField> allSpeciesVelocityMagSquaredSum_RU
@@ -171,7 +171,7 @@ forAll(allSpeciesVelocity, v)
)
);
allSpeciesVelocity[v].internalField() =
- vectorField (mesh.nCells(), vector::zero);
+ vectorField (mesh.nCells(), Zero);
allSpeciesVelocity[v].correctBoundaryConditions();
}
@@ -191,7 +191,7 @@ Info << " Creating total velocity field" << endl;
// dimVelocity,
// "zeroGradient"
// );
-// totalVelocity.internalField() = vectorField (mesh.nCells(), vector::zero);
+// totalVelocity.internalField() = vectorField (mesh.nCells(), Zero);
// totalVelocity.correctBoundaryConditions();
@@ -209,7 +209,7 @@ volVectorField totalVelocity
),
mesh,
- dimensionedVector("zero", dimVelocity, vector::zero)
+ dimensionedVector("zero", dimVelocity, Zero)
);
/*---------------------------------------------------------------------------*\
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index ae117cafc5..a23468df1c 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,9 +31,9 @@ Description
\*---------------------------------------------------------------------------*/
-vector singleStepTotalLinearMomentum(vector::zero);
+vector singleStepTotalLinearMomentum(Zero);
-vector singleStepTotalAngularMomentum(vector::zero);
+vector singleStepTotalAngularMomentum(Zero);
scalar singleStepMaxVelocityMag = 0.0;
@@ -47,7 +47,7 @@ scalar singleStepTotalPE = 0.0;
scalar singleStepTotalrDotf = 0.0;
-//vector singleStepCentreOfMass(vector::zero);
+//vector singleStepCentreOfMass(Zero);
label singleStepNMols = molecules.size();
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
index 4bd50ebafc..ddf96d1ef0 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
@@ -15,7 +15,7 @@ if (runTime.outputTime())
allSpeciesVelocitySum_RU = List<vectorField>
(
molecules.potential().nIds(),
- vectorField(mesh.nCells(), vector::zero)
+ vectorField(mesh.nCells(), Zero)
);
allSpeciesVelocityMagSquaredSum_RU = List<scalarField>
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
index df182244d2..6f32f0ec13 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -90,7 +90,7 @@ if (runTime.outputTime())
<< "no molecules in system" << endl;
}
- accumulatedTotalLinearMomentum = vector::zero;
+ accumulatedTotalLinearMomentum = Zero;
accumulatedTotalMass = 0.0;
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
index d0aa0aabe8..0ce24f3da4 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ Description
\*---------------------------------------------------------------------------*/
-vector accumulatedTotalLinearMomentum(vector::zero);
+vector accumulatedTotalLinearMomentum(Zero);
scalar accumulatedTotalMass = 0.0;
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index 75312848bd..a5ba420f34 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -147,9 +147,9 @@ bool Foam::molecule::move(molecule::trackingData& td, const scalar trackTime)
scalar m = constProps.mass();
- a_ = vector::zero;
+ a_ = Zero;
- tau_ = vector::zero;
+ tau_ = Zero;
forAll(siteForces_, s)
{
@@ -166,9 +166,9 @@ bool Foam::molecule::move(molecule::trackingData& td, const scalar trackTime)
if (constProps.pointMolecule())
{
- tau_ = vector::zero;
+ tau_ = Zero;
- pi_ = vector::zero;
+ pi_ = Zero;
}
if (constProps.linearMolecule())
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index 062395ba6b..9430f22e62 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -62,7 +62,7 @@ inline Foam::molecule::constantProperties::constantProperties
mass_ = sum(siteMasses_);
- vector centreOfMass(vector::zero);
+ vector centreOfMass(Zero);
// Calculate the centre of mass of the body and subtract it from each
// position
@@ -80,7 +80,7 @@ inline Foam::molecule::constantProperties::constantProperties
{
// Single site molecule - no rotational motion.
- siteReferencePositions_[0] = vector::zero;
+ siteReferencePositions_[0] = Zero;
momentOfInertia_ = diagTensor(-1, -1, -1);
}
@@ -101,7 +101,7 @@ inline Foam::molecule::constantProperties::constantProperties
// The rotation was around the centre of mass but remove any
// components that have crept in due to floating point errors
- centreOfMass = vector::zero;
+ centreOfMass = Zero;
forAll(siteReferencePositions_, i)
{
@@ -112,7 +112,7 @@ inline Foam::molecule::constantProperties::constantProperties
siteReferencePositions_ -= centreOfMass;
- diagTensor momOfInertia = diagTensor::zero;
+ diagTensor momOfInertia = Zero;
forAll(siteReferencePositions_, i)
{
@@ -135,7 +135,7 @@ inline Foam::molecule::constantProperties::constantProperties
// Calculate the inertia tensor in the current orientation
- tensor momOfInertia(tensor::zero);
+ tensor momOfInertia(Zero);
forAll(siteReferencePositions_, i)
{
@@ -179,7 +179,7 @@ inline Foam::molecule::constantProperties::constantProperties
// The rotation was around the centre of mass but remove any
// components that have crept in due to floating point errors
- centreOfMass = vector::zero;
+ centreOfMass = Zero;
forAll(siteReferencePositions_, i)
{
@@ -193,7 +193,7 @@ inline Foam::molecule::constantProperties::constantProperties
// Calculate the moment of inertia in the principle component
// reference frame
- momOfInertia = tensor::zero;
+ momOfInertia = Zero;
forAll(siteReferencePositions_, i)
{
@@ -244,10 +244,10 @@ inline Foam::molecule::molecule
tau_(tau),
specialPosition_(specialPosition),
potentialEnergy_(0.0),
- rf_(tensor::zero),
+ rf_(Zero),
special_(special),
id_(id),
- siteForces_(constProps.nSites(), vector::zero),
+ siteForces_(constProps.nSites(), Zero),
sitePositions_(constProps.nSites())
{
setSitePositions(constProps);
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index c7829e6958..d6fd3cbd29 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,14 +45,14 @@ Foam::molecule::molecule
)
:
particle(mesh, is, readFields),
- Q_(tensor::zero),
- v_(vector::zero),
- a_(vector::zero),
- pi_(vector::zero),
- tau_(vector::zero),
- specialPosition_(vector::zero),
+ Q_(Zero),
+ v_(Zero),
+ a_(Zero),
+ pi_(Zero),
+ tau_(Zero),
+ specialPosition_(Zero),
potentialEnergy_(0.0),
- rf_(tensor::zero),
+ rf_(Zero),
special_(0),
id_(0),
siteForces_(0),
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index ae57fb42fa..e4bc84a7dc 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -1016,7 +1016,7 @@ void Foam::moleculeCloud::createMolecule
<< abort(FatalError);
}
- point specialPosition(vector::zero);
+ point specialPosition(Zero);
label special = 0;
@@ -1033,7 +1033,7 @@ void Foam::moleculeCloud::createMolecule
v += bulkVelocity;
- vector pi = vector::zero;
+ vector pi = Zero;
tensor Q = I;
@@ -1072,9 +1072,9 @@ void Foam::moleculeCloud::createMolecule
tetPt,
Q,
v,
- vector::zero,
+ Zero,
pi,
- vector::zero,
+ Zero,
specialPosition,
constProps(id),
special,
@@ -1184,11 +1184,11 @@ void Foam::moleculeCloud::calculateForce()
// Set accumulated quantities to zero
forAllIter(moleculeCloud, *this, mol)
{
- mol().siteForces() = vector::zero;
+ mol().siteForces() = Zero;
mol().potentialEnergy() = 0.0;
- mol().rf() = tensor::zero;
+ mol().rf() = Zero;
}
calculatePairForce();
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index b33d39987c..8c8b04e8b9 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -225,7 +225,7 @@ void Foam::potential::potential::readPotentialDict()
// *************************************************************************
// External Forces
- gravity_ = vector::zero;
+ gravity_ = Zero;
if (potentialDict.found("external"))
{
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 101ea7cf79..dab14e4248 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -47,7 +47,7 @@ Foam::SprayParcel<ParcelType>::SprayParcel
:
ParcelType(mesh, is, readFields),
d0_(0.0),
- position0_(vector::zero),
+ position0_(Zero),
sigma_(0.0),
mu_(0.0),
liquidCore_(0.0),
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index da2d36baf1..8469c76035 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -148,7 +148,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
else
{
tTurb = GREAT;
- UTurb = vector::zero;
+ UTurb = Zero;
}
return Uc + UTurb;
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index 554967aa99..e5131b8007 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,7 +111,7 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
else
{
tTurb = GREAT;
- UTurb = vector::zero;
+ UTurb = Zero;
}
return Uc + UTurb;
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index 4c2059e0a9..9dffc11bcd 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -165,7 +165,7 @@ Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
const scalar muc
) const
{
- forceSuSp value(vector::zero, 0.0);
+ forceSuSp value(Zero, 0.0);
const scalar dp = p.d();
const scalar Tc = p.Tc();
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index fc70998861..3b521a75b4 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -558,7 +558,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
points[pointI],
0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -614,7 +614,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
medialAxisPt, //points[pointI],
magSqr(points[pointI]-medialAxisPt),//0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -671,7 +671,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
points[pointI],
0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -728,7 +728,7 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
points[pointI],
0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -868,13 +868,13 @@ bool Foam::medialAxisMeshMover::unmarkExtrusion
if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
{
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
return true;
}
else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
{
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
return true;
}
else
@@ -1639,7 +1639,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
false
),
pMesh(),
- dimensionedVector("dispVec", dimLength, vector::zero)
+ dimensionedVector("dispVec", dimLength, Zero)
),
medialRatio_
(
@@ -1681,7 +1681,7 @@ Foam::medialAxisMeshMover::medialAxisMeshMover
false
),
pMesh(),
- dimensionedVector("medialVec", dimLength, vector::zero)
+ dimensionedVector("medialVec", dimLength, Zero)
)
{
update(dict);
@@ -1981,7 +1981,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
points[pointI],
0.0,
thickness[patchPointI], // transport layer thickness
- vector::zero // passive vector
+ Zero // passive vector
);
}
@@ -2007,7 +2007,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
{
if (!pointWallDist[pointI].valid(dummyTrackData))
{
- displacement[pointI] = vector::zero;
+ displacement[pointI] = Zero;
}
else
{
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 1847f050ea..9845e32f4f 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1839,7 +1839,7 @@ Foam::tmp<Foam::pointVectorField> Foam::meshRefinement::makeDisplacementField
IOobject::AUTO_WRITE
),
pMesh,
- dimensionedVector("displacement", dimLength, vector::zero),
+ dimensionedVector("displacement", dimLength, Zero),
patchFieldTypes
)
);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
index a46c41a412..707e5ce426 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
@@ -1528,7 +1528,7 @@ bool Foam::meshRefinement::isGap
{
scalar cosAngle = (normal0 & normal1);
- vector avg = vector::zero;
+ vector avg = Zero;
if (cosAngle < (-1+planarCos))
{
// Opposite normals
@@ -1585,7 +1585,7 @@ bool Foam::meshRefinement::isNormalGap
{
scalar cosAngle = (normal0 & normal1);
- vector avg = vector::zero;
+ vector avg = Zero;
if (cosAngle < (-1+planarCos))
{
// Opposite normals
@@ -1774,8 +1774,8 @@ Foam::label Foam::meshRefinement::markProximityRefinement
// minLevel) and cache per cell the max surface level and the local normal
// on that surface.
labelList cellMaxLevel(mesh_.nCells(), -1);
- vectorField cellMaxNormal(mesh_.nCells(), vector::zero);
- pointField cellMaxLocation(mesh_.nCells(), vector::zero);
+ vectorField cellMaxNormal(mesh_.nCells(), Zero);
+ pointField cellMaxLocation(mesh_.nCells(), Zero);
{
// Per segment the normals of the surfaces
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 544d895c89..bd988ed382 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -535,7 +535,7 @@ void Foam::refinementFeatures::findNearestEdge
nearInfo.setSize(samples.size());
nearInfo = pointIndexHit();
nearNormal.setSize(samples.size());
- nearNormal = vector::zero;
+ nearNormal = Zero;
forAll(edgeTrees_, featI)
{
@@ -594,7 +594,7 @@ void Foam::refinementFeatures::findNearestRegionEdge
nearInfo.setSize(samples.size());
nearInfo = pointIndexHit();
nearNormal.setSize(samples.size());
- nearNormal = vector::zero;
+ nearNormal = Zero;
const PtrList<indexedOctree<treeDataEdge>>& regionTrees =
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 5046f34166..285197bc7b 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -935,7 +935,7 @@ void Foam::refinementSurfaces::findNearestIntersection
region1.setSize(start.size());
region1 = -1;
normal1.setSize(start.size());
- normal1 = vector::zero;
+ normal1 = Zero;
// Current end of segment to test.
pointField nearest(end);
@@ -1185,7 +1185,7 @@ void Foam::refinementSurfaces::findNearestRegion
hitRegion.setSize(hitSurface.size());
hitRegion = -1;
hitNormal.setSize(hitSurface.size());
- hitNormal = vector::zero;
+ hitNormal = Zero;
forAll(surfacesToTest, i)
{
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 1d1620e9d6..08aaa80cf9 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -225,14 +225,14 @@ bool Foam::snappyLayerDriver::unmarkExtrusion
{
extrudeStatus[patchPointI] = NOEXTRUDE;
patchNLayers[patchPointI] = 0;
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
return true;
}
else if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
{
extrudeStatus[patchPointI] = NOEXTRUDE;
patchNLayers[patchPointI] = 0;
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
return true;
}
else
@@ -868,7 +868,7 @@ Foam::snappyLayerDriver::makeLayerDisplacementField
IOobject::AUTO_WRITE
),
pMesh,
- dimensionedVector("displacement", dimLength, vector::zero),
+ dimensionedVector("displacement", dimLength, Zero),
patchFieldTypes,
actualPatchTypes
)
@@ -955,7 +955,7 @@ void Foam::snappyLayerDriver::growNoExtrusion
{
if (extrudeStatus[patchPointI] == NOEXTRUDE)
{
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
patchNLayers[patchPointI] = 0;
}
}
@@ -1520,7 +1520,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
{
// Do not use unmarkExtrusion; forcibly set to zero extrusion.
patchNLayers[patchPointI] = 0;
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
}
else
{
@@ -1549,7 +1549,7 @@ void Foam::snappyLayerDriver::getPatchDisplacement
{
if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
{
- point avg(vector::zero);
+ point avg(Zero);
label nPoints = 0;
const labelList& pEdges = pp.pointEdges()[patchPointI];
@@ -1786,7 +1786,7 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
else if (extrudeStatus[patchPointI] == NOEXTRUDE)
{
// Make sure displacement is 0. Should already be so but ...
- patchDisp[patchPointI] = vector::zero;
+ patchDisp[patchPointI] = Zero;
patchNLayers[patchPointI] = 0;
}
}
@@ -3277,7 +3277,7 @@ void Foam::snappyLayerDriver::addLayers
// Calculate displacement for final layer for addPatchLayer.
// (layer of cells next to the original mesh)
- vectorField finalDisp(patchNLayers.size(), vector::zero);
+ vectorField finalDisp(patchNLayers.size(), Zero);
forAll(nPatchPointLayers, i)
{
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
index 5568f09025..5af612eda6 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
@@ -1097,7 +1097,7 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
medialAxisPt, //points[pointI],
magSqr(points[pointI]-medialAxisPt),//0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -1153,7 +1153,7 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
points[pointI],
0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -1203,7 +1203,7 @@ void Foam::snappyLayerDriver::medialAxisSmoothingInfo
points[pointI],
0.0,
pointI, // passive data
- vector::zero // passive data
+ Zero // passive data
)
);
pointMedialDist[pointI] = maxInfo.last();
@@ -1584,7 +1584,7 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
points[pointI],
0.0,
thickness[patchPointI], // transport layer thickness
- vector::zero // passive vector
+ Zero // passive vector
);
}
@@ -1608,7 +1608,7 @@ void Foam::snappyLayerDriver::shrinkMeshMedialDistance
{
if (!pointWallDist[pointI].valid(dummyTrackData))
{
- displacement[pointI] = vector::zero;
+ displacement[pointI] = Zero;
}
else
{
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index 53f234c98f..c4215b1f46 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -189,7 +189,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
// Get average position of boundary face centres
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- vectorField avgBoundary(pointFaces.size(), vector::zero);
+ vectorField avgBoundary(pointFaces.size(), Zero);
labelList nBoundary(pointFaces.size(), 0);
forAll(pointFaces, patchPointI)
@@ -237,7 +237,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
vectorField avgInternal;
labelList nInternal;
{
- vectorField globalSum(mesh.nPoints(), vector::zero);
+ vectorField globalSum(mesh.nPoints(), Zero);
labelList globalNum(mesh.nPoints(), 0);
// Note: no use of pointFaces
@@ -351,7 +351,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
// Displacement to calculate.
- pointField patchDisp(meshPoints.size(), vector::zero);
+ pointField patchDisp(meshPoints.size(), Zero);
forAll(pointFaces, i)
{
@@ -426,7 +426,7 @@ Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
// const labelListList& pointEdges = pp.pointEdges();
// const edgeList& edges = pp.edges();
//
-// tmp<pointField> tavg(new pointField(pointEdges.size(), vector::zero));
+// tmp<pointField> tavg(new pointField(pointEdges.size(), Zero));
// pointField& avg = tavg();
//
// forAll(pointEdges, vertI)
@@ -872,7 +872,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
tmp<pointField> tavgBoundary
(
- new pointField(pointFaces.size(), vector::zero)
+ new pointField(pointFaces.size(), Zero)
);
pointField& avgBoundary = tavgBoundary.ref();
labelList nBoundary(pointFaces.size(), 0);
@@ -1580,7 +1580,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
const fvMesh& mesh = meshRefiner.mesh();
// Displacement per patch point
- vectorField patchDisp(localPoints.size(), vector::zero);
+ vectorField patchDisp(localPoints.size(), Zero);
if (returnReduce(localPoints.size(), sumOp<label>()) > 0)
{
@@ -1904,7 +1904,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
// // the patch.
//
// // Displacement per patch point
-// vectorField patchDisp(localPoints.size(), vector::zero);
+// vectorField patchDisp(localPoints.size(), Zero);
// // Current best snap distance
// scalarField minSnapDist(snapDist);
// // Current surface snapped to
@@ -2829,7 +2829,7 @@ void Foam::snappySnapDriver::doSnap
// if (snapParams.detectNearSurfacesSnap())
// {
// nearestPoint.setSize(pp.nPoints(), vector::max);
- // nearestNormal.setSize(pp.nPoints(), vector::zero);
+ // nearestNormal.setSize(pp.nPoints(), Zero);
// }
//
// vectorField disp = calcNearestSurface
@@ -3053,7 +3053,7 @@ void Foam::snappySnapDriver::doSnap
if (snapParams.detectNearSurfacesSnap())
{
nearestPoint.setSize(pp.nPoints(), vector::max);
- nearestNormal.setSize(pp.nPoints(), vector::zero);
+ nearestNormal.setSize(pp.nPoints(), Zero);
}
vectorField disp = calcNearestSurface
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 96cd3c5a51..b101e3ae97 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -150,7 +150,7 @@ void Foam::snappySnapDriver::smoothAndConstrain
// - same for feature points. They are already attracted to the
// nearest feature point.
- vectorField dispSum(pp.nPoints(), vector::zero);
+ vectorField dispSum(pp.nPoints(), Zero);
labelList dispCount(pp.nPoints(), 0);
const labelListList& pointEdges = pp.pointEdges();
@@ -231,9 +231,9 @@ void Foam::snappySnapDriver::calcNearestFace
// Displacement and orientation per pp face.
faceDisp.setSize(pp.size());
- faceDisp = vector::zero;
+ faceDisp = Zero;
faceSurfaceNormal.setSize(pp.size());
- faceSurfaceNormal = vector::zero;
+ faceSurfaceNormal = Zero;
faceSurfaceGlobalRegion.setSize(pp.size());
faceSurfaceGlobalRegion = -1;
@@ -406,7 +406,7 @@ void Foam::snappySnapDriver::calcNearestFace
// Determine rotation axis
faceRotation.setSize(pp.size());
- faceRotation = vector::zero;
+ faceRotation = Zero;
forAll(faceRotation, faceI)
{
@@ -692,7 +692,7 @@ Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
}
}
}
- return pointIndexHit(false, vector::zero, labelMax);
+ return pointIndexHit(false, Zero, labelMax);
}
@@ -826,7 +826,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
pointConstraint& patchConstraint
) const
{
- patchAttraction = vector::zero;
+ patchAttraction = Zero;
patchConstraint = pointConstraint();
const List<point>& pfSurfNormals = pointFaceSurfNormals[pointI];
@@ -1048,7 +1048,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
forAll(pp.localPoints(), pointI)
{
- vector attraction = vector::zero;
+ vector attraction = Zero;
pointConstraint constraint;
featureAttractionUsingReconstruction
@@ -1403,7 +1403,7 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
//Pout<< "Knocking out constraint"
// << " on non-multiPatchPoint:"
// << pp.localPoints()[pointI] << endl;
- patchAttraction[pointI] = vector::zero;
+ patchAttraction[pointI] = Zero;
patchConstraints[pointI] = pointConstraint();
nChanged++;
@@ -1712,7 +1712,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
// Current pointI nearer.
pointAttractor[featI][featPointI] = pointI;
pointConstraints[featI][featPointI].first() = 3;
- pointConstraints[featI][featPointI].second() = vector::zero;
+ pointConstraints[featI][featPointI].second() = Zero;
// Store for later use
patchAttraction[pointI] = featPt-pt;
@@ -1720,7 +1720,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
pointConstraints[featI][featPointI];
// Reset oldPointI to nearest on feature edge
- patchAttraction[oldPointI] = vector::zero;
+ patchAttraction[oldPointI] = Zero;
patchConstraints[oldPointI] = pointConstraint();
findNearFeatureEdge
@@ -1744,7 +1744,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
// Current pointI nearer.
pointAttractor[featI][featPointI] = pointI;
pointConstraints[featI][featPointI].first() = 3;
- pointConstraints[featI][featPointI].second() = vector::zero;
+ pointConstraints[featI][featPointI].second() = Zero;
// Store for later use
patchAttraction[pointI] = featPt-pt;
@@ -1831,7 +1831,7 @@ void Foam::snappySnapDriver::determineFeatures
{
const point& pt = pp.localPoints()[pointI];
- vector attraction = vector::zero;
+ vector attraction = Zero;
pointConstraint constraint;
featureAttractionUsingReconstruction
@@ -2373,7 +2373,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
pointAttractor[featI][featPointI] = pointI;
pointConstraints[featI][featPointI].first() = 3;
pointConstraints[featI][featPointI].second() =
- vector::zero;
+ Zero;
// Store for later use
patchAttraction[pointI] = featPt-pt;
@@ -2570,7 +2570,7 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
// Per mesh point the point on nearest feature edge.
patchAttraction.setSize(pp.nPoints());
- patchAttraction = vector::zero;
+ patchAttraction = Zero;
patchConstraints.setSize(pp.nPoints());
patchConstraints = pointConstraint();
@@ -2746,7 +2746,7 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
}
// Reverse: from pp point to nearest feature
- vectorField rawPatchAttraction(pp.nPoints(), vector::zero);
+ vectorField rawPatchAttraction(pp.nPoints(), Zero);
List<pointConstraint> rawPatchConstraints(pp.nPoints());
determineFeatures
@@ -3080,11 +3080,11 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// vector from point on surface back to face centre
- vectorField faceDisp(pp.size(), vector::zero);
+ vectorField faceDisp(pp.size(), Zero);
// normal of surface at point on surface
- vectorField faceSurfaceNormal(pp.size(), vector::zero);
+ vectorField faceSurfaceNormal(pp.size(), Zero);
labelList faceSurfaceGlobalRegion(pp.size(), -1);
- vectorField faceRotation(pp.size(), vector::zero);
+ vectorField faceRotation(pp.size(), Zero);
calcNearestFace
(
@@ -3132,7 +3132,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
// Nearest feature
patchAttraction.setSize(localPoints.size());
- patchAttraction = vector::zero;
+ patchAttraction = Zero;
// Constraints at feature
patchConstraints.setSize(localPoints.size());
patchConstraints = pointConstraint();
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index a14224a42b..d795579e82 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -132,7 +132,7 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
{
case ROTATIONAL:
{
- tensor revT = tensor::zero;
+ tensor revT = Zero;
if (rotationAngleDefined_)
{
@@ -217,8 +217,8 @@ void Foam::cyclicAMIPolyPatch::calcTransforms
}
else
{
- point n0 = vector::zero;
- point n1 = vector::zero;
+ point n0 = Zero;
+ point n1 = Zero;
if (half0Ctrs.size())
{
n0 = findFaceNormalMaxRadius(half0Ctrs);
@@ -485,11 +485,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
coupledPolyPatch(name, size, start, index, bm, patchType, transform),
nbrPatchName_(word::null),
nbrPatchID_(-1),
- rotationAxis_(vector::zero),
+ rotationAxis_(Zero),
rotationCentre_(point::zero),
rotationAngleDefined_(false),
rotationAngle_(0.0),
- separationVector_(vector::zero),
+ separationVector_(Zero),
AMIPtr_(NULL),
AMIReverse_(false),
AMIRequireMatch_(true),
@@ -515,11 +515,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
nbrPatchName_(dict.lookupOrDefault<word>("neighbourPatch", "")),
coupleGroup_(dict),
nbrPatchID_(-1),
- rotationAxis_(vector::zero),
+ rotationAxis_(Zero),
rotationCentre_(point::zero),
rotationAngleDefined_(false),
rotationAngle_(0.0),
- separationVector_(vector::zero),
+ separationVector_(Zero),
AMIPtr_(NULL),
AMIReverse_(dict.lookupOrDefault<bool>("flipNormals", false)),
AMIRequireMatch_(true),
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
index ae0614f8de..1c62449c20 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C
@@ -90,7 +90,7 @@ void Foam::axesRotation::calcTransform
<< "Unhandled axes specifictation" << endl
<< abort(FatalError);
- Rtr = tensor::zero;
+ Rtr = Zero;
break;
}
}
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index 572db42283..25cbcc4a47 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -100,7 +100,7 @@ Foam::cylindrical::cylindrical
:
Rptr_(),
origin_(point::zero),
- e3_(vector::zero)
+ e3_(Zero)
{
// If origin is specified in the coordinateSystem
if (dict.parent().found("origin"))
@@ -165,8 +165,8 @@ Foam::cylindrical::cylindrical(const dictionary& dict)
Foam::cylindrical::cylindrical(const tensorField& R)
:
Rptr_(),
- origin_(vector::zero),
- e3_(vector::zero)
+ origin_(Zero),
+ e3_(Zero)
{
Rptr_() = R;
}
@@ -222,7 +222,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
Foam::vector Foam::cylindrical::transform(const vector& v) const
{
NotImplemented;
- return vector::zero;
+ return Zero;
}
@@ -248,7 +248,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindrical::invTransform
Foam::vector Foam::cylindrical::invTransform(const vector& v) const
{
NotImplemented;
- return vector::zero;
+ return Zero;
}
@@ -284,7 +284,7 @@ Foam::tensor Foam::cylindrical::transformTensor
{
NotImplemented;
- return tensor::zero;
+ return Zero;
}
@@ -345,7 +345,7 @@ Foam::symmTensor Foam::cylindrical::transformVector
) const
{
NotImplemented;
- return symmTensor::zero;
+ return Zero;
}
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index e3d9a53c10..92d1cb40f4 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -281,7 +281,7 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::globalToLocal
void Foam::coordinateSystem::clear()
{
note_.clear();
- origin_ = point::zero;
+ origin_ = Zero;
R_->clear();
}
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index 6a9c188988..ff831965ad 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -265,7 +265,7 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
// triangle normals)
const labelList& pFaces = mesh_.pointFaces()[f[fp]];
- vector pointNormal(vector::zero);
+ vector pointNormal(Zero);
forAll(pFaces, i)
{
@@ -334,7 +334,7 @@ Foam::volumeType Foam::treeDataFace::getVolumeType
// triangle normals)
const labelList& eFaces = mesh_.edgeFaces()[myEdges[myEdgeI]];
- vector edgeNormal(vector::zero);
+ vector edgeNormal(Zero);
forAll(eFaces, i)
{
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 2beba5e37e..30265ba8ed 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -286,7 +286,7 @@ Foam::volumeType Foam::treeDataPrimitivePatch<PatchType>::getVolumeType
// triangle normals)
const labelList& eFaces = patch_.edgeFaces()[edgeI];
- vector edgeNormal(vector::zero);
+ vector edgeNormal(Zero);
forAll(eFaces, i)
{
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 0ecb78004f..c42a97c0dd 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -939,7 +939,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(""),
coupleGroup_(),
offsetMode_(UNIFORM),
- offset_(vector::zero),
+ offset_(Zero),
offsets_(pp.size(), offset_),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -966,7 +966,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(samplePatch),
coupleGroup_(),
offsetMode_(NONUNIFORM),
- offset_(vector::zero),
+ offset_(Zero),
offsets_(offsets),
distance_(0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -1020,7 +1020,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(samplePatch),
coupleGroup_(),
offsetMode_(NORMAL),
- offset_(vector::zero),
+ offset_(Zero),
offsets_(0),
distance_(distance),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -1044,7 +1044,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
coupleGroup_(dict),
offsetMode_(UNIFORM),
- offset_(vector::zero),
+ offset_(Zero),
offsets_(0),
distance_(0.0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
@@ -1126,7 +1126,7 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(dict.lookupOrDefault<word>("samplePatch", "")),
coupleGroup_(dict), //dict.lookupOrDefault<word>("coupleGroup", "")),
offsetMode_(UNIFORM),
- offset_(vector::zero),
+ offset_(Zero),
offsets_(0),
distance_(0.0),
sameRegion_(sampleRegion_ == patch_.boundaryMesh().mesh().name()),
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 24753a108b..9eac2eeb99 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -171,7 +171,7 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
}
else
{
- pn[pointI] = vector::zero;
+ pn[pointI] = Zero;
WarningInFunction
<< "No visible octant for point:" << pp.meshPoints()[pointI]
diff --git a/src/meshTools/momentOfInertia/momentOfInertia.C b/src/meshTools/momentOfInertia/momentOfInertia.C
index c28ca0325b..98b44ac340 100644
--- a/src/meshTools/momentOfInertia/momentOfInertia.C
+++ b/src/meshTools/momentOfInertia/momentOfInertia.C
@@ -198,8 +198,8 @@ void Foam::momentOfInertia::massPropertiesShell
// Reset properties for accumulation
mass = 0.0;
- cM = vector::zero;
- J = tensor::zero;
+ cM = Zero;
+ J = Zero;
// Find centre of mass
@@ -337,8 +337,8 @@ Foam::tensor Foam::momentOfInertia::meshInertia
}
scalar m = 0.0;
- vector cM = vector::zero;
- tensor J = tensor::zero;
+ vector cM = Zero;
+ tensor J = Zero;
massPropertiesSolid(mesh.points(), faces, 1.0, m, cM, J);
diff --git a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
index 24e7d39a17..933a95a38a 100644
--- a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
+++ b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
@@ -62,9 +62,9 @@ void Foam::primitiveMeshGeometry::updateFaceCentresAndAreas
}
else
{
- vector sumN = vector::zero;
+ vector sumN = Zero;
scalar sumA = 0.0;
- vector sumAc = vector::zero;
+ vector sumAc = Zero;
point fCentre = p[f[0]];
for (label pi = 1; pi < nPoints; pi++)
@@ -101,7 +101,7 @@ void Foam::primitiveMeshGeometry::updateCellCentresAndVols
)
{
// Clear the fields for accumulation
- UIndirectList<vector>(cellCentres_, changedCells) = vector::zero;
+ UIndirectList<vector>(cellCentres_, changedCells) = Zero;
UIndirectList<scalar>(cellVolumes_, changedCells) = 0.0;
const labelList& own = mesh_.faceOwner();
@@ -110,7 +110,7 @@ void Foam::primitiveMeshGeometry::updateCellCentresAndVols
// first estimate the approximate cell centre as the average of face centres
vectorField cEst(mesh_.nCells());
- UIndirectList<vector>(cEst, changedCells) = vector::zero;
+ UIndirectList<vector>(cEst, changedCells) = Zero;
scalarField nCellFaces(mesh_.nCells());
UIndirectList<scalar>(nCellFaces, changedCells) = 0.0;
@@ -1187,7 +1187,7 @@ bool Foam::primitiveMeshGeometry::checkCellDeterminant
{
const cell& cFaces = cells[affectedCells[i]];
- tensor areaSum(tensor::zero);
+ tensor areaSum(Zero);
scalar magAreaSum = 0;
forAll(cFaces, cFaceI)
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index c42150e7ef..ba5da457eb 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -579,7 +579,7 @@ void Foam::searchableBox::getNormal
) const
{
normal.setSize(info.size());
- normal = vector::zero;
+ normal = Zero;
forAll(info, i)
{
diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C
index 69568fa18d..53c0c48cb3 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.C
+++ b/src/meshTools/searchableSurface/searchableCylinder.C
@@ -93,7 +93,7 @@ Foam::pointIndexHit Foam::searchableCylinder::findNearest
if (magV < ROOTVSMALL)
{
- v = vector::zero;
+ v = Zero;
}
else
{
@@ -651,7 +651,7 @@ void Foam::searchableCylinder::getNormal
) const
{
normal.setSize(info.size());
- normal = vector::zero;
+ normal = Zero;
forAll(info, i)
{
diff --git a/src/meshTools/searchableSurface/searchableDisk.C b/src/meshTools/searchableSurface/searchableDisk.C
index b7a7347d5e..a62604c259 100644
--- a/src/meshTools/searchableSurface/searchableDisk.C
+++ b/src/meshTools/searchableSurface/searchableDisk.C
@@ -58,7 +58,7 @@ Foam::pointIndexHit Foam::searchableDisk::findNearest
if (magV < ROOTVSMALL)
{
- v = vector::zero;
+ v = Zero;
}
else
{
@@ -85,7 +85,7 @@ void Foam::searchableDisk::findLine
pointIndexHit& info
) const
{
- info = pointIndexHit(false, vector::zero, -1);
+ info = pointIndexHit(false, Zero, -1);
vector v(start - origin_);
@@ -103,7 +103,7 @@ void Foam::searchableDisk::findLine
if (magV < ROOTVSMALL)
{
- v = vector::zero;
+ v = Zero;
}
else
{
diff --git a/src/meshTools/searchableSurface/searchablePlane.C b/src/meshTools/searchableSurface/searchablePlane.C
index c704e18d9c..d059c6ef44 100644
--- a/src/meshTools/searchableSurface/searchablePlane.C
+++ b/src/meshTools/searchableSurface/searchablePlane.C
@@ -46,7 +46,7 @@ Foam::pointIndexHit Foam::searchablePlane::findLine
const point& end
) const
{
- pointIndexHit info(true, vector::zero, 0);
+ pointIndexHit info(true, Zero, 0);
linePointRef l(start, end);
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index 166aef7752..aacb605b31 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -132,7 +132,7 @@ Foam::pointIndexHit Foam::searchablePlate::findLine
pointIndexHit info
(
true,
- vector::zero,
+ Zero,
0
);
@@ -424,7 +424,7 @@ void Foam::searchablePlate::getNormal
) const
{
normal.setSize(info.size());
- normal = vector::zero;
+ normal = Zero;
forAll(normal, i)
{
normal[i][normalDir_] = 1.0;
diff --git a/src/meshTools/searchableSurface/searchableSphere.C b/src/meshTools/searchableSurface/searchableSphere.C
index dbdc208e6b..d63749657b 100644
--- a/src/meshTools/searchableSurface/searchableSphere.C
+++ b/src/meshTools/searchableSurface/searchableSphere.C
@@ -326,7 +326,7 @@ void Foam::searchableSphere::getNormal
) const
{
normal.setSize(info.size());
- normal = vector::zero;
+ normal = Zero;
forAll(info, i)
{
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index d9d578c876..ce9d1addd3 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -47,7 +47,7 @@ Foam::Pair<Foam::vector> Foam::searchableSurfaceWithGaps::offsetVecs
const point& end
) const
{
- Pair<vector> offsets(vector::zero, vector::zero);
+ Pair<vector> offsets(Zero, Zero);
vector n(end-start);
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 9220198b5f..fd9914c725 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -862,7 +862,7 @@ Foam::pointIndexHit Foam::searchableSurfacesQueries::facesIntersection
// starting point onto the surfaces and the mid point
List<point> nearest(surfacesToTest.size()+1);
- point sumNearest = vector::zero;
+ point sumNearest = Zero;
forAll(surfacesToTest, i)
{
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 507e839c92..22b54df937 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -463,7 +463,7 @@ Foam::triSurfaceMesh::edgeTree() const
+ nInternalEdges()
);
- treeBoundBox bb(vector::zero, vector::zero);
+ treeBoundBox bb(Zero, Zero);
if (bEdges.size())
{
@@ -678,7 +678,7 @@ void Foam::triSurfaceMesh::getNormal
else
{
// Set to what?
- normal[i] = vector::zero;
+ normal[i] = Zero;
}
}
}
@@ -699,7 +699,7 @@ void Foam::triSurfaceMesh::getNormal
else
{
// Set to what?
- normal[i] = vector::zero;
+ normal[i] = Zero;
}
}
}
diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C
index 5c5f538876..e03a9f5c79 100644
--- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C
+++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -124,7 +124,7 @@ void Foam::regionToFace::combine(topoSet& set, const bool add) const
mappedPatchBase::nearInfo ni
(
- pointIndexHit(false, vector::zero, -1),
+ pointIndexHit(false, Zero, -1),
Tuple2<scalar, label>
(
sqr(GREAT),
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 1e60d1cd27..09ca7c7eee 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -943,7 +943,7 @@ Foam::booleanSurface::booleanSurface
const pointField& pts = combinedSurf.points();
label minFaceI = -1;
- pointHit minHit(false, vector::zero, GREAT, true);
+ pointHit minHit(false, Zero, GREAT, true);
forAll(combinedSurf, faceI)
{
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
index 1063a7f6b8..d3a16dd2bc 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -46,7 +46,7 @@ Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
}
else
{
- vector edgeNormal(vector::zero);
+ vector edgeNormal(Zero);
forAll(eFaces, i)
{
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
index 4a5cf4039b..fc4b61767a 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -121,7 +121,7 @@ Foam::triSurfaceRegionSearch::treeByRegion() const
);
// Calculate bb without constructing local point numbering.
- treeBoundBox bb(vector::zero, vector::zero);
+ treeBoundBox bb(Zero, Zero);
if (indirectRegionPatches_[regionI].size())
{
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index 15eb7dcf25..e747010075 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -200,7 +200,7 @@ Foam::triSurfaceSearch::tree() const
if (treePtr_.empty())
{
// Calculate bb without constructing local point numbering.
- treeBoundBox bb(vector::zero, vector::zero);
+ treeBoundBox bb(Zero, Zero);
if (surface().size())
{
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 029b28c5a9..47d20dcfc0 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2118,7 +2118,7 @@ Foam::vector Foam::triSurfaceTools::surfaceNormal
// Calculate edge normal by averaging face normals
const labelList& eFaces = surf.edgeFaces()[edgeI];
- vector edgeNormal(vector::zero);
+ vector edgeNormal(Zero);
forAll(eFaces, i)
{
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index 95b1701ea3..61689f137a 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -201,7 +201,7 @@ Foam::twoDPointCorrector::twoDPointCorrector(const polyMesh& mesh)
planeNormalPtr_(NULL),
normalEdgeIndicesPtr_(NULL),
isWedge_(false),
- wedgeAxis_(vector::zero),
+ wedgeAxis_(Zero),
wedgeAngle_(0.0)
{}
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 41c0f5f3db..f75de46e10 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -128,9 +128,9 @@ Foam::forceCoeffs::forceCoeffs
)
:
forces(name, obr, dict, loadFromFiles, false),
- liftDir_(vector::zero),
- dragDir_(vector::zero),
- pitchAxis_(vector::zero),
+ liftDir_(Zero),
+ dragDir_(Zero),
+ pitchAxis_(Zero),
magUInf_(0.0),
lRef_(0.0),
Aref_(0.0)
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 75ebd61f32..b55eeab66c 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -543,7 +543,7 @@ Foam::forces::forces
localSystem_(false),
porosity_(false),
nBin_(1),
- binDir_(vector::zero),
+ binDir_(Zero),
binDx_(0.0),
binMin_(GREAT),
binPoints_(),
@@ -602,7 +602,7 @@ Foam::forces::forces
localSystem_(false),
porosity_(false),
nBin_(1),
- binDir_(vector::zero),
+ binDir_(Zero),
binDx_(0.0),
binMin_(GREAT),
binPoints_(),
@@ -807,13 +807,13 @@ void Foam::forces::calcForcesMoment()
return;
}
- force_[0] = vector::zero;
- force_[1] = vector::zero;
- force_[2] = vector::zero;
+ force_[0] = Zero;
+ force_[1] = Zero;
+ force_[2] = Zero;
- moment_[0] = vector::zero;
- moment_[1] = vector::zero;
- moment_[2] = vector::zero;
+ moment_[0] = Zero;
+ moment_[1] = Zero;
+ moment_[2] = Zero;
if (directForceDensity_)
{
@@ -848,7 +848,7 @@ void Foam::forces::calcForcesMoment()
vectorField fT(sA*fD.boundaryField()[patchI] - fN);
//- Porous force
- vectorField fP(Md.size(), vector::zero);
+ vectorField fP(Md.size(), Zero);
applyBins(Md, fN, fT, fP, mesh.C().boundaryField()[patchI]);
}
@@ -886,7 +886,7 @@ void Foam::forces::calcForcesMoment()
vectorField fT(Sfb[patchI] & devRhoReffb[patchI]);
- vectorField fP(Md.size(), vector::zero);
+ vectorField fP(Md.size(), Zero);
applyBins(Md, fN, fT, fP, mesh.C().boundaryField()[patchI]);
}
@@ -929,7 +929,7 @@ void Foam::forces::calcForcesMoment()
const vectorField fP(fPTot, cZone);
const vectorField Md(d - coordSys_.origin());
- const vectorField fDummy(Md.size(), vector::zero);
+ const vectorField fDummy(Md.size(), Zero);
applyBins(Md, fDummy, fDummy, fP, d);
}
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
index 3dd1877a87..84a50de5f8 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
@@ -197,7 +197,7 @@ Foam::pressureTools::pressureTools
pRef_(0.0),
calcCoeff_(false),
pInf_(0.0),
- UInf_(vector::zero),
+ UInf_(Zero),
rhoInf_(0.0)
{
// Check if the available mesh is an fvMesh, otherwise deactivate
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
index 5fb24ce1f7..6d22f5a977 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -80,7 +80,7 @@ Foam::vorticity::vorticity
IOobject::NO_WRITE
),
mesh,
- dimensionedVector("0", dimless/dimTime, vector::zero)
+ dimensionedVector("0", dimless/dimTime, Zero)
)
);
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
index 7f86ed6944..b8a7bf66d2 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -136,7 +136,7 @@ Foam::wallShearStress::wallShearStress
(
"0",
sqr(dimLength)/sqr(dimTime),
- vector::zero
+ Zero
)
)
);
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index ba750c9f76..62a6dba740 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -217,7 +217,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
oldCf[i + 1] = regionMesh().faceCentres()[faces[i]];
}
- vector newDelta = vector::zero;
+ vector newDelta = Zero;
point nbrCf = oldCf[0];
forAll(faces, i)
@@ -229,7 +229,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
newDelta += (deltaV[cellI]/mag(sf))*n;
- vector localDelta = vector::zero;
+ vector localDelta = Zero;
forAll(f, pti)
{
const label pointI = f[pti];
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index aba31e75dd..11350225c3 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ void Foam::regionModels::singleLayerRegion::constructMeshObjects()
NO_WRITE
),
regionMesh(),
- dimensionedVector("zero", dimless, vector::zero),
+ dimensionedVector("zero", dimless, Zero),
zeroGradientFvPatchField<vector>::typeName
)
);
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index ae5357b185..bf49d5b168 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -88,7 +88,7 @@ void kinematicSingleLayer::resetPrimaryRegionSourceTerms()
}
rhoSpPrimary_ == dimensionedScalar("zero", rhoSp_.dimensions(), 0.0);
- USpPrimary_ == dimensionedVector("zero", USp_.dimensions(), vector::zero);
+ USpPrimary_ == dimensionedVector("zero", USp_.dimensions(), Zero);
pSpPrimary_ == dimensionedScalar("zero", pSp_.dimensions(), 0.0);
}
@@ -644,7 +644,7 @@ kinematicSingleLayer::kinematicSingleLayer
regionMesh(),
dimensionedVector
(
- "zero", dimMass*dimVelocity/dimArea/dimTime, vector::zero
+ "zero", dimMass*dimVelocity/dimArea/dimTime, Zero
),
this->mappedPushedFieldPatchTypes<vector>()
),
@@ -688,7 +688,7 @@ kinematicSingleLayer::kinematicSingleLayer
IOobject::NO_WRITE
),
primaryMesh(),
- dimensionedVector("zero", USp_.dimensions(), vector::zero)
+ dimensionedVector("zero", USp_.dimensions(), Zero)
),
pSpPrimary_
(
@@ -728,7 +728,7 @@ kinematicSingleLayer::kinematicSingleLayer
IOobject::NO_WRITE
),
regionMesh(),
- dimensionedVector("zero", dimVelocity, vector::zero),
+ dimensionedVector("zero", dimVelocity, Zero),
this->mappedFieldAndInternalPatchTypes<vector>()
),
pPrimary_
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index 4a1c6383e8..fea9663477 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -83,7 +83,7 @@ tmp<volVectorField> laminar::Us() const
IOobject::NO_WRITE
),
owner_.regionMesh(),
- dimensionedVector("zero", dimVelocity, vector::zero),
+ dimensionedVector("zero", dimVelocity, Zero),
extrapolatedCalculatedFvPatchVectorField::typeName
)
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
index c8d111579e..d560d810c3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
@@ -149,7 +149,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
IOobject::NO_WRITE
),
owner_.regionMesh(),
- dimensionedVector("zero", dimForce/dimArea, vector::zero)
+ dimensionedVector("zero", dimForce/dimArea, Zero)
)
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 72ec8a44ba..0fd83cea97 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -229,7 +229,7 @@ curvatureSeparation::curvatureSeparation
deltaByR1Min_(coeffDict_.lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
definedPatchRadii_(),
magG_(mag(owner.g().value())),
- gHat_(vector::zero)
+ gHat_(Zero)
{
if (magG_ < ROOTVSMALL)
{
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index a2fa567a5b..a770c7ced9 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -221,7 +221,7 @@ void Foam::rigidBodyMeshMotion::solve()
curTimeIndex_ = this->db().time().timeIndex();
}
- dimensionedVector g("g", dimAcceleration, vector::zero);
+ dimensionedVector g("g", dimAcceleration, Zero);
if (db().foundObject<uniformDimensionedVectorField>("g"))
{
diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
index cdf9384be6..c4e4773376 100644
--- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
+++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -169,7 +169,7 @@ Foam::point Foam::triSurfaceMeshPointSet::getRefPoint(const List<point>& pts)
}
else
{
- return vector::zero;
+ return Zero;
}
}
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index bff64af5cf..e698b3c8c9 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -470,7 +470,7 @@ void Foam::isoSurface::calcCutTypes
// Caculate centre of surface.
Foam::point Foam::isoSurface::calcCentre(const triSurface& s)
{
- vector sum = vector::zero;
+ vector sum = Zero;
forAll(s, i)
{
@@ -510,7 +510,7 @@ void Foam::isoSurface::calcSnappedCc
localTriPoints.clear();
label nOther = 0;
- point otherPointSum = vector::zero;
+ point otherPointSum = Zero;
// Create points for all intersections close to cell centre
// (i.e. from pyramid edges)
@@ -696,7 +696,7 @@ void Foam::isoSurface::calcSnappedPoint
localTriPoints.clear();
label nOther = 0;
- point otherPointSum = vector::zero;
+ point otherPointSum = Zero;
forAll(pFaces, pFaceI)
{
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index afd756ac3c..e4b03e09fa 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -250,7 +250,7 @@ Foam::labelPair Foam::isoSurfaceCell::findCommonPoints
Foam::point Foam::isoSurfaceCell::calcCentre(const triSurface& s)
{
- vector sum = vector::zero;
+ vector sum = Zero;
forAll(s, i)
{
@@ -267,7 +267,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
DynamicList<labelledTri, 64>& localTris
) const
{
- pointIndexHit info(false, vector::zero, localTris.size());
+ pointIndexHit info(false, Zero, localTris.size());
if (localTris.size() == 1)
{
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index b69b8065be..0595948e73 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,7 +52,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
rhoInf_(1.0),
rhoName_("rho"),
lookupGravity_(-1),
- g_(vector::zero),
+ g_(Zero),
curTimeIndex_(-1)
{}
@@ -70,7 +70,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
rhoInf_(1.0),
rhoName_(dict.lookupOrDefault<word>("rhoName", "rho")),
lookupGravity_(-1),
- g_(vector::zero),
+ g_(Zero),
curTimeIndex_(-1)
{
if (rhoName_ == "rhoInf")
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index d567e3e04a..98d1fc871b 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -160,7 +160,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
firstIter = true;
}
- vector gravity = vector::zero;
+ vector gravity = Zero;
if (db().foundObject<uniformDimensionedVectorField>("g"))
{
@@ -175,7 +175,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
(
firstIter,
gravity*motion_.mass(),
- vector::zero,
+ Zero,
t.deltaTValue(),
t.deltaT0Value()
);
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
index 90b162078f..c3a0cb965b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -82,7 +82,7 @@ constrainRotation
pointConstraint& pc
) const
{
- pc.combine(pointConstraint(Tuple2<label, vector>(3, vector::zero)));
+ pc.combine(pointConstraint(Tuple2<label, vector>(3, Zero)));
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
index 56e79b30f5..32021c0747 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ void Foam::sixDoFRigidBodyMotionConstraints::point::constrainTranslation
pointConstraint& pc
) const
{
- pc.combine(pointConstraint(Tuple2<label, vector>(3, vector::zero)));
+ pc.combine(pointConstraint(Tuple2<label, vector>(3, Zero)));
}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
index 7f0d8ddb01..2237bf6963 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -120,13 +120,13 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
}
else
{
- a = vector::zero;
+ a = Zero;
}
// Damping of along axis angular velocity only
restraintMoment = -stiffness_*theta*a - damping_*(motion.omega() & a)*a;
- restraintForce = vector::zero;
+ restraintForce = Zero;
// Not needed to be altered as restraintForce is zero, but set to
// centreOfRotation to be sure of no spurious moment
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
index 3ce4308d9f..5d70d4db11 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -77,7 +77,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::restrain
) const
{
restraintForce = -coeff_*motion.v();
- restraintMoment = vector::zero;
+ restraintMoment = Zero;
if (motion.report())
{
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
index 754177bbd5..40b19b2006 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -91,7 +91,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::restrain
restraintForce = -stiffness_*(magR - restLength_)*r - damping_*(r & v)*r;
- restraintMoment = vector::zero;
+ restraintMoment = Zero;
if (motion.report())
{
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
index d372a67148..f073125666 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -79,7 +79,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::restrain
) const
{
restraintMoment = -coeff_*motion.omega();
- restraintForce = vector::zero;
+ restraintForce = Zero;
if (motion.report())
{
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
index 4ae6f217a4..aa012153ce 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -80,14 +80,14 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::restrain
vector& restraintMoment
) const
{
- restraintMoment = vector::zero;
+ restraintMoment = Zero;
for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
{
- vector axis = vector::zero;
+ vector axis = Zero;
axis[cmpt] = 1;
- vector refDir = vector::zero;
+ vector refDir = Zero;
refDir[(cmpt + 1) % 3] = 1;
vector newDir = motion.orientation() & refDir;
@@ -101,7 +101,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::restrain
restraintMoment += -damping_*motion.omega();
- restraintForce = vector::zero;
+ restraintForce = Zero;
// Not needed to be altered as restraintForce is zero, but set to
// centreOfRotation to be sure of no spurious moment
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index acaeea98fc..000ca2618f 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -127,7 +127,7 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
// Damping of along axis angular velocity only
restraintMoment = moment*axis_ - damping_*(motion.omega() & axis_)*axis_;
- restraintForce = vector::zero;
+ restraintForce = Zero;
// Not needed to be altered as restraintForce is zero, but set to
// centreOfRotation to be sure of no spurious moment
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 3cad6ca354..06774ef78b 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -46,13 +46,13 @@ void Foam::sixDoFRigidBodyMotion::applyRestraints()
}
// Restraint position
- point rP = vector::zero;
+ point rP = Zero;
// Restraint force
- vector rF = vector::zero;
+ vector rF = Zero;
// Restraint moment
- vector rM = vector::zero;
+ vector rM = Zero;
// Accumulate the restraints
restraints_[rI].restrain(*this, rP, rF, rM);
@@ -78,8 +78,8 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion()
constraints_(),
tConstraints_(tensor::I),
rConstraints_(tensor::I),
- initialCentreOfMass_(vector::zero),
- initialCentreOfRotation_(vector::zero),
+ initialCentreOfMass_(Zero),
+ initialCentreOfRotation_(Zero),
initialQ_(I),
mass_(VSMALL),
momentOfInertia_(diagTensor::one*VSMALL),
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
index 24eeda45d8..f6328c1057 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,12 +29,12 @@ License
Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState()
:
- centreOfRotation_(vector::zero),
+ centreOfRotation_(Zero),
Q_(I),
- v_(vector::zero),
- a_(vector::zero),
- pi_(vector::zero),
- tau_(vector::zero)
+ v_(Zero),
+ a_(Zero),
+ pi_(Zero),
+ tau_(Zero)
{}
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index 2ca63eb8f3..4bc236df58 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -187,7 +187,7 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
firstIter = true;
}
- dimensionedVector g("g", dimAcceleration, vector::zero);
+ dimensionedVector g("g", dimAcceleration, Zero);
if (db().foundObject<uniformDimensionedVectorField>("g"))
{
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 92f0ae3084..224d8f8743 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -108,8 +108,8 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
mesh_,
dimensionedScalar("Qem", dimMass/pow3(dimTime), 0.0)
),
- d_(vector::zero),
- dAve_(vector::zero),
+ d_(Zero),
+ dAve_(Zero),
theta_(theta),
phi_(phi),
omega_(0.0),
diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/triSurface/faceTriangulation/faceTriangulation.C
index 6b44c53065..c34dbb1ac5 100644
--- a/src/triSurface/faceTriangulation/faceTriangulation.C
+++ b/src/triSurface/faceTriangulation/faceTriangulation.C
@@ -218,7 +218,7 @@ void Foam::faceTriangulation::findDiagonal
label faceVertI = f.fcIndex(startIndex);
- pointHit minInter(false, vector::zero, GREAT, true);
+ pointHit minInter(false, Zero, GREAT, true);
label minIndex = -1;
scalar minPosOnEdge = GREAT;
--
GitLab