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 1144 by tim, Sat May 1 18:52:38 2004 UTC vs.
Revision 1212 by chrisfen, Tue Jun 1 17:15:43 2004 UTC

# Line 13 | Line 13
13   #include "AbstractClasses.hpp"
14   #include "MakeStamps.hpp"
15   #include "SimState.hpp"
16 + #include "Restraints.hpp"
17  
18   #define __C
19   #include "fSimulation.h"
# Line 20 | Line 21
21   #include "GenericData.hpp"
22   //#include "Minimizer.hpp"
23   //#include "OOPSEMinimizer.hpp"
24 +
25 +
26   double roundMe( double x );
27   class OOPSEMinimizer;
28   class SimInfo{
# Line 91 | Line 94 | class SimInfo{ (public)
94    int useReactionField;
95    int useGB;
96    int useEAM;
97 <  int useMolecularCutoffs;
95 <  
97 >  bool haveCutoffGroups;
98    bool useInitXSstate;
99    double orthoTolerance;
100  
# Line 117 | Line 119 | class SimInfo{ (public)
119    BaseIntegrator *the_integrator; // the integrator of the simulation
120  
121    OOPSEMinimizer* the_minimizer; // the energy minimizer
122 +  Restraints* restraint;
123    bool has_minimizer;
124  
125    char finalName[300];  // the name of the eor file to be written
126    char sampleName[300]; // the name of the dump file to be written
127    char statusName[300]; // the name of the stat file to be written
128 +  char rawPotName[300];  // the name of the raw file to be written
129  
130    int seed;                    //seed for random number generator
131  
132 +  int useSolidThermInt;  // is solid-state thermodynamic integration being used
133 +  int useLiquidThermInt; // is liquid thermodynamic integration being used
134 +  double thermIntLambda; // lambda for TI
135 +  double thermIntK;      // power of lambda for TI
136 +  double vRaw;           // unperturbed potential for TI
137 +  double vHarm;          // harmonic potential for TI
138 +  int i;                 // just an int
139  
140    vector<double> mfact;
141    int ngroup;
# Line 157 | Line 168 | class SimInfo{ (public)
168    void scaleBox( double scale );
169    
170    void setDefaultRcut( double theRcut );
171 <  void setDefaultEcr( double theEcr );
161 <  void setDefaultEcr( double theEcr, double theEst );
171 >  void setDefaultRcut( double theRcut, double theRsw );
172    void checkCutOffs( void );
173  
174    double getRcut( void )  { return rCut; }
175    double getRlist( void ) { return rList; }
176 <  double getEcr( void )   { return ecr; }
167 <  double getEst( void )   { return est; }
176 >  double getRsw( void )   { return rSw; }
177    double getMaxCutoff( void ) { return maxCutoff; }
178 <
178 >  
179    void setTime( double theTime ) { currentTime = theTime; }
180    void incrTime( double the_dt ) { currentTime += the_dt; }
181    void decrTime( double the_dt ) { currentTime -= the_dt; }
# Line 187 | Line 196 | class SimInfo{ (public)
196  
197    SimState* myConfiguration;
198  
199 <  int boxIsInit, haveRcut, haveEcr;
199 >  int boxIsInit, haveRcut, haveRsw;
200  
201    double rList, rCut; // variables for the neighborlist
202 <  double ecr;             // the electrostatic cutoff radius
203 <  double est;             // the electrostatic skin thickness
202 >  double rSw;         // the switching radius
203 >
204    double maxCutoff;
205  
206    double distXY;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines