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 1108 by tim, Wed Apr 14 15:37:41 2004 UTC vs.
Revision 1214 by gezelter, Tue Jun 1 18:42:58 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 21 | Line 22 | class OOPSEMinimizer;
22   //#include "Minimizer.hpp"
23   //#include "OOPSEMinimizer.hpp"
24  
25 +
26 + double roundMe( double x );
27   class OOPSEMinimizer;
28   class SimInfo{
29  
# Line 91 | Line 94 | class SimInfo{ (public)
94    int useReactionField;
95    int useGB;
96    int useEAM;
97 <  
97 >  bool haveCutoffGroups;
98    bool useInitXSstate;
99    double orthoTolerance;
100  
# Line 116 | 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 +  vector<int> FglobalGroupMembership;
142 +  int ngroup;
143 +  int* globalGroupMembership;
144 +  
145    // refreshes the sim if things get changed (load balanceing, volume
146    // adjustment, etc.)
147  
# Line 149 | Line 168 | class SimInfo{ (public)
168    void scaleBox( double scale );
169    
170    void setDefaultRcut( double theRcut );
171 <  void setDefaultEcr( double theEcr );
153 <  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; }
159 <  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 170 | Line 187 | class SimInfo{ (public)
187    
188    void addProperty(GenericData* prop);
189    GenericData* getProperty(const string& propName);
190 <  vector<GenericData*> getProperties();      
190 >  //vector<GenericData*>& getProperties()  {return properties;}    
191  
192    int getSeed(void) {  return seed; }
193    void setSeed(int theSeed) {  seed = theSeed;}
# Line 179 | 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;
# Line 203 | Line 220 | class SimInfo{ (public)
220    
221    //Addtional Properties of SimInfo
222    map<string, GenericData*> properties;
223 +  void getFortranGroupArrays(SimInfo* info,
224 +                             vector<int>& FglobalGroupMembership,
225 +                             vector<double>& mfact);
226  
227 +
228   };
229  
230 +
231   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines