From f2ad503680f2446f6f97c3552b3824496a9c746a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Mar 2016 22:35:03 +0000
Subject: [PATCH] RectangularMatrix: Removed the identity function (now in
 SquareMatrix)

---
 .../RectangularMatrix/RectangularMatrix.H        |  5 -----
 .../RectangularMatrix/RectangularMatrixI.H       | 16 ----------------
 .../matrices/SquareMatrix/SquareMatrixI.H        |  4 ++--
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
index 84a831511..dd7b5bb8c 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H
@@ -40,7 +40,6 @@ SourceFiles
 
 #include "Matrix.H"
 #include "SquareMatrix.H"
-#include "Identity.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -79,10 +78,6 @@ public:
         //  initializing all elements to zero
         inline RectangularMatrix(const label m, const label n, const zero);
 
-        //- Construct given number of rows/columns
-        //  Initializing to the identity matrix
-        inline RectangularMatrix(const label n, const Identity<Type>);
-
         //- Construct with given number of rows and columns
         //  and value for all elements.
         inline RectangularMatrix(const label m, const label n, const Type&);
diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
index 1cb6e0c0c..e07888e25 100644
--- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
+++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H
@@ -77,22 +77,6 @@ inline Foam::RectangularMatrix<Type>::RectangularMatrix
 {}
 
 
-template<class Type>
-inline Foam::RectangularMatrix<Type>::RectangularMatrix
-(
-    const label n,
-    const Identity<Type>
-)
-:
-    Matrix<RectangularMatrix<Type>, Type>(n, n, Zero)
-{
-    for (label i=0; i<n; i++)
-    {
-        this->operator()(i, i) = I;
-    }
-}
-
-
 template<class Type>
 inline Foam::RectangularMatrix<Type>::RectangularMatrix
 (
diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
index 7dbc3bde2..12ecd2530 100644
--- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
+++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H
@@ -103,7 +103,7 @@ inline Foam::SquareMatrix<Type>::SquareMatrix
 {
     for (label i=0; i<n; i++)
     {
-        this->operator()(i, i) = I;
+        this->operator()(i, i) = Type(I);
     }
 }
 
@@ -176,7 +176,7 @@ void Foam::SquareMatrix<Type>::operator=(const Identity<Type>)
     Matrix<SquareMatrix<Type>, Type>::operator=(Zero);
     for (label i=0; i<this->n(); i++)
     {
-        this->operator()(i, i) = I;
+        this->operator()(i, i) = Type(I);
     }
 }