ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/types/QuarticBendType.hpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/types/QuarticBendType.hpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 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 52 | Line 52 | namespace oopse {
52   #include "types/BendType.hpp"
53  
54   namespace oopse {
55 < /**
56 < * @class QuarticBendType
57 < * @todo document
58 < */
59 < class QuarticBendType : public BendType {
55 >  /**
56 >   * @class QuarticBendType
57 >   * @todo document
58 >   */
59 >  class QuarticBendType : public BendType {
60  
61 <    public:
61 >  public:
62          
63 <        QuarticBendType(double r0, double k4, double k3, double k2, double k1, double k0)
64 <            : BendType(r0), k4_(k4), k3_(k3), k2_(k2),  k1_(k1), k0_(k0){
65 <        }
63 >    QuarticBendType(double r0, double k4, double k3, double k2, double k1, double k0)
64 >      : BendType(r0), k4_(k4), k3_(k3), k2_(k2),  k1_(k1), k0_(k0){
65 >      }
66  
67 <        void setForceConstant(double k4, double k3, double k2, double k1, double k0) {
68 <            k4_ = k4;
69 <            k3_ = k3;
70 <            k2_ = k2;
71 <            k1_ = k1;
72 <            k0_ = k0;
67 >    void setForceConstant(double k4, double k3, double k2, double k1, double k0) {
68 >      k4_ = k4;
69 >      k3_ = k3;
70 >      k2_ = k2;
71 >      k1_ = k1;
72 >      k0_ = k0;
73  
74 <        }
74 >    }
75  
76 <        void getForceConstant(double& k4, double& k3, double& k2, double& k1, double& k0) {
77 <            k4 = k4_;
78 <            k3 = k3_;
79 <            k2  = k2_;
80 <            k1 = k1_;
81 <            k0 = k0_;
82 <        }
76 >    void getForceConstant(double& k4, double& k3, double& k2, double& k1, double& k0) {
77 >      k4 = k4_;
78 >      k3 = k3_;
79 >      k2  = k2_;
80 >      k1 = k1_;
81 >      k0 = k0_;
82 >    }
83  
84 <        virtual void calcForce(double theta, double& V, double& dVdTheta) {
85 <            double delta =  theta- theta0_;
86 <            double delta2 = delta * delta;
87 <            double delta3 = delta2 * delta;
88 <            double delta4 = delta3 * delta;
84 >    virtual void calcForce(double theta, double& V, double& dVdTheta) {
85 >      double delta =  theta- theta0_;
86 >      double delta2 = delta * delta;
87 >      double delta3 = delta2 * delta;
88 >      double delta4 = delta3 * delta;
89              
90 <            V =k0_ + k1_ * delta + k2_*delta2 + k3_*delta3 + k4_*delta4;
91 <            dVdTheta = k1_ + 2.0*k2_ * delta + 3.0 * k3_*delta2 + 4.0*k4_*delta3;            
92 <        }    
90 >      V =k0_ + k1_ * delta + k2_*delta2 + k3_*delta3 + k4_*delta4;
91 >      dVdTheta = k1_ + 2.0*k2_ * delta + 3.0 * k3_*delta2 + 4.0*k4_*delta3;            
92 >    }    
93          
94 <    private:
94 >  private:
95  
96 <        double k4_;
97 <        double k3_;
98 <        double k2_;
99 <        double k1_;
100 <        double k0_;
96 >    double k4_;
97 >    double k3_;
98 >    double k2_;
99 >    double k1_;
100 >    double k0_;
101  
102 < };
102 >  };
103  
104   }//end namespace oopse
105   #endif //TYPES_QUARTICBENDTYPE_HPP

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines