--- trunk/OOPSE/libmdtools/Molecule.hpp	2003/03/26 21:50:33	412
+++ trunk/OOPSE/libmdtools/Molecule.hpp	2003/03/27 20:12:15	423
@@ -4,6 +4,7 @@
 #include "Atom.hpp"
 #include "SRI.hpp"
 #include "MoleculeStamp.hpp"
+#include "Exclude.hpp"
 
 typedef struct{
   
@@ -11,10 +12,9 @@ typedef struct{
   int nAtoms;    // the number of atoms in the molecule
   int nBonds;    // ... .. ..  . .bonds .. .. . . . . 
   int nBends;    // . . . . .. . .bends . . . . .. . 
-  int nTorsions  // .. . . .. . . torsions . . .. . . 
-  int nOriented; // .. . . . .. . oreineted atoms . . . 
+  int nTorsions; // .. . . .. . . torsions . . .. . . 
+  int nOriented; // .. . . . .. . oriented atoms . . . 
   
-  
   Atom** myAtoms;      // the array of atoms
   Exclude** myExcludes;// the array of Excluded pairs 
   Bond** myBonds;      // arrays of all the short range interactions
@@ -32,16 +32,26 @@ class Molecule{ (public)
   ~Molecule( void );
 
   void initialize( molInit &theInit );
+ 
+  int getNAtoms   ( void ) {return nAtoms;}
+  int getNBonds   ( void ) {return nBonds;}
+  int getNBends   ( void ) {return nBends;}
+  int getNTorsions( void ) {return nTorsions;}
+  int getNOriented( void ) {return nOriented;}
+  int getNExcludes( void ) {return nExcludes;}
+  int getNMembers ( void ) {return nMembers;}
+  int getStampID  ( void ) {return stampID;}
 
-  int   getNMembers( void )  { return nMembers; }
-  int   getStartAtom( void ) { return startAtom; }
-  int   getEndAtom( void )   { return endAtom; }
-  int   getStampID( void )   { return stampID; }
+  Atom**     getMyAtoms   ( void ) {return myAtoms;}
+  Bond**     getMyBonds   ( void ) {return myBonds;}
+  Bend**     getMyBends   ( void ) {return myBends;}
+  Torsions** getmyTorsions( void ) {return myTorsions;}
+  Exclude**  getmyExcludes( void ) {return myExcludes;}
   
-  void   setNMembers( int info )  { nMembers = info; }
-  void   setStartAtom( int info ) { startAtom = info; }
-  void   setEndAtom( int info )   { endAtom = info; }
-  void   setStampID( int info )   { stampID = info; }
+  void setStampID( int info ) {stampID = info;}
+
+  void calcForces( void );
+  double getPotential( void );
   
 
 private:
@@ -50,19 +60,17 @@ class Molecule{ (public)
   int nAtoms;    // the number of atoms in the molecule
   int nBonds;    // ... .. ..  . .bonds .. .. . . . . 
   int nBends;    // . . . . .. . .bends . . . . .. . 
-  int nTorsions  // .. . . .. . . torsions . . .. . . 
-  int nOriented; // .. . . . .. . oreineted atoms . . . 
-  
+  int nTorsions; // .. . . .. . . torsions . . .. . . 
+  int nOriented; // .. . . . .. . oriented atoms . . . 
+  int nMembers;  // .. . . . . . .atoms (legacy code) . . . 
+  int nExcludes; // . . . . .. .. excludes .. . . 
 
   Atom** myAtoms;     // the array of atoms
-  Bond** myBonds;      // arrays of all the short range interactions
+  Bond** myBonds;     // arrays of all the short range interactions
   Bend** myBends;
   Torsion** myTorsions;
+  Exclude** myExcludes; // array of the excluded pairs of long range forces
   
-  int startAtom;
-  int endAtom;
-
-
 };
 
 #endif