ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/Snapshot.cpp
(Generate patch)

Comparing:
trunk/src/brains/Snapshot.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/brains/Snapshot.cpp (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 51 | Line 51
51   #include "utils/NumericConstant.hpp"
52   #include "utils/simError.h"
53   #include "utils/Utility.hpp"
54 < namespace oopse {
54 > #include <cstdio>
55  
56 + namespace OpenMD {
57 +
58    void  Snapshot::setHmat(const Mat3x3d& m) {
57    const double orthoTolerance = NumericConstant::epsilon;
59      hmat_ = m;
60      invHmat_ = hmat_.inverse();
61      
62 +
63      //prepare fortran Hmat
64 <    double fortranHmat[9];
65 <    double fortranInvHmat[9];
64 >    RealType fortranHmat[9];
65 >    RealType fortranInvHmat[9];
66      hmat_.getArray(fortranHmat);
67      invHmat_.getArray(fortranInvHmat);
68  
69      //determine whether the box is orthoTolerance or not
70      int oldOrthoRhombic = orthoRhombic_;
71      
72 <    double smallDiag = fabs(hmat_(0, 0));
72 >    RealType smallDiag = fabs(hmat_(0, 0));
73      if(smallDiag > fabs(hmat_(1, 1))) smallDiag = fabs(hmat_(1, 1));
74      if(smallDiag > fabs(hmat_(2, 2))) smallDiag = fabs(hmat_(2, 2));    
75 <    double tol = smallDiag * orthoTolerance;
75 >    RealType tol = smallDiag * orthoTolerance_;
76  
77      orthoRhombic_ = 1;
78  
# Line 89 | Line 91 | namespace oopse {
91  
92        if( orthoRhombic_ ) {
93          sprintf( painCave.errMsg,
94 <                 "OOPSE is switching from the default Non-Orthorhombic\n"
94 >                 "OpenMD is switching from the default Non-Orthorhombic\n"
95                   "\tto the faster Orthorhombic periodic boundary computations.\n"
96 <                 "\tThis is usually a good thing, but if you wan't the\n"
96 >                 "\tThis is usually a good thing, but if you want the\n"
97                   "\tNon-Orthorhombic computations, make the orthoBoxTolerance\n"
98                   "\tvariable ( currently set to %G ) smaller.\n",
99 <                 orthoTolerance);
100 <        painCave.severity = OOPSE_INFO;
99 >                 orthoTolerance_);
100 >        painCave.severity = OPENMD_INFO;
101          simError();
102        }
103        else {
104          sprintf( painCave.errMsg,
105 <                 "OOPSE is switching from the faster Orthorhombic to the more\n"
105 >                 "OpenMD is switching from the faster Orthorhombic to the more\n"
106                   "\tflexible Non-Orthorhombic periodic boundary computations.\n"
107                   "\tThis is usually because the box has deformed under\n"
108 <                 "\tNPTf integration. If you wan't to live on the edge with\n"
108 >                 "\tNPTf integration. If you want to live on the edge with\n"
109                   "\tthe Orthorhombic computations, make the orthoBoxTolerance\n"
110                   "\tvariable ( currently set to %G ) larger.\n",
111 <                 orthoTolerance);
112 <        painCave.severity = OOPSE_WARNING;
111 >                 orthoTolerance_);
112 >        painCave.severity = OPENMD_WARNING;
113          simError();
114        }
115      }    
# Line 156 | Line 158 | namespace oopse {
158  
159    }
160  
161 +  Vector3d Snapshot::getCOM() {
162 +    if( !hasCOM_ ) {
163 +      sprintf( painCave.errMsg, "COM was requested before COM was computed!\n");
164 +      painCave.severity = OPENMD_ERROR;
165 +      simError();
166 +    }
167 +    return COM_;
168 +  }
169 +  
170 +  Vector3d Snapshot::getCOMvel() {
171 +    if( !hasCOM_ ) {
172 +      sprintf( painCave.errMsg, "COMvel was requested before COM was computed!\n");
173 +      painCave.severity = OPENMD_ERROR;
174 +      simError();
175 +    }
176 +    return COMvel_;
177 +  }
178 +  
179 +  Vector3d Snapshot::getCOMw() {
180 +    if( !hasCOM_ ) {
181 +      sprintf( painCave.errMsg, "COMw was requested before COM was computed!\n");
182 +      painCave.severity = OPENMD_ERROR;
183 +      simError();
184 +    }
185 +    return COMw_;
186 +  }
187 +
188   }
189    

Comparing:
trunk/src/brains/Snapshot.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/brains/Snapshot.cpp (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