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

Comparing branches/new_design/OOPSE-2.0/src/primitives/Molecule.hpp (file contents):
Revision 1733 by tim, Fri Nov 12 06:19:04 2004 UTC vs.
Revision 1782 by tim, Wed Nov 24 20:55:03 2004 UTC

# Line 38 | Line 38
38   #include "math/Vector3.hpp"
39   #include "primitives/Atom.hpp"
40   #include "primitives/RigidBody.hpp"
41 < //#include "primitives/Bond.hpp"
42 < //#include "primitives/Bend.hpp"
43 < //#include "primitives/Torsion.hpp"
44 < #include "primitives/SRI.hpp"
41 > #include "primitives/Bond.hpp"
42 > #include "primitives/Bend.hpp"
43 > #include "primitives/Torsion.hpp"
44   #include "primitives/CutoffGroup.hpp"
45  
46   namespace oopse{
# Line 233 | Line 232 | class Molecule {
232  
233          Constraint* nextConstraint(std::vector<Constraint*>::iterator& i);
234          
236        //void setStampID( int info ) {stampID = info;}
235  
238        void calcForces( void );
239
240        void atoms2rigidBodies( void );
241
236          /** return the total potential energy of short range interaction of this molecule */
237          double getPotential();
238  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines