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

Comparing trunk/OOPSE/libmdtools/SimInfo.hpp (file contents):
Revision 1118 by tim, Mon Apr 19 03:52:27 2004 UTC vs.
Revision 1157 by tim, Tue May 11 20:33:41 2004 UTC

# Line 20 | Line 20
20   #include "GenericData.hpp"
21   //#include "Minimizer.hpp"
22   //#include "OOPSEMinimizer.hpp"
23 <
23 > double roundMe( double x );
24   class OOPSEMinimizer;
25   class SimInfo{
26  
# Line 91 | Line 91 | class SimInfo{ (public)
91    int useReactionField;
92    int useGB;
93    int useEAM;
94 <  
94 >  bool haveCutoffGroups;
95    bool useInitXSstate;
96    double orthoTolerance;
97  
# Line 123 | Line 123 | class SimInfo{ (public)
123    char statusName[300]; // the name of the stat file to be written
124  
125    int seed;                    //seed for random number generator
126 +
127 +
128 +  vector<double> mfact;
129 +  int ngroup;
130 +  vector<int> groupList;
131 +  vector<int> groupStart;
132 +  
133    // refreshes the sim if things get changed (load balanceing, volume
134    // adjustment, etc.)
135  
# Line 149 | Line 156 | class SimInfo{ (public)
156    void scaleBox( double scale );
157    
158    void setDefaultRcut( double theRcut );
159 <  void setDefaultEcr( double theEcr );
153 <  void setDefaultEcr( double theEcr, double theEst );
159 >  void setDefaultRcut( double theRcut, double theRsw );
160    void checkCutOffs( void );
161  
162    double getRcut( void )  { return rCut; }
163    double getRlist( void ) { return rList; }
164 <  double getEcr( void )   { return ecr; }
159 <  double getEst( void )   { return est; }
164 >  double getRsw( void )   { return rSw; }
165    double getMaxCutoff( void ) { return maxCutoff; }
166 <
166 >  
167    void setTime( double theTime ) { currentTime = theTime; }
168    void incrTime( double the_dt ) { currentTime += the_dt; }
169    void decrTime( double the_dt ) { currentTime -= the_dt; }
# Line 179 | Line 184 | class SimInfo{ (public)
184  
185    SimState* myConfiguration;
186  
187 <  int boxIsInit, haveRcut, haveEcr;
187 >  int boxIsInit, haveRcut, haveRsw;
188  
189    double rList, rCut; // variables for the neighborlist
190 <  double ecr;             // the electrostatic cutoff radius
191 <  double est;             // the electrostatic skin thickness
190 >  double rSw;         // the switching radius
191 >
192    double maxCutoff;
193  
194    double distXY;
# Line 206 | Line 211 | class SimInfo{ (public)
211  
212   };
213  
214 + void getFortranGroupArray(SimInfo* info, vector<double>& mfact, int& ngroup,
215 +                                                          vector<int>& groupList, vector<int>& groupStart);
216 +
217   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines