ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/math/SquareMatrix.hpp
(Generate patch)

Comparing branches/development/src/math/SquareMatrix.hpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC

# Line 133 | Line 133 | namespace OpenMD {
133        for (unsigned int i = 0; i < Dim ; i++)
134          tmp += this->data_[i][i];
135  
136 +      return tmp;
137 +    }
138 +    
139 +    /**
140 +     * Returns the tensor contraction (double dot product) of two rank 2
141 +     * tensors (or Matrices)
142 +     * @param t1 first tensor
143 +     * @param t2 second tensor
144 +     * @return the tensor contraction (double dot product) of t1 and t2
145 +     */
146 +    Real doubleDot( const SquareMatrix<Real, Dim>& t1, const SquareMatrix<Real, Dim>& t2 ) {
147 +      Real tmp;
148 +      tmp = 0;
149 +      
150 +      for (unsigned int i = 0; i < Dim; i++)
151 +        for (unsigned int j =0; j < Dim; j++)
152 +          tmp += t1[i][j] * t2[i][j];
153 +      
154        return tmp;
155      }
156  
157 +
158      /** Tests if this matrix is symmetrix. */            
159      bool isSymmetric() const {
160        for (unsigned int i = 0; i < Dim - 1; i++)
# Line 165 | Line 184 | namespace OpenMD {
184        return true;
185      }
186  
187 +    /**
188 +     * Returns a column vector that contains the elements from the
189 +     * diagonal of m in the order R(0) = m(0,0), R(1) = m(1,1), and so
190 +     * on.
191 +     */
192 +    Vector<Real, Dim> diagonals() const {
193 +      Vector<Real, Dim> result;
194 +      for (unsigned int i = 0; i < Dim; i++) {
195 +        result(i) = this->data_[i][i];
196 +      }
197 +      return result;
198 +    }
199 +
200      /** Tests if this matrix is the unit matrix. */
201      bool isUnitMatrix() const {
202        if (!isDiagonal())

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines