From e7ef7ed4e6f0fbdc5adb4f831ca747d09bd70585 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 17 Apr 2016 21:02:57 +0100 Subject: [PATCH] src/OpenFOAM/primitives: inherit operator=(const Foam::zero) from base class where appropriate --- src/OpenFOAM/primitives/RowVector/RowVector.H | 5 ----- src/OpenFOAM/primitives/RowVector/RowVectorI.H | 9 --------- .../primitives/SphericalTensor/SphericalTensor.H | 6 ------ .../primitives/SphericalTensor/SphericalTensorI.H | 9 --------- .../primitives/SphericalTensor2D/SphericalTensor2D.H | 6 ------ .../primitives/SphericalTensor2D/SphericalTensor2DI.H | 9 --------- src/OpenFOAM/primitives/SymmTensor/SymmTensor.H | 6 +++--- src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H | 7 ------- src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H | 4 ++-- src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H | 7 ------- src/OpenFOAM/primitives/Tensor/Tensor.H | 6 +++--- src/OpenFOAM/primitives/Tensor/TensorI.H | 7 ------- src/OpenFOAM/primitives/Tensor2D/Tensor2D.H | 3 --- src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H | 11 +---------- src/OpenFOAM/primitives/Vector/Vector.H | 5 ----- src/OpenFOAM/primitives/Vector/VectorI.H | 9 --------- src/OpenFOAM/primitives/Vector2D/Vector2D.H | 6 ------ src/OpenFOAM/primitives/Vector2D/Vector2DI.H | 9 --------- .../CompactSpatialTensor/CompactSpatialTensor.H | 5 ----- .../CompactSpatialTensor/CompactSpatialTensorI.H | 9 --------- .../CompactSpatialTensorT/CompactSpatialTensorT.H | 5 ----- .../CompactSpatialTensorT/CompactSpatialTensorTI.H | 9 --------- .../SpatialTensor/SpatialTensor.H | 5 ----- .../SpatialTensor/SpatialTensorI.H | 9 --------- .../SpatialVector/SpatialVector.H | 2 -- .../SpatialVector/SpatialVectorI.H | 7 ------- 26 files changed, 9 insertions(+), 166 deletions(-) diff --git a/src/OpenFOAM/primitives/RowVector/RowVector.H b/src/OpenFOAM/primitives/RowVector/RowVector.H index f670241f66..f69b2aa252 100644 --- a/src/OpenFOAM/primitives/RowVector/RowVector.H +++ b/src/OpenFOAM/primitives/RowVector/RowVector.H @@ -94,11 +94,6 @@ public: inline Cmpt& x(); inline Cmpt& y(); inline Cmpt& z(); - - - // Member Operators - - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/RowVector/RowVectorI.H b/src/OpenFOAM/primitives/RowVector/RowVectorI.H index 2419ff2225..69c3b120e6 100644 --- a/src/OpenFOAM/primitives/RowVector/RowVectorI.H +++ b/src/OpenFOAM/primitives/RowVector/RowVectorI.H @@ -109,13 +109,4 @@ inline Cmpt& Foam::RowVector::z() } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::RowVector::operator=(const Foam::zero) -{ - RowVector::msType::operator=(Zero); -} - - // ************************************************************************* // diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H index 9c8b8a12a9..3f17389aae 100644 --- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H +++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H @@ -109,12 +109,6 @@ public: //- Transpose inline const SphericalTensor& T() const; - - - // Member Operators - - //- Assignment to zero - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H index cb4d7fda30..7d0ed79041 100644 --- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H +++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H @@ -88,15 +88,6 @@ Foam::SphericalTensor::T() const } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::SphericalTensor::operator=(const Foam::zero) -{ - SphericalTensor::vsType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H index 8db556c9cd..465dbb0e27 100644 --- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H +++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H @@ -100,12 +100,6 @@ public: inline const Cmpt& ii() const; inline Cmpt& ii(); - - - // Member Operators - - //- Assignment to zero - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H index 2147a736d2..e956abe1be 100644 --- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H +++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H @@ -79,15 +79,6 @@ inline Cmpt& Foam::SphericalTensor2D::ii() } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::SphericalTensor2D::operator=(const Foam::zero) -{ - SphericalTensor2D::vsType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H index 2ee9b74e9f..036f63e84e 100644 --- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H +++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H @@ -128,10 +128,10 @@ public: // Member Operators - //- Assignment to zero - inline void operator=(const Foam::zero); + //- Inherit VectorSpace assignment operators + using SymmTensor::vsType::operator=; - //- Construct given SphericalTensor + //- Assign to given SphericalTensor inline void operator=(const SphericalTensor&); }; diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H index 9b97a9dedc..b40f40859f 100644 --- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H +++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H @@ -175,13 +175,6 @@ inline void Foam::SymmTensor::operator=(const SphericalTensor& st) } -template -inline void Foam::SymmTensor::operator=(const Foam::zero) -{ - SymmTensor::vsType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H index ad733376ec..141f15f2d2 100644 --- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H +++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2D.H @@ -120,8 +120,8 @@ public: // Member Operators - //- Assignment to zero - inline void operator=(const Foam::zero); + //- Inherit VectorSpace assignment operators + using SymmTensor2D::vsType::operator=; //- Construct given SphericalTensor2D inline void operator=(const SphericalTensor2D&); diff --git a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H index d69b566a46..769fe9e6be 100644 --- a/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H +++ b/src/OpenFOAM/primitives/SymmTensor2D/SymmTensor2DI.H @@ -137,13 +137,6 @@ inline void Foam::SymmTensor2D::operator= } -template -inline void Foam::SymmTensor2D::operator=(const Foam::zero) -{ - SymmTensor2D::vsType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H index 42570c866e..3b9165f652 100644 --- a/src/OpenFOAM/primitives/Tensor/Tensor.H +++ b/src/OpenFOAM/primitives/Tensor/Tensor.H @@ -185,6 +185,9 @@ public: //- Inner-product with a Tensor inline void operator&=(const Tensor&); + //- Inherit MatrixSpace assignment operators + using Tensor::msType::operator=; + //- Assign to an equivalent vector space template inline void operator=(const VectorSpace, Cmpt2, 9>&); @@ -197,9 +200,6 @@ public: //- Assign to a triad inline void operator=(const Vector>&); - - //- Assignment to zero - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H index 116dc7d352..b9e68a3b0d 100644 --- a/src/OpenFOAM/primitives/Tensor/TensorI.H +++ b/src/OpenFOAM/primitives/Tensor/TensorI.H @@ -400,13 +400,6 @@ inline void Foam::Tensor::operator=(const Vector>& tr) } -template -inline void Foam::Tensor::operator=(const Foam::zero) -{ - Tensor::msType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H index 7ff02d3f9f..5ee3db5827 100644 --- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H +++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H @@ -145,9 +145,6 @@ public: //- Copy SphericalTensor2D inline void operator=(const SphericalTensor2D&); - - //- Assignment to zero - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H index f965993811..7f6be0d324 100644 --- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H +++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H @@ -170,7 +170,7 @@ inline Foam::Tensor2D Foam::Tensor2D::T() const } -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template inline void Foam::Tensor2D::operator=(const SymmTensor2D& st) @@ -188,15 +188,6 @@ inline void Foam::Tensor2D::operator=(const SphericalTensor2D& st) } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::Tensor2D::operator=(const Foam::zero) -{ - Tensor2D::msType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H index b442d8fff1..8929027e03 100644 --- a/src/OpenFOAM/primitives/Vector/Vector.H +++ b/src/OpenFOAM/primitives/Vector/Vector.H @@ -112,11 +112,6 @@ public: ( const Foam::List>& ) const; - - - // Member Operators - - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H index c6c52f2f43..518a398dc5 100644 --- a/src/OpenFOAM/primitives/Vector/VectorI.H +++ b/src/OpenFOAM/primitives/Vector/VectorI.H @@ -121,15 +121,6 @@ inline const Foam::Vector& Foam::Vector::centre } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::Vector::operator=(const Foam::zero) -{ - Vector::vsType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H index c30e8a47eb..58546c6933 100644 --- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H +++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H @@ -103,12 +103,6 @@ public: //- Perp dot product (dot product with perpendicular vector) inline scalar perp(const Vector2D& b) const; - - - // Member Operators - - //- Assignment to zero - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H index 36b70942b4..3148e7d0af 100644 --- a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H +++ b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H @@ -90,15 +90,6 @@ inline Cmpt& Foam::Vector2D::y() } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::Vector2D::operator=(const Foam::zero) -{ - Vector2D::vsType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H index 03e6dcc565..4f2e0bbd3d 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensor.H @@ -93,11 +93,6 @@ public: //- Construct from Istream inline CompactSpatialTensor(Istream&); - - - // Member Operators - - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H index 5b45979de9..742faf5716 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensor/CompactSpatialTensorI.H @@ -94,13 +94,4 @@ inline Foam::CompactSpatialTensor::CompactSpatialTensor(Istream& is) {} -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -inline void Foam::CompactSpatialTensor::operator=(const Foam::zero) -{ - CompactSpatialTensor::msType::operator=(Zero); -} - - // ************************************************************************* // diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H index 2ec83b589f..fbb1d6adf6 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorT.H @@ -92,11 +92,6 @@ public: //- Construct from Istream inline CompactSpatialTensorT(Istream&); - - - // Member Operators - - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H index 51a1a8bae8..284a3b3d0f 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/CompactSpatialTensorT/CompactSpatialTensorTI.H @@ -94,13 +94,4 @@ inline Foam::CompactSpatialTensorT::CompactSpatialTensorT(Istream& is) {} -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -inline void Foam::CompactSpatialTensorT::operator=(const Foam::zero) -{ - CompactSpatialTensorT::msType::operator=(Zero); -} - - // ************************************************************************* // diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H index 63e2d7e7b7..04d53b5979 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensor.H @@ -123,11 +123,6 @@ public: //- Construct from Istream inline SpatialTensor(Istream&); - - - // Member Operators - - inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H index d6712e8caa..16f6967a4a 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialTensor/SpatialTensorI.H @@ -133,15 +133,6 @@ inline Foam::SpatialTensor::SpatialTensor(Istream& is) {} -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -template -inline void Foam::SpatialTensor::operator=(const Foam::zero) -{ - SpatialTensor::msType::operator=(Zero); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H index ef48678f2a..c56a7e06d6 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVector.H @@ -151,8 +151,6 @@ public: // Member Operators - inline void operator=(const Foam::zero); - //- Return the dual spatial vector inline dual operator*() const; }; diff --git a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H index c4adce263f..8b23c7b5df 100644 --- a/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H +++ b/src/OpenFOAM/primitives/spatialVectorAlgebra/SpatialVector/SpatialVectorI.H @@ -205,13 +205,6 @@ const Foam::SpatialVector& Foam::SpatialVector::dual::v() const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::SpatialVector::operator=(const Foam::zero) -{ - SpatialVector::vsType::operator=(Zero); -} - - template inline typename Foam::SpatialVector::dual Foam::SpatialVector::operator*() const