ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Molecule.hpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Molecule.hpp (file contents):
Revision 407 by mmeineke, Wed Mar 26 20:22:02 2003 UTC vs.
Revision 425 by mmeineke, Thu Mar 27 20:39:09 2003 UTC

# Line 4 | Line 4
4   #include "Atom.hpp"
5   #include "SRI.hpp"
6   #include "MoleculeStamp.hpp"
7 + #include "Exclude.hpp"
8  
9   typedef struct{
10    
# Line 11 | Line 12 | typedef struct{
12    int nAtoms;    // the number of atoms in the molecule
13    int nBonds;    // ... .. ..  . .bonds .. .. . . . .
14    int nBends;    // . . . . .. . .bends . . . . .. .
15 <  int nTorsions  // .. . . .. . . torsions . . .. . .
16 <  int nOriented; // .. . . . .. . oreineted atoms . . .
15 >  int nTorsions; // .. . . .. . . torsions . . .. . .
16 >  int nOriented; // .. . . . .. . oriented atoms . . .
17 >  int nExcludes; // . . .. . . . .exclude pairs.. . . .
18    
19 <  
20 <  Atom** myAtoms;     // the array of atoms
19 >  Atom** myAtoms;      // the array of atoms
20 >  Exclude** myExcludes;// the array of Excluded pairs
21    Bond** myBonds;      // arrays of all the short range interactions
22    Bend** myBends;
23    Torsion** myTorsions;
# Line 31 | Line 33 | class Molecule{ (public)
33    ~Molecule( void );
34  
35    void initialize( molInit &theInit );
36 +
37 +  int getNAtoms   ( void ) {return nAtoms;}
38 +  int getNBonds   ( void ) {return nBonds;}
39 +  int getNBends   ( void ) {return nBends;}
40 +  int getNTorsions( void ) {return nTorsions;}
41 +  int getNOriented( void ) {return nOriented;}
42 +  int getNExcludes( void ) {return nExcludes;}
43 +  int getNMembers ( void ) {return nMembers;}
44 +  int getStampID  ( void ) {return stampID;}
45  
46 <  int   getNMembers( void )  { return nMembers; }
47 <  int   getStartAtom( void ) { return startAtom; }
48 <  int   getEndAtom( void )   { return endAtom; }
49 <  int   getStampID( void )   { return stampID; }
46 >  Atom**     getMyAtoms   ( void ) {return myAtoms;}
47 >  Bond**     getMyBonds   ( void ) {return myBonds;}
48 >  Bend**     getMyBends   ( void ) {return myBends;}
49 >  Torsion**  getMyTorsions( void ) {return myTorsions;}
50 >  Exclude**  getMyExcludes( void ) {return myExcludes;}
51    
52 <  void   setNMembers( int info )  { nMembers = info; }
53 <  void   setStartAtom( int info ) { startAtom = info; }
54 <  void   setEndAtom( int info )   { endAtom = info; }
55 <  void   setStampID( int info )   { stampID = info; }
52 >  void setStampID( int info ) {stampID = info;}
53 >
54 >  void calcForces( void );
55 >  double getPotential( void );
56    
57  
58   private:
# Line 49 | Line 61 | class Molecule{ (public)
61    int nAtoms;    // the number of atoms in the molecule
62    int nBonds;    // ... .. ..  . .bonds .. .. . . . .
63    int nBends;    // . . . . .. . .bends . . . . .. .
64 <  int nTorsions  // .. . . .. . . torsions . . .. . .
65 <  int nOriented; // .. . . . .. . oreineted atoms . . .
66 <  
64 >  int nTorsions; // .. . . .. . . torsions . . .. . .
65 >  int nOriented; // .. . . . .. . oriented atoms . . .
66 >  int nMembers;  // .. . . . . . .atoms (legacy code) . . .
67 >  int nExcludes; // . . . . .. .. excludes .. . .
68  
69    Atom** myAtoms;     // the array of atoms
70 <  Bond** myBonds;      // arrays of all the short range interactions
70 >  Bond** myBonds;     // arrays of all the short range interactions
71    Bend** myBends;
72    Torsion** myTorsions;
73 +  Exclude** myExcludes; // array of the excluded pairs of long range forces
74    
61  int startAtom;
62  int endAtom;
63
64
75   };
76  
77   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines