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

Comparing:
trunk/src/math/SquareMatrix3.hpp (file contents), Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
branches/development/src/math/SquareMatrix3.hpp (file contents), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 6 | Line 6
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.
# Line 37 | Line 28
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, 24107 (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   /**
# Line 47 | Line 48
48   */
49   #ifndef MATH_SQUAREMATRIX3_HPP
50   #define  MATH_SQUAREMATRIX3_HPP
51 + #include "config.h"
52 + #include <cmath>
53   #include <vector>
54   #include "Quaternion.hpp"
55   #include "SquareMatrix.hpp"
56   #include "Vector3.hpp"
57   #include "utils/NumericConstant.hpp"
58 < namespace oopse {
58 > namespace OpenMD {
59  
60    template<typename Real>
61    class SquareMatrix3 : public SquareMatrix<Real, 3> {
# Line 109 | Line 112 | namespace oopse {
112        return *this;
113      }
114  
115 +    
116      /**
117       * Sets this matrix to a rotation matrix by three euler angles
118       * @ param euler
# Line 121 | Line 125 | namespace oopse {
125       * Sets this matrix to a rotation matrix by three euler angles
126       * @param phi
127       * @param theta
128 <     * @psi theta
128 >     * @param psi
129       */
130      void setupRotMat(Real phi, Real theta, Real psi) {
131        Real sphi, stheta, spsi;
# Line 187 | Line 191 | namespace oopse {
191      }
192  
193  
190
194      /**
195       * Returns the quaternion from this rotation matrix
196       * @return the quaternion from this rotation matrix
# Line 321 | Line 324 | namespace oopse {
324      SquareMatrix3<Real>  inverse() const {
325        SquareMatrix3<Real> m;
326        RealType det = determinant();
327 <      if (fabs(det) <= oopse::epsilon) {
327 >      if (fabs(det) <= OpenMD::epsilon) {
328          //"The method was called on a matrix with |determinant| <= 1e-6.",
329          //"This is a runtime or a programming error in your application.");
330          std::vector<int> zeroDiagElementIndex;
331          for (int i =0; i < 3; ++i) {
332 <            if (fabs(this->data_[i][i]) <= oopse::epsilon) {
332 >            if (fabs(this->data_[i][i]) <= OpenMD::epsilon) {
333                  zeroDiagElementIndex.push_back(i);
334              }
335          }
# Line 349 | Line 352 | namespace oopse {
352        
353   /*
354          for(std::vector<int>::iterator iter = zeroDiagElementIndex.begin(); iter != zeroDiagElementIndex.end() ++iter) {
355 <            if (this->data_[*iter][0] > oopse::epsilon || this->data_[*iter][1] ||this->data_[*iter][2] ||
356 <                this->data_[0][*iter] > oopse::epsilon || this->data_[1][*iter] ||this->data_[2][*iter] ) {
355 >            if (this->data_[*iter][0] > OpenMD::epsilon || this->data_[*iter][1] ||this->data_[*iter][2] ||
356 >                this->data_[0][*iter] > OpenMD::epsilon || this->data_[1][*iter] ||this->data_[2][*iter] ) {
357                  std::cout << "can not inverse matrix" << std::endl;
358              }
359          }
# Line 417 | Line 420 | namespace oopse {
420      Vector3<Real> v_maxI, v_k, v_j;
421  
422      // diagonalize using Jacobi
423 <    jacobi(a, w, v);
423 >    SquareMatrix3<Real>::jacobi(a, w, v);
424      // if all the eigenvalues are the same, return identity matrix
425      if (w[0] == w[1] && w[0] == w[2] ) {
426        v = SquareMatrix3<Real>::identity();
# Line 566 | Line 569 | namespace oopse {
569    typedef SquareMatrix3<RealType> Mat3x3d;
570    typedef SquareMatrix3<RealType> RotMat3x3d;
571  
572 < } //namespace oopse
572 > } //namespace OpenMD
573   #endif // MATH_SQUAREMATRIX_HPP
574  

Comparing:
trunk/src/math/SquareMatrix3.hpp (property svn:keywords), Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
branches/development/src/math/SquareMatrix3.hpp (property svn:keywords), Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines