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

Comparing trunk/OOPSE-2.0/src/types/ShapeAtomType.hpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2211 by chrisfen, Thu Apr 21 14:12:19 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 53 | Line 53
53   #include "math/RealSphericalHarmonic.hpp"
54   #include "math/SquareMatrix3.hpp"
55   #include "types/DirectionalAtomType.hpp"
56 + #include "utils/simError.h"
57  
58   namespace oopse {
59    
# Line 64 | Line 65 | namespace oopse {
65      ShapeAtomType() : DirectionalAtomType() { atp.is_Shape = 1; }
66      ~ShapeAtomType();
67          
68 <     std::vector<RealSphericalHarmonic*> getContactFuncs(void) {return contactFuncs;}
69 <     std::vector<RealSphericalHarmonic*> getRangeFuncs(void) {return rangeFuncs;}
70 <     std::vector<RealSphericalHarmonic*> getStrengthFuncs(void) {return strengthFuncs;}
68 >    std::vector<RealSphericalHarmonic*> getContactFuncs(void) {return contactFuncs;}
69 >    std::vector<RealSphericalHarmonic*> getRangeFuncs(void) {return rangeFuncs;}
70 >    std::vector<RealSphericalHarmonic*> getStrengthFuncs(void) {return strengthFuncs;}
71      
72      void setContactFuncs(std::vector<RealSphericalHarmonic*> cf) {
73        contactFuncs = cf;
# Line 99 | Line 100 | namespace oopse {
100       */
101      double getStrengthValueAt(double costheta, double phi);
102      
103 +    virtual void complete();
104 +    
105    private:
106      
107 <     std::vector<RealSphericalHarmonic*> contactFuncs;  // The contact functions
108 <     std::vector<RealSphericalHarmonic*> rangeFuncs;    // The range functions
109 <     std::vector<RealSphericalHarmonic*> strengthFuncs; // The strength functions
107 >    std::vector<RealSphericalHarmonic*> contactFuncs;  // The contact functions
108 >    std::vector<RealSphericalHarmonic*> rangeFuncs;    // The range functions
109 >    std::vector<RealSphericalHarmonic*> strengthFuncs; // The strength functions
110      
111    };
112   }

Diff Legend

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