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

Comparing:
trunk/src/constraints/ConstraintPair.hpp (file contents), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/constraints/ConstraintPair.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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 45 | Line 46
46  
47   #include "primitives/StuntDouble.hpp"
48   #include "constraints/ConstraintElem.hpp"
49 < namespace oopse {
49 > namespace OpenMD {
50  
51  
52 < /**
53 < * @class ConstraintPair
54 < * @todo document
55 < */
56 < class ConstraintPair {
52 >  /**
53 >   * @class ConstraintPair
54 >   * @todo document
55 >   */
56 >  class ConstraintPair {
57  
58 <    public:
58 >  public:
59  
60 <        ConstraintPair(ConstraintElem* elem1, ConstraintElem* elem2, double len)
61 <            : consElem1_(elem1), consElem2_(elem2), dist2(len*len) { }
60 >    ConstraintPair(ConstraintElem* elem1, ConstraintElem* elem2, RealType len)
61 >      : consElem1_(elem1), consElem2_(elem2), dist2(len*len) { }
62  
63 <        ~ConstraintPair() {
64 <            delete consElem1_;
65 <            delete consElem2_;
66 <        }
67 <        /** Return the first constraint elemet */
68 <        ConstraintElem* getConsElem1() {return consElem1_;}
63 >    ~ConstraintPair() {
64 >      delete consElem1_;
65 >      delete consElem2_;
66 >    }
67 >    /** Return the first constraint elemet */
68 >    ConstraintElem* getConsElem1() {return consElem1_;}
69  
70 <        /** Retunr the second constraint element */
71 <        ConstraintElem* getConsElem2() {return consElem2_;}
70 >    /** Retunr the second constraint element */
71 >    ConstraintElem* getConsElem2() {return consElem2_;}
72  
73 <        bool isMoved() { return consElem1_->getMoved() || consElem2_->getMoved(); }        
74 <        double getConsDistSquare() {return dist2;}
73 >    bool isMoved() { return consElem1_->getMoved() || consElem2_->getMoved(); }        
74 >    RealType getConsDistSquare() {return dist2;}
75  
76 <    private:
76 >  private:
77          
78 <        ConstraintElem* consElem1_;
79 <        ConstraintElem* consElem2_;        
80 <        double dist2;
81 < };
78 >    ConstraintElem* consElem1_;
79 >    ConstraintElem* consElem2_;        
80 >    RealType dist2;
81 >  };
82  
83   }
84  

Comparing:
trunk/src/constraints/ConstraintPair.hpp (property svn:keywords), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/constraints/ConstraintPair.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines