From 860a82c0d49e6bd679f8f0d7f9817fc3223039b3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 15 Apr 2016 11:32:42 +0100
Subject: [PATCH] vector::zero -> Zero
---
.../dynamicIndexedOctree.C | 10 ++++----
.../algorithms/indexedOctree/indexedOctree.C | 10 ++++----
.../pointConstraint/pointConstraintI.H | 14 +++++------
.../CalcPatchToPatchWeights.C | 4 ++--
src/OpenFOAM/meshes/boundBox/boundBox.C | 16 ++++++-------
src/OpenFOAM/meshes/boundBox/boundBoxI.H | 6 ++---
.../meshes/boundBox/boundBoxTemplates.C | 6 ++---
src/OpenFOAM/meshes/meshShapes/cell/cell.C | 8 +++----
.../meshes/meshShapes/cellModel/cellModel.C | 8 +++----
src/OpenFOAM/meshes/meshShapes/face/face.C | 10 ++++----
.../meshes/meshShapes/face/faceTemplates.C | 2 +-
.../polyMesh/globalMeshData/globalMeshData.C | 2 +-
src/OpenFOAM/meshes/polyMesh/polyMesh.C | 24 +++++++++----------
src/OpenFOAM/meshes/polyMesh/polyMeshClear.C | 8 +++----
.../meshes/polyMesh/polyMeshFromShapeMesh.C | 8 +++----
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C | 8 +++----
src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C | 4 ++--
.../constraint/cyclic/cyclicPolyPatch.C | 14 +++++------
.../constraint/oldCyclic/oldCyclicPolyPatch.C | 12 +++++-----
.../constraint/processor/processorPolyPatch.C | 4 ++--
.../constraint/wedge/wedgePolyPatch.C | 10 ++++----
.../PatchTools/PatchToolsNormals.C | 8 +++----
.../primitiveMeshCellCentresAndVols.C | 6 ++---
.../primitiveMeshCheck/primitiveMeshCheck.C | 2 +-
.../primitiveMeshCheck/primitiveMeshTools.C | 6 ++---
.../primitiveMeshFaceCentresAndAreas.C | 8 +++----
.../primitiveShapes/objectHit/PointHit.H | 4 ++--
.../primitiveShapes/objectHit/PointIndexHit.H | 4 ++--
.../primitiveShapes/objectHit/pointHitSort.H | 4 ++--
.../meshes/primitiveShapes/plane/plane.C | 6 ++---
.../tetrahedron/tetrahedronI.H | 4 ++--
.../primitiveShapes/triangle/triangleI.H | 4 ++--
.../vectorTensorTransform.C | 6 ++---
.../vectorTensorTransformI.H | 6 ++---
.../primitives/quaternion/quaternion.C | 4 ++--
.../primitives/quaternion/quaternionI.H | 4 ++--
.../spatialTransform/spatialTransformI.H | 16 ++++++-------
src/OpenFOAM/primitives/triad/triadI.H | 4 ++--
38 files changed, 142 insertions(+), 142 deletions(-)
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 043ea1558d..20475acead 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -1677,7 +1677,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
if ((startBit & endBit) != 0)
{
// Both start and end outside domain and in same block.
- return pointIndexHit(false, vector::zero, -1);
+ return pointIndexHit(false, Zero, -1);
}
@@ -1691,7 +1691,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
// Track start to inside domain.
if (!treeBb.intersects(start, end, trackStart))
{
- return pointIndexHit(false, vector::zero, -1);
+ return pointIndexHit(false, Zero, -1);
}
}
@@ -1700,7 +1700,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
// Track end to inside domain.
if (!treeBb.intersects(end, trackStart, trackEnd))
{
- return pointIndexHit(false, vector::zero, -1);
+ return pointIndexHit(false, Zero, -1);
}
}
@@ -2129,7 +2129,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
{
scalar nearestDistSqr = startDistSqr;
label nearestShapeI = -1;
- point nearestPoint = vector::zero;
+ point nearestPoint = Zero;
if (nodes_.size())
{
@@ -2174,7 +2174,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
}
else
{
- nearestPoint = vector::zero;
+ nearestPoint = Zero;
}
return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 4d79eef695..2480f2dc75 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -1710,7 +1710,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
if ((startBit & endBit) != 0)
{
// Both start and end outside domain and in same block.
- return pointIndexHit(false, vector::zero, -1);
+ return pointIndexHit(false, Zero, -1);
}
@@ -1724,7 +1724,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
// Track start to inside domain.
if (!treeBb.intersects(start, end, trackStart))
{
- return pointIndexHit(false, vector::zero, -1);
+ return pointIndexHit(false, Zero, -1);
}
}
@@ -1733,7 +1733,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
// Track end to inside domain.
if (!treeBb.intersects(end, trackStart, trackEnd))
{
- return pointIndexHit(false, vector::zero, -1);
+ return pointIndexHit(false, Zero, -1);
}
}
@@ -2350,7 +2350,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
{
scalar nearestDistSqr = startDistSqr;
label nearestShapeI = -1;
- point nearestPoint = vector::zero;
+ point nearestPoint = Zero;
if (nodes_.size())
{
@@ -2401,7 +2401,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
) const
{
label nearestShapeI = -1;
- point nearestPoint = vector::zero;
+ point nearestPoint = Zero;
if (nodes_.size())
{
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H
index 82c1957c3b..27aa1debf4 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraintI.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
@@ -27,7 +27,7 @@ License
inline Foam::pointConstraint::pointConstraint()
:
- Tuple2<label, vector>(0, vector::zero)
+ Tuple2<label, vector>(0, Zero)
{}
@@ -68,7 +68,7 @@ void Foam::pointConstraint::applyConstraint(const vector& cd)
if (mag(cd & second()) > 1e-3)
{
first() = 3;
- second() = vector::zero;
+ second() = Zero;
}
}
}
@@ -103,13 +103,13 @@ void Foam::pointConstraint::combine(const pointConstraint& pc)
{
// Different directions
first() = 3;
- second() = vector::zero;
+ second() = Zero;
}
}
else
{
first() = 3;
- second() = vector::zero;
+ second() = Zero;
}
}
}
@@ -131,7 +131,7 @@ Foam::tensor Foam::pointConstraint::constraintTransformation() const
}
else
{
- return tensor::zero;
+ return Zero;
}
}
@@ -172,7 +172,7 @@ const
// Knock out remaining vectors
for (direction dir = n; dir < vecs.size(); dir++)
{
- vecs[dir] = vector::zero;
+ vecs[dir] = Zero;
}
tt = tensor(vecs[0], vecs[1], vecs[2]);
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index 6f9f1e8595..87c18a3127 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.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
@@ -80,7 +80,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
const typename FromPatch::FaceType& hitFace =
fromPatchFaces[proj[pointI].hitObject()];
- point hitPoint = point::zero;
+ point hitPoint = Zero;
if (proj[pointI].hit())
{
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C
index e75389a6f0..6c3ec8036f 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.C
@@ -51,8 +51,8 @@ void Foam::boundBox::calculate(const UList<point>& points, const bool doReduce)
{
if (points.empty())
{
- min_ = point::zero;
- max_ = point::zero;
+ min_ = Zero;
+ max_ = Zero;
if (doReduce && Pstream::parRun())
{
@@ -87,8 +87,8 @@ void Foam::boundBox::calculate(const UList<point>& points, const bool doReduce)
Foam::boundBox::boundBox(const UList<point>& points, const bool doReduce)
:
- min_(point::zero),
- max_(point::zero)
+ min_(Zero),
+ max_(Zero)
{
calculate(points, doReduce);
}
@@ -96,8 +96,8 @@ Foam::boundBox::boundBox(const UList<point>& points, const bool doReduce)
Foam::boundBox::boundBox(const tmp<pointField>& points, const bool doReduce)
:
- min_(point::zero),
- max_(point::zero)
+ min_(Zero),
+ max_(Zero)
{
calculate(points(), doReduce);
points.clear();
@@ -111,8 +111,8 @@ Foam::boundBox::boundBox
const bool doReduce
)
:
- min_(point::zero),
- max_(point::zero)
+ min_(Zero),
+ max_(Zero)
{
if (points.empty() || indices.empty())
{
diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxI.H b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
index 4c3fc06203..13af23e99c 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxI.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
@@ -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
@@ -31,8 +31,8 @@ License
inline Foam::boundBox::boundBox()
:
- min_(point::zero),
- max_(point::zero)
+ min_(Zero),
+ max_(Zero)
{}
diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C b/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C
index 68d62e7569..81aa3f267b 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxTemplates.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
@@ -38,8 +38,8 @@ Foam::boundBox::boundBox
const bool doReduce
)
:
- min_(point::zero),
- max_(point::zero)
+ min_(Zero),
+ max_(Zero)
{
// a FixedList is never empty
if (points.empty())
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 969b33784b..aa2e026141 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.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
@@ -192,7 +192,7 @@ Foam::point Foam::cell::centre
// first calculate the aproximate cell centre as the average of all
// face centres
- vector cEst = vector::zero;
+ vector cEst = Zero;
scalar sumArea = 0;
const labelList& faces = *this;
@@ -208,7 +208,7 @@ Foam::point Foam::cell::centre
// Calculate the centre by breaking the cell into pyramids and
// volume-weighted averaging their centres
- vector sumVc = vector::zero;
+ vector sumVc = Zero;
scalar sumV = 0;
@@ -251,7 +251,7 @@ Foam::scalar Foam::cell::mag
// first calculate the aproximate cell centre as the average of all
// face centres
- vector cEst = vector::zero;
+ vector cEst = Zero;
scalar nCellFaces = 0;
const labelList& faces = *this;
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
index a8c014b335..a25c393310 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.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
@@ -35,7 +35,7 @@ Foam::vector Foam::cellModel::centre
) const
{
// Estimate centre of cell
- vector cEst = vector::zero;
+ vector cEst = Zero;
// Sum the points idicated by the label list
forAll(pointLabels, i)
@@ -50,7 +50,7 @@ Foam::vector Foam::cellModel::centre
// Calculate the centre by breaking the cell into pyramids and
// volume-weighted averaging their centres
scalar sumV = 0.0;
- vector sumVc = vector::zero;
+ vector sumVc = Zero;
const faceList cellFaces = faces(pointLabels);
@@ -92,7 +92,7 @@ Foam::scalar Foam::cellModel::mag
) const
{
// Estimate centre of cell
- vector cEst = vector::zero;
+ vector cEst = Zero;
// Sum the points idicated by the label list
forAll(pointLabels, i)
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index d4bf604b5c..6c65137162 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -505,7 +505,7 @@ Foam::point Foam::face::centre(const pointField& points) const
}
- point centrePoint = point::zero;
+ point centrePoint = Zero;
for (label pI=0; pI<nPoints; ++pI)
{
centrePoint += points[operator[](pI)];
@@ -513,7 +513,7 @@ Foam::point Foam::face::centre(const pointField& points) const
centrePoint /= nPoints;
scalar sumA = 0;
- vector sumAc = vector::zero;
+ vector sumAc = Zero;
for (label pI=0; pI<nPoints; ++pI)
{
@@ -572,14 +572,14 @@ Foam::vector Foam::face::normal(const pointField& p) const
label pI;
- point centrePoint = vector::zero;
+ point centrePoint = Zero;
for (pI = 0; pI < nPoints; ++pI)
{
centrePoint += p[operator[](pI)];
}
centrePoint /= nPoints;
- vector n = vector::zero;
+ vector n = Zero;
point nextPoint = centrePoint;
@@ -742,7 +742,7 @@ Foam::tensor Foam::face::inertia
const point ctr = centre(p);
- tensor J = tensor::zero;
+ tensor J = Zero;
forAll(*this, i)
{
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
index 33d1f97b78..6220d253cd 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
@@ -70,7 +70,7 @@ Type Foam::face::average
label nPoints = size();
- point centrePoint = point::zero;
+ point centrePoint = Zero;
Type cf = Zero;
for (label pI=0; pI<nPoints; pI++)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 26e369cff8..5a25df9d61 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1917,7 +1917,7 @@ Foam::pointField Foam::globalMeshData::sharedPoints() const
(
Pstream::blocking,
slave,
- sharedPoints.size()*sizeof(vector::zero)
+ sharedPoints.size()*sizeof(Zero)
);
toSlave << sharedPoints;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 6af1eb9be2..4aa8f63a39 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -62,8 +62,8 @@ void Foam::polyMesh::calcDirections() const
label nEmptyPatches = 0;
label nWedgePatches = 0;
- vector emptyDirVec = vector::zero;
- vector wedgeDirVec = vector::zero;
+ vector emptyDirVec = Zero;
+ vector wedgeDirVec = Zero;
forAll(boundaryMesh(), patchi)
{
@@ -205,8 +205,8 @@ Foam::polyMesh::polyMesh(const IOobject& io)
),
bounds_(points_),
comm_(UPstream::worldComm),
- geometricD_(Vector<label>::zero),
- solutionD_(Vector<label>::zero),
+ geometricD_(Zero),
+ solutionD_(Zero),
tetBasePtIsPtr_(NULL),
cellTreePtr_(NULL),
pointZones_
@@ -399,8 +399,8 @@ Foam::polyMesh::polyMesh
),
bounds_(points_, syncPar),
comm_(UPstream::worldComm),
- geometricD_(Vector<label>::zero),
- solutionD_(Vector<label>::zero),
+ geometricD_(Zero),
+ solutionD_(Zero),
tetBasePtIsPtr_(NULL),
cellTreePtr_(NULL),
pointZones_
@@ -550,8 +550,8 @@ Foam::polyMesh::polyMesh
),
bounds_(points_, syncPar),
comm_(UPstream::worldComm),
- geometricD_(Vector<label>::zero),
- solutionD_(Vector<label>::zero),
+ geometricD_(Zero),
+ solutionD_(Zero),
tetBasePtIsPtr_(NULL),
cellTreePtr_(NULL),
pointZones_
@@ -888,8 +888,8 @@ void Foam::polyMesh::addPatches
}
// Reset valid directions
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
boundary_.setSize(p.size());
@@ -1110,8 +1110,8 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
cellZones_.movePoints(points_);
// Reset valid directions (could change with rotation)
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
meshObject::movePoints<polyMesh>(*this);
meshObject::movePoints<pointMesh>(*this);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index 4cea2cb388..fa1bdc8bdd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -66,8 +66,8 @@ void Foam::polyMesh::clearGeom()
boundary_.clearGeom();
// Reset valid directions (could change with rotation)
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
// Remove the stored tet base points
tetBasePtIsPtr_.clear();
@@ -134,8 +134,8 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
globalMeshDataPtr_.clear();
// Reset valid directions
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
// Update zones
pointZones_.clearAddressing();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 143dfa79af..d0461b67a9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -473,8 +473,8 @@ Foam::polyMesh::polyMesh
),
bounds_(points_, syncPar),
comm_(UPstream::worldComm),
- geometricD_(Vector<label>::zero),
- solutionD_(Vector<label>::zero),
+ geometricD_(Zero),
+ solutionD_(Zero),
tetBasePtIsPtr_(NULL),
cellTreePtr_(NULL),
pointZones_
@@ -757,8 +757,8 @@ Foam::polyMesh::polyMesh
),
bounds_(points_, syncPar),
comm_(UPstream::worldComm),
- geometricD_(Vector<label>::zero),
- solutionD_(Vector<label>::zero),
+ geometricD_(Zero),
+ solutionD_(Zero),
tetBasePtIsPtr_(NULL),
cellTreePtr_(NULL),
pointZones_
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 9ddd2d8394..d67eeeceb8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -268,8 +268,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Derived info
bounds_ = boundBox(points_);
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
// Zones
pointZoneMesh newPointZones
@@ -442,8 +442,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
bounds_ = boundBox(points_);
// Rotation can cause direction vector to change
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
return polyMesh::POINTS_MOVED;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 004cee98d8..6e13ab57ee 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -95,8 +95,8 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
meshObject::updateMesh<pointMesh>(*this, mpm);
// Reset valid directions (could change by faces put into empty patches)
- geometricD_ = Vector<label>::zero;
- solutionD_ = Vector<label>::zero;
+ geometricD_ = Zero;
+ solutionD_ = Zero;
const_cast<Time&>(time()).functionObjects().updateMesh(mpm);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 55a56ea38f..f9a789efc2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.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
@@ -607,9 +607,9 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
coupledPolyPatch(name, size, start, index, bm, patchType, transform),
neighbPatchName_(word::null),
neighbPatchID_(-1),
- rotationAxis_(vector::zero),
- rotationCentre_(point::zero),
- separationVector_(vector::zero),
+ rotationAxis_(Zero),
+ rotationCentre_(Zero),
+ separationVector_(Zero),
coupledPointsPtr_(NULL),
coupledEdgesPtr_(NULL)
{
@@ -659,9 +659,9 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
neighbPatchName_(dict.lookupOrDefault("neighbourPatch", word::null)),
coupleGroup_(dict),
neighbPatchID_(-1),
- rotationAxis_(vector::zero),
- rotationCentre_(point::zero),
- separationVector_(vector::zero),
+ rotationAxis_(Zero),
+ rotationCentre_(Zero),
+ separationVector_(Zero),
coupledPointsPtr_(NULL),
coupledEdgesPtr_(NULL)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index 96b06851ce..0f75909ee6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -571,9 +571,9 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
:
coupledPolyPatch(name, size, start, index, bm, patchType, transform),
featureCos_(0.9),
- rotationAxis_(vector::zero),
- rotationCentre_(point::zero),
- separationVector_(vector::zero)
+ rotationAxis_(Zero),
+ rotationCentre_(Zero),
+ separationVector_(Zero)
{}
@@ -588,9 +588,9 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
:
coupledPolyPatch(name, dict, index, bm, patchType),
featureCos_(0.9),
- rotationAxis_(vector::zero),
- rotationCentre_(point::zero),
- separationVector_(vector::zero)
+ rotationAxis_(Zero),
+ rotationCentre_(Zero),
+ separationVector_(Zero)
{
if (dict.found("neighbourPatch"))
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 8ab5848a55..8d039e2aa0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -589,7 +589,7 @@ void Foam::processorPolyPatch::initOrder
// Get the average of the points of each face. This is needed in
// case the face centroid calculation is incorrect due to the face
// having a very high aspect ratio.
- pointField facePointAverages(pp.size(), point::zero);
+ pointField facePointAverages(pp.size(), Zero);
forAll(pp, fI)
{
const labelList& facePoints = pp[fI];
@@ -949,7 +949,7 @@ bool Foam::processorPolyPatch::order
{
const pointField& ppPoints = pp.points();
- pointField facePointAverages(pp.size(), point::zero);
+ pointField facePointAverages(pp.size(), Zero);
forAll(pp, fI)
{
const labelList& facePoints = pp[fI];
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index e8fd99e786..5cb0d9c7d8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.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
@@ -143,8 +143,8 @@ Foam::wedgePolyPatch::wedgePolyPatch
centreNormal_(vector::rootMax),
n_(vector::rootMax),
cosAngle_(0.0),
- faceT_(tensor::zero),
- cellT_(tensor::zero)
+ faceT_(Zero),
+ cellT_(Zero)
{}
@@ -162,8 +162,8 @@ Foam::wedgePolyPatch::wedgePolyPatch
centreNormal_(vector::rootMax),
n_(vector::rootMax),
cosAngle_(0.0),
- faceT_(tensor::zero),
- cellT_(tensor::zero)
+ faceT_(Zero),
+ cellT_(Zero)
{}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
index 34be2afdca..a72c330842 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C
@@ -59,7 +59,7 @@ Foam::PatchTools::pointNormals
// patch points since the master point does not have to be on the
// patch!
- pointField coupledPointNormals(map.constructSize(), vector::zero);
+ pointField coupledPointNormals(map.constructSize(), Zero);
{
// Collect local pointFaces (sized on patch points only)
@@ -158,7 +158,7 @@ Foam::PatchTools::pointNormals
// 1. Start off with local normals (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.ref();
{
const faceList& localFaces = p.localFaces();
@@ -212,7 +212,7 @@ Foam::PatchTools::edgeNormals
{
// 1. Start off with local normals
- tmp<pointField> tedgeNormals(new pointField(p.nEdges(), vector::zero));
+ tmp<pointField> tedgeNormals(new pointField(p.nEdges(), Zero));
pointField& edgeNormals = tedgeNormals.ref();
{
const labelListList& edgeFaces = p.edgeFaces();
@@ -239,7 +239,7 @@ Foam::PatchTools::edgeNormals
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//- Construct with all data in consistent orientation
- pointField cppEdgeData(map.constructSize(), vector::zero);
+ pointField cppEdgeData(map.constructSize(), Zero);
forAll(patchEdges, i)
{
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 458336db20..fec99b0e52 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.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
@@ -78,7 +78,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
) const
{
// Clear the fields for accumulation
- cellCtrs = vector::zero;
+ cellCtrs = Zero;
cellVols = 0.0;
const labelList& own = faceOwner();
@@ -87,7 +87,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
// first estimate the approximate cell centre as the average of
// face centres
- vectorField cEst(nCells(), vector::zero);
+ vectorField cEst(nCells(), Zero);
labelField nCellFaces(nCells(), 0);
forAll(own, facei)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index a25bf4da61..87a473b610 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -58,7 +58,7 @@ bool Foam::primitiveMesh::checkClosedBoundary
// Loop through all boundary faces and sum up the face area vectors.
// For a closed boundary, this should be zero in all vector components
- vector sumClosed(vector::zero);
+ vector sumClosed(Zero);
scalar sumMagClosedBoundary = 0;
for (label faceI = nInternalFaces(); faceI < areas.size(); faceI++)
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
index 6f8b8b83f4..1be204c191 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.C
@@ -254,8 +254,8 @@ void Foam::primitiveMeshTools::cellClosedness
// Loop through cell faces and sum up the face area vectors for each cell.
// This should be zero in all vector components
- vectorField sumClosed(mesh.nCells(), vector::zero);
- vectorField sumMagClosed(mesh.nCells(), vector::zero);
+ vectorField sumClosed(mesh.nCells(), Zero);
+ vectorField sumMagClosed(mesh.nCells(), Zero);
forAll(own, faceI)
{
@@ -511,7 +511,7 @@ Foam::tmp<Foam::scalarField> Foam::primitiveMeshTools::cellDeterminant
{
avgArea /= nInternalFaces;
- symmTensor areaTensor(symmTensor::zero);
+ symmTensor areaTensor(Zero);
forAll(curFaces, i)
{
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 236b1e30ee..f6c29aae8c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.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
@@ -93,9 +93,9 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
}
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++)
@@ -123,7 +123,7 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
if (sumA < ROOTVSMALL)
{
fCtrs[facei] = fCentre;
- fAreas[facei] = vector::zero;
+ fAreas[facei] = Zero;
}
else
{
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
index e6196b9d37..1c55ad2d05 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.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
@@ -85,7 +85,7 @@ public:
PointHit()
:
hit_(false),
- hitPoint_(vector::zero),
+ hitPoint_(Zero),
distance_(GREAT),
eligibleMiss_(false)
{}
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
index fa15dbfd42..13118adb01 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.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
@@ -89,7 +89,7 @@ public:
PointIndexHit()
:
hit_(false),
- hitPoint_(vector::zero),
+ hitPoint_(Zero),
index_(-1)
{}
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
index 97eea8bc7c..ab981bd022 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.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
@@ -65,7 +65,7 @@ public:
//- Construct null
pointHitSort()
:
- inter_(false, vector::zero, GREAT, false),
+ inter_(false, Zero, GREAT, false),
index_(-1)
{}
diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
index aa101235d5..482142bb2a 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
@@ -112,7 +112,7 @@ void Foam::plane::calcPntAndVec
Foam::plane::plane(const vector& normalVector)
:
unitVector_(normalVector),
- basePoint_(vector::zero)
+ basePoint_(Zero)
{
scalar magUnitVector(mag(unitVector_));
@@ -168,8 +168,8 @@ Foam::plane::plane
Foam::plane::plane(const dictionary& dict)
:
- unitVector_(vector::zero),
- basePoint_(point::zero)
+ unitVector_(Zero),
+ basePoint_(Zero)
{
const word planeType(dict.lookup("planeType"));
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index a5e6864c7c..10db7e8d96 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.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
@@ -470,7 +470,7 @@ bool Foam::tetrahedron<Point, PointRef>::inside(const point& pt) const
// planeBase[2] = tetBasePt = b_
// planeBase[3] = tetBasePt = b_
- vector n = vector::zero;
+ vector n = Zero;
{
// 0, a
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index fbc5a14286..96d3cffb84 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.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
@@ -439,7 +439,7 @@ inline Foam::pointHit Foam::triangle<Point, PointRef>::intersection
const scalar det = edge1 & pVec;
// Initialise to miss
- pointHit intersection(false, vector::zero, GREAT, false);
+ pointHit intersection(false, Zero, GREAT, false);
if (alg == intersection::VISIBLE)
{
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
index 9f06005074..b0b7df27ef 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
@@ -34,15 +34,15 @@ const char* const Foam::vectorTensorTransform::typeName =
const Foam::vectorTensorTransform Foam::vectorTensorTransform::zero
(
- vector::zero,
- tensor::zero,
+ Zero,
+ Zero,
false
);
const Foam::vectorTensorTransform Foam::vectorTensorTransform::I
(
- vector::zero,
+ Zero,
sphericalTensor::I,
false
);
diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
index 74d8c5755e..2290352d7a 100644
--- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
+++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.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
@@ -27,7 +27,7 @@ License
inline Foam::vectorTensorTransform::vectorTensorTransform()
:
- t_(vector::zero),
+ t_(Zero),
R_(sphericalTensor::I),
hasR_(false)
{}
@@ -56,7 +56,7 @@ inline Foam::vectorTensorTransform::vectorTensorTransform(const vector& t)
inline Foam::vectorTensorTransform::vectorTensorTransform(const tensor& R)
:
- t_(vector::zero),
+ t_(Zero),
R_(R),
hasR_(true)
{}
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C
index df54f702cd..e2bb676d8f 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.C
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.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
@@ -75,7 +75,7 @@ Foam::quaternion Foam::exp(const quaternion& q)
if (magV == 0)
{
- return quaternion(1, vector::zero);
+ return quaternion(1, Zero);
}
const scalar expW = exp(q.w());
diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index f2e6761576..b64fc8f26b 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -67,7 +67,7 @@ inline Foam::quaternion::quaternion
inline Foam::quaternion::quaternion(const scalar w)
:
w_(w),
- v_(vector::zero)
+ v_(Zero)
{}
@@ -515,7 +515,7 @@ inline Foam::vector Foam::quaternion::eulerAngles
default:
FatalErrorInFunction
<< "Unknown rotation sequence " << rs << abort(FatalError);
- return vector::zero;
+ return Zero;
break;
}
}
diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
index ab1dcaaec9..4ab3f7e512 100644
--- a/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
+++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/spatialTransform/spatialTransformI.H
@@ -38,7 +38,7 @@ Foam::tensor Foam::spatialTransform::Erx() const
inline Foam::spatialTransform::spatialTransform()
:
E_(tensor::I),
- r_(vector::zero)
+ r_(Zero)
{}
@@ -119,7 +119,7 @@ inline Foam::spatialTransform::operator spatialTensor() const
{
return spatialTensor
(
- E_, tensor::zero,
+ E_, Zero,
-Erx(), E_
);
}
@@ -181,7 +181,7 @@ inline Foam::spatialTransform::transpose::operator spatialTensor() const
return spatialTensor
(
X_.E().T(), -X_.Erx().T(),
- tensor::zero, X_.E().T()
+ Zero, X_.E().T()
);
}
@@ -206,7 +206,7 @@ inline Foam::spatialTransform::dual::operator spatialTensor() const
return spatialTensor
(
X_.E(), -X_.Erx(),
- tensor::zero, X_.E()
+ Zero, X_.E()
);
}
@@ -254,25 +254,25 @@ namespace Foam
//- Rotational spatial transformation tensor about the x-axis by omega radians
inline spatialTransform Xrx(const scalar& omega)
{
- return spatialTransform(Rx(omega), vector::zero);
+ return spatialTransform(Rx(omega), Zero);
}
//- Rotational spatial transformation tensor about the x-axis by omega radians
inline spatialTransform Xry(const scalar& omega)
{
- return spatialTransform(Ry(omega), vector::zero);
+ return spatialTransform(Ry(omega), Zero);
}
//- Rotational spatial transformation tensor about the z-axis by omega radians
inline spatialTransform Xrz(const scalar& omega)
{
- return spatialTransform(Rz(omega), vector::zero);
+ return spatialTransform(Rz(omega), Zero);
}
//- Rotational spatial transformation tensor about axis a by omega radians
inline spatialTransform Xr(const vector& a, const scalar omega)
{
- return spatialTransform(Ra(a, omega), vector::zero);
+ return spatialTransform(Ra(a, omega), Zero);
}
//- Translational spatial transformation tensor for translation r
diff --git a/src/OpenFOAM/primitives/triad/triadI.H b/src/OpenFOAM/primitives/triad/triadI.H
index 2025dd6dd7..d259258178 100644
--- a/src/OpenFOAM/primitives/triad/triadI.H
+++ b/src/OpenFOAM/primitives/triad/triadI.H
@@ -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
@@ -60,7 +60,7 @@ inline Foam::triad::triad(Istream& is)
inline bool Foam::triad::set(const direction d) const
{
- return operator[](d)[0] < GREAT; // vector::zero;
+ return operator[](d)[0] < GREAT;
}
--
GitLab