| 6 |  | * redistribute this software in source and binary code form, provided | 
| 7 |  | * that the following conditions are met: | 
| 8 |  | * | 
| 9 | < | * 1. Acknowledgement of the program authors must be made in any | 
| 10 | < | *    publication of scientific results based in part on use of the | 
| 11 | < | *    program.  An acceptable form of acknowledgement is citation of | 
| 12 | < | *    the article in which the program was described (Matthew | 
| 13 | < | *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher | 
| 14 | < | *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented | 
| 15 | < | *    Parallel Simulation Engine for Molecular Dynamics," | 
| 16 | < | *    J. Comput. Chem. 26, pp. 252-271 (2005)) | 
| 17 | < | * | 
| 18 | < | * 2. Redistributions of source code must retain the above copyright | 
| 9 | > | * 1. Redistributions of source code must retain the above copyright | 
| 10 |  | *    notice, this list of conditions and the following disclaimer. | 
| 11 |  | * | 
| 12 | < | * 3. Redistributions in binary form must reproduce the above copyright | 
| 12 | > | * 2. Redistributions in binary form must reproduce the above copyright | 
| 13 |  | *    notice, this list of conditions and the following disclaimer in the | 
| 14 |  | *    documentation and/or other materials provided with the | 
| 15 |  | *    distribution. | 
| 28 |  | * arising out of the use of or inability to use software, even if the | 
| 29 |  | * University of Notre Dame has been advised of the possibility of | 
| 30 |  | * such damages. | 
| 31 | + | * | 
| 32 | + | * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your | 
| 33 | + | * research, please cite the appropriate papers when you publish your | 
| 34 | + | * work.  Good starting points are: | 
| 35 | + | * | 
| 36 | + | * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). | 
| 37 | + | * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). | 
| 38 | + | * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). | 
| 39 | + | * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010). | 
| 40 | + | * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). | 
| 41 |  | */ | 
| 42 |  |  | 
| 43 |  | /** | 
| 50 |  | #define MATH_SQUAREMATRIX_HPP | 
| 51 |  |  | 
| 52 |  | #include "math/RectMatrix.hpp" | 
| 53 | + | #include "utils/NumericConstant.hpp" | 
| 54 |  |  | 
| 55 | < | namespace oopse { | 
| 55 | > | namespace OpenMD { | 
| 56 |  |  | 
| 57 |  | /** | 
| 58 |  | * @class SquareMatrix SquareMatrix.hpp "math/SquareMatrix.hpp" | 
| 59 |  | * @brief A square matrix class | 
| 60 | < | * @template Real the element type | 
| 61 | < | * @template Dim the dimension of the square matrix | 
| 60 | > | * \tparam Real the element type | 
| 61 | > | * \tparam Dim the dimension of the square matrix | 
| 62 |  | */ | 
| 63 |  | template<typename Real, int Dim> | 
| 64 |  | class SquareMatrix : public RectMatrix<Real, Dim, Dim> { | 
| 125 |  | Real det; | 
| 126 |  | return det; | 
| 127 |  | } | 
| 128 | < |  | 
| 128 | > |  | 
| 129 |  | /** Returns the trace of this matrix. */ | 
| 130 |  | Real trace() const { | 
| 131 |  | Real tmp = 0; | 
| 140 |  | bool isSymmetric() const { | 
| 141 |  | for (unsigned int i = 0; i < Dim - 1; i++) | 
| 142 |  | for (unsigned int j = i; j < Dim; j++) | 
| 143 | < | if (fabs(this->data_[i][j] - this->data_[j][i]) > oopse::epsilon) | 
| 143 | > | if (fabs(this->data_[i][j] - this->data_[j][i]) > epsilon) | 
| 144 |  | return false; | 
| 145 |  |  | 
| 146 |  | return true; | 
| 159 |  | bool isDiagonal() const { | 
| 160 |  | for (unsigned int i = 0; i < Dim ; i++) | 
| 161 |  | for (unsigned int j = 0; j < Dim; j++) | 
| 162 | < | if (i !=j && fabs(this->data_[i][j]) > oopse::epsilon) | 
| 162 | > | if (i !=j && fabs(this->data_[i][j]) > epsilon) | 
| 163 |  | return false; | 
| 164 |  |  | 
| 165 |  | return true; | 
| 166 | + | } | 
| 167 | + |  | 
| 168 | + | /** | 
| 169 | + | * Returns a column vector that contains the elements from the | 
| 170 | + | * diagonal of m in the order R(0) = m(0,0), R(1) = m(1,1), and so | 
| 171 | + | * on. | 
| 172 | + | */ | 
| 173 | + | Vector<Real, Dim> diagonals() const { | 
| 174 | + | Vector<Real, Dim> result; | 
| 175 | + | for (unsigned int i = 0; i < Dim; i++) { | 
| 176 | + | result(i) = this->data_[i][i]; | 
| 177 | + | } | 
| 178 | + | return result; | 
| 179 |  | } | 
| 180 |  |  | 
| 181 |  | /** Tests if this matrix is the unit matrix. */ | 
| 184 |  | return false; | 
| 185 |  |  | 
| 186 |  | for (unsigned int i = 0; i < Dim ; i++) | 
| 187 | < | if (fabs(this->data_[i][i] - 1) > oopse::epsilon) | 
| 187 | > | if (fabs(this->data_[i][i] - 1) > epsilon) | 
| 188 |  | return false; | 
| 189 |  |  | 
| 190 |  | return true; | 
| 213 |  | * @return true if success, otherwise return false | 
| 214 |  | * @param a symmetric matrix whose eigenvectors are to be computed. On return, the matrix is | 
| 215 |  | *     overwritten | 
| 216 | < | * @param w will contain the eigenvalues of the matrix On return of this function | 
| 216 | > | * @param d will contain the eigenvalues of the matrix On return of this function | 
| 217 |  | * @param v the columns of this matrix will contain the eigenvectors. The eigenvectors are | 
| 218 |  | *    normalized and mutually orthogonal. | 
| 219 |  | */ | 
| 352 |  | //// this is NEVER called | 
| 353 |  | if ( i >= VTK_MAX_ROTATIONS ) { | 
| 354 |  | std::cout << "vtkMath::Jacobi: Error extracting eigenfunctions" << std::endl; | 
| 355 | + | if (n > 4) { | 
| 356 | + | delete[] b; | 
| 357 | + | delete[] z; | 
| 358 | + | } | 
| 359 |  | return 0; | 
| 360 |  | } | 
| 361 |  |  | 
| 390 |  | numPos++; | 
| 391 |  | } | 
| 392 |  | } | 
| 393 | < | //    if ( numPos < ceil(double(n)/double(2.0)) ) | 
| 393 | > | //    if ( numPos < ceil(RealType(n)/RealType(2.0)) ) | 
| 394 |  | if ( numPos < ceil_half_n) { | 
| 395 |  | for (i=0; i<n; i++) { | 
| 396 |  | v(i, j) *= -1.0; | 
| 406 |  | } | 
| 407 |  |  | 
| 408 |  |  | 
| 409 | < | typedef SquareMatrix<double, 6> Mat6x6d; | 
| 409 | > | typedef SquareMatrix<RealType, 6> Mat6x6d; | 
| 410 |  | } | 
| 411 |  | #endif //MATH_SQUAREMATRIX_HPP | 
| 412 |  |  |