--- trunk/OOPSE/libmdtools/SimInfo.hpp	2003/11/06 22:01:37	855
+++ trunk/OOPSE/libmdtools/SimInfo.hpp	2004/01/13 23:01:43	941
@@ -81,7 +81,8 @@ class SimInfo{ (public)
   int usePBC; // whether we use periodic boundry conditions.
   int useLJ; 
   int useSticky;
-  int useDipole;
+  int useCharges;
+  int useDipoles;
   int useReactionField;
   int useGB;
   int useEAM;
@@ -139,11 +140,8 @@ class SimInfo{ (public)
   void getBoxM( double theBox[3][3] );
   void scaleBox( double scale );
   
-  void setRcut( double theRcut );
   void setDefaultRcut( double theRcut );
-  void setEcr( double theEcr );
   void setDefaultEcr( double theEcr );
-  void setEcr( double theEcr, double theEst );
   void setDefaultEcr( double theEcr, double theEst );
   void checkCutOffs( void );
 
@@ -186,12 +184,8 @@ class SimInfo{ (public)
 
   SimState* myConfiguration;
 
-  double origRcut, origEcr;
-  int boxIsInit, haveOrigRcut, haveOrigEcr;
+  int boxIsInit, haveRcut, haveEcr;
 
-  double oldEcr;
-  double oldRcut;
-
   double rList, rCut; // variables for the neighborlist
   double ecr;             // the electrostatic cutoff radius
   double est;             // the electrostatic skin thickness