--- trunk/OOPSE/libmdtools/Molecule.hpp	2003/04/03 20:19:50	446
+++ trunk/OOPSE/libmdtools/Molecule.hpp	2004/04/14 15:37:41	1108
@@ -4,7 +4,7 @@
 #include "Atom.hpp"
 #include "SRI.hpp"
 #include "MoleculeStamp.hpp"
-#include "Exclude.hpp"
+#include "RigidBody.hpp"
 
 typedef struct{
   
@@ -13,18 +13,15 @@ typedef struct{
   int nBonds;    // ... .. ..  . .bonds .. .. . . . . 
   int nBends;    // . . . . .. . .bends . . . . .. . 
   int nTorsions; // .. . . .. . . torsions . . .. . . 
+  int nRigidBodies; // .. .. .. . rigid bodies ... .. 
   int nOriented; // .. . . . .. . oriented atoms . . . 
-  int nExcludes; // . . .. . . . .exclude pairs.. . . . 
 
-  double* COM;   // the location of the center of mass of the molecule
-  
   Atom** myAtoms;      // the array of atoms
-  Exclude** myExcludes;// the array of Excluded pairs 
   Bond** myBonds;      // arrays of all the short range interactions
   Bend** myBends;
   Torsion** myTorsions;
-
-
+  vector<RigidBody*>   myRigidBodies;
+  vector<StuntDouble*> myIntegrableObjects;
 } molInit;
 
 class Molecule{
@@ -37,31 +34,40 @@ class Molecule{ (public)
   void initialize( molInit &theInit );
 
   void setMyIndex( int theIndex ){ myIndex = theIndex;}
- 
-  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 getMyIndex( void ) { return myIndex; }
 
-  Atom**     getMyAtoms   ( void ) {return myAtoms;}
-  Bond**     getMyBonds   ( void ) {return myBonds;}
-  Bend**     getMyBends   ( void ) {return myBends;}
-  Torsion**  getMyTorsions( void ) {return myTorsions;}
-  Exclude**  getMyExcludes( void ) {return myExcludes;}
+  int getGlobalIndex( void ) { return globalIndex; }
+  void setGlobalIndex( int theIndex ) { globalIndex = theIndex; }
+
+  int getNAtoms   ( void )    {return nAtoms;}
+  int getNBonds   ( void )    {return nBonds;}
+  int getNBends   ( void )    {return nBends;}
+  int getNTorsions( void )    {return nTorsions;}
+  int getNRigidBodies( void ) {return myRigidBodies.size();}
+  int getNOriented( void )    {return nOriented;}
+  int getNMembers ( void )    {return nMembers;}
+  int getStampID  ( void )    {return stampID;}
+
+  Atom**      getMyAtoms   ( void )    {return myAtoms;}
+  Bond**      getMyBonds   ( void )    {return myBonds;}
+  Bend**      getMyBends   ( void )    {return myBends;}
+  Torsion**   getMyTorsions( void )    {return myTorsions;}
+  vector<RigidBody*> getMyRigidBodies( void ) {return myRigidBodies;}
+  vector<StuntDouble*>& getIntegrableObjects(void) {return myIntegrableObjects;}
   
-  void setStampID( int info ) {stampID = info;}
+  void setStampID( int info ) {stampID = info;} 
 
   void calcForces( void );
+  void atoms2rigidBodies( void );
   double getPotential( void );
   
   void printMe( void );
 
-  double* getCOM();
-  void moveCOM(double* delta);
+  void getCOM( double COM[3] );
+  void moveCOM( double delta[3] );
+  double getCOMvel( double COMvel[3] );
+  
+  double getTotalMass();
 
 private:
 
@@ -70,19 +76,20 @@ class Molecule{ (public)
   int nBonds;    // ... .. ..  . .bonds .. .. . . . . 
   int nBends;    // . . . . .. . .bends . . . . .. . 
   int nTorsions; // .. . . .. . . torsions . . .. . . 
+  int nRigidBodies; // .. . . .. .rigid bodies . . .. . . 
   int nOriented; // .. . . . .. . oriented atoms . . . 
   int nMembers;  // .. . . . . . .atoms (legacy code) . . . 
-  int nExcludes; // . . . . .. .. excludes .. . . 
 
-  int myIndex; // mostly just for debug
+  int myIndex; // mostly just for debug (and for making pressure calcs work)
+  int globalIndex;
 
   Atom** myAtoms;     // the array of atoms
   Bond** myBonds;     // arrays of all the short range interactions
   Bend** myBends;
   Torsion** myTorsions;
-  Exclude** myExcludes; // array of the excluded pairs of long range forces
-  
-  double* COM;
+  vector<RigidBody*>   myRigidBodies;
+  vector<StuntDouble*> myIntegrableObjects;
+
 };
 
 #endif