--- trunk/mdtools/headers/ForceFields.hpp	2003/01/22 21:45:20	240
+++ trunk/mdtools/headers/ForceFields.hpp	2003/01/30 15:20:21	253
@@ -41,19 +41,8 @@ class torsion_set{ (public)
   int d;
 };
 
-// typedef struct{
-//   int a, b;
-// } bond_pair;
 
-// typedef struct{
-//   int a, b, c;
-// } bend_set;
 
-// typedef struct{
-//   int a, b, c, d;
-// } torsion_set;
-
-
 class ForceFields{
 
 public:
@@ -65,7 +54,7 @@ class ForceFields{ (public)
   virtual void initializeBonds( bond_pair* the_bonds ) = 0;
   virtual void initializeBends( bend_set* the_bends ) = 0;
   virtual void initializeTorsions( torsion_set* the_torsions ) = 0;
-  virtual void doForces( void ) = 0;
+  virtual void doForces( int calcPot ) = 0;
 
 protected:
   
@@ -88,7 +77,7 @@ class TraPPEFF : public ForceFields{ (public)
   void initializeBonds( bond_pair* the_bonds );
   void initializeBends( bend_set* the_bends );
   void initializeTorsions( torsion_set* the_torsions );
-  void doForces( void ) {}
+  void doForces( int ) {}
 };
 
 
@@ -102,7 +91,7 @@ class DipoleTestFF : public ForceFields{ (public)
   void initializeBonds( bond_pair* the_bonds );
   void initializeBends( bend_set* the_bends );
   void initializeTorsions( torsion_set* the_torsions );
-  void doForces( void ) {}
+  void doForces( int ) {}
 };
 
 class TraPPE_ExFF : public ForceFields{
@@ -115,7 +104,7 @@ class TraPPE_ExFF : public ForceFields{ (public)
   void initializeBonds( bond_pair* the_bonds );
   void initializeBends( bend_set* the_bends );
   void initializeTorsions( torsion_set* the_torsions );
-  void doForces( void ) {}
+  void doForces( int ) {}
 };
 
 class LJ_FF : public ForceFields{
@@ -134,7 +123,7 @@ class LJ_FF : public ForceFields{ (public)
 					 short int* doPotentialCalc ) ){
     doLJfortran = fortranSub;
   }
-  void doForces( void );
+  void doForces( int );
 
 private: