ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/types/QuadraticBondType.hpp
(Generate patch)

Comparing branches/new_design/OOPSE-2.0/src/types/QuadraticBondType.hpp (file contents):
Revision 1749 by tim, Wed Nov 17 21:47:42 2004 UTC vs.
Revision 1750 by tim, Thu Nov 18 04:04:19 2004 UTC

# Line 24 | Line 24
24   */
25  
26   /**
27 < * @file BendType.hpp
27 > * @file QuadraticBondType.hpp
28   * @author    tlin
29   * @date  11/01/2004
30   * @version 1.0
31   */
32  
33 < #ifndef TYPES_QUADRATICBENDTYPE_HPP
34 < #define TYPES_QUADRATICBENDTYPE_HPP
33 > #ifndef TYPES_QUADRATICBONDTYPE_HPP
34 > #define TYPES_QUADRATICBONDTYPE_HPP
35  
36 < #include "types/BendType.hpp"
36 > #include "types/BondType.hpp"
37  
38   namespace oopse {
39   /**
40 < * @class QuadraticBendType
40 > * @class QuadraticBondType
41   * @todo document
42   */
43 < class QuadraticBendType : public BendType {
43 > class QuadraticBondType : public BondType {
44  
45      public:
46          
47 <        QuadraticBendType(double theta, double k2, double k3, double k4)
48 <            : BendType(theta), k2_(k2), k3_(k3) {
47 >        QuadraticBondType(double theta, double k2, double k3, double k4)
48 >            : BondType(theta), k2_(k2), k3_(k3) {
49          }
50  
51          void setForceConstant(double k2, double k3, double k4) {
# Line 60 | Line 60 | class QuadraticBendType : public BendType {
60              k4 = k4_;
61          }
62  
63 <        virtual void calcForce(double theta, double& V, double& dVdelta) {
64 <            double delta =  theta- theta0_;
65 <            double delta2 = delta * delta;
66 <            double delta3 = delta2 * delta;
67 <            double delta4 = delta3 * delta;
63 >        virtual void calcForce(double r, double& V, double& dVdr) {
64 >            double dr =  r- r0;
65 >            double dr2 = dr * dr;
66 >            double dr3 = dr2 * dr;
67 >            double dr4 = dr3 * dr;
68              
69 <            V = 0.5 * (k2_*delta2 + k3_*delta3 + k4_*delta4);
70 <            dVdelta = k2_ * delta + 1.5 * k3_*delta2 + 2.0 * k4_ *delta3;
69 >            V = 0.5 * (k2_*dr2 + k3_*dr3 + k4_*dr4);
70 >            dVdr = k2_ * dr + 1.5 * k3_*dr2 + 2.0 * k4_ *dr3;
71          }
72          
73      private:
# Line 79 | Line 79 | class QuadraticBendType : public BendType {
79   };
80  
81   }//end namespace oopse
82 < #endif //TYPES_QUADRATICBENDTYPE_HPP
82 > #endif //TYPES_QUADRATICBONDTYPE_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines