ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/constraints/Rattle.cpp
(Generate patch)

Comparing trunk/src/constraints/Rattle.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 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, 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   #include "constraints/Rattle.hpp"
44   #include "primitives/Molecule.hpp"
45   #include "utils/simError.h"
46 < namespace oopse {
46 > namespace OpenMD {
47  
48 <  Rattle::Rattle(SimInfo* info) : info_(info), maxConsIteration_(10), consTolerance_(1.0e-6) {
48 >  Rattle::Rattle(SimInfo* info) : info_(info), maxConsIteration_(10), consTolerance_(1.0e-6), doRattle_(false) {
49      
50 +    if (info_->getNConstraints() > 0)
51 +      doRattle_ = true;
52 +    
53 +
54      if (info_->getSimParams()->haveDt()) {
55        dt_ = info_->getSimParams()->getDt();
56      } else {
# Line 59 | Line 64 | namespace oopse {
64    }
65  
66    void Rattle::constraintA() {
67 <    if (info_->getNConstraints() > 0) {
68 <      doConstraint(&Rattle::constraintPairA);
64 <    }
67 >    if (!doRattle_) return;
68 >    doConstraint(&Rattle::constraintPairA);
69    }
70    void Rattle::constraintB() {
71 <    if (info_->getNConstraints() > 0) {
72 <      doConstraint(&Rattle::constraintPairB);
69 <    }
71 >    if (!doRattle_) return;    
72 >    doConstraint(&Rattle::constraintPairB);
73    }
74  
75    void Rattle::doConstraint(ConstraintPairFuncPtr func) {
76 +    if (!doRattle_) return;
77 +
78      Molecule* mol;
79      SimInfo::MoleculeIterator mi;
80      ConstraintElem* consElem;
# Line 148 | Line 153 | namespace oopse {
153    }
154  
155    int Rattle::constraintPairA(ConstraintPair* consPair){
156 +
157      ConstraintElem* consElem1 = consPair->getConsElem1();
158      ConstraintElem* consElem2 = consPair->getConsElem2();
159  
# Line 160 | Line 166 | namespace oopse {
166  
167      currentSnapshot_->wrapVector(pab);
168  
169 <    double pabsq = pab.lengthSquare();
169 >    RealType pabsq = pab.lengthSquare();
170  
171 <    double rabsq = consPair->getConsDistSquare();
172 <    double diffsq = rabsq - pabsq;
171 >    RealType rabsq = consPair->getConsDistSquare();
172 >    RealType diffsq = rabsq - pabsq;
173  
174      // the original rattle code from alan tidesley
175      if (fabs(diffsq) > (consTolerance_ * rabsq * 2)){
# Line 175 | Line 181 | namespace oopse {
181  
182        currentSnapshot_->wrapVector(rab);
183  
184 <      double rpab = dot(rab, pab);
185 <      double rpabsq = rpab * rpab;
184 >      RealType rpab = dot(rab, pab);
185 >      RealType rpabsq = rpab * rpab;
186  
187        if (rpabsq < (rabsq * -diffsq)){
188          return consFail;
189        }
190  
191 <      double rma = 1.0 / consElem1->getMass();
192 <      double rmb = 1.0 / consElem2->getMass();
191 >      RealType rma = 1.0 / consElem1->getMass();
192 >      RealType rmb = 1.0 / consElem2->getMass();
193  
194 <      double gab = diffsq / (2.0 * (rma + rmb) * rpab);
194 >      RealType gab = diffsq / (2.0 * (rma + rmb) * rpab);
195  
196        Vector3d delta = rab * gab;
197  
# Line 234 | Line 240 | namespace oopse {
240  
241      currentSnapshot_->wrapVector(rab);
242  
243 <    double rma = 1.0 / consElem1->getMass();
244 <    double rmb = 1.0 / consElem2->getMass();
243 >    RealType rma = 1.0 / consElem1->getMass();
244 >    RealType rmb = 1.0 / consElem2->getMass();
245  
246 <    double rvab = dot(rab, dv);
246 >    RealType rvab = dot(rab, dv);
247  
248 <    double gab = -rvab / ((rma + rmb) * consPair->getConsDistSquare());
248 >    RealType gab = -rvab / ((rma + rmb) * consPair->getConsDistSquare());
249  
250      if (fabs(gab) > consTolerance_){
251        Vector3d delta = rab * gab;

Comparing trunk/src/constraints/Rattle.cpp (property svn:keywords):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines