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 1465 by chuckv, Fri Jul 9 23:08:25 2010 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 52 | Line 52
52   #include "SquareMatrix.hpp"
53   #include "Vector3.hpp"
54   #include "utils/NumericConstant.hpp"
55 < namespace oopse {
55 > namespace OpenMD {
56  
57    template<typename Real>
58    class SquareMatrix3 : public SquareMatrix<Real, 3> {
# Line 321 | Line 321 | namespace oopse {
321      SquareMatrix3<Real>  inverse() const {
322        SquareMatrix3<Real> m;
323        RealType det = determinant();
324 <      if (fabs(det) <= oopse::epsilon) {
324 >      if (fabs(det) <= OpenMD::epsilon) {
325          //"The method was called on a matrix with |determinant| <= 1e-6.",
326          //"This is a runtime or a programming error in your application.");
327          std::vector<int> zeroDiagElementIndex;
328          for (int i =0; i < 3; ++i) {
329 <            if (fabs(this->data_[i][i]) <= oopse::epsilon) {
329 >            if (fabs(this->data_[i][i]) <= OpenMD::epsilon) {
330                  zeroDiagElementIndex.push_back(i);
331              }
332          }
# Line 349 | Line 349 | namespace oopse {
349        
350   /*
351          for(std::vector<int>::iterator iter = zeroDiagElementIndex.begin(); iter != zeroDiagElementIndex.end() ++iter) {
352 <            if (this->data_[*iter][0] > oopse::epsilon || this->data_[*iter][1] ||this->data_[*iter][2] ||
353 <                this->data_[0][*iter] > oopse::epsilon || this->data_[1][*iter] ||this->data_[2][*iter] ) {
352 >            if (this->data_[*iter][0] > OpenMD::epsilon || this->data_[*iter][1] ||this->data_[*iter][2] ||
353 >                this->data_[0][*iter] > OpenMD::epsilon || this->data_[1][*iter] ||this->data_[2][*iter] ) {
354                  std::cout << "can not inverse matrix" << std::endl;
355              }
356          }
# Line 566 | Line 566 | namespace oopse {
566    typedef SquareMatrix3<RealType> Mat3x3d;
567    typedef SquareMatrix3<RealType> RotMat3x3d;
568  
569 < } //namespace oopse
569 > } //namespace OpenMD
570   #endif // MATH_SQUAREMATRIX_HPP
571  

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 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines