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 1031 by tim, Fri Feb 6 18:58:06 2004 UTC vs.
Revision 1214 by gezelter, Tue Jun 1 18:42:58 2004 UTC

# Line 6 | Line 6
6   #include <vector>
7  
8   #include "Atom.hpp"
9 + #include "RigidBody.hpp"
10   #include "Molecule.hpp"
11 + #include "Exclude.hpp"
12 + #include "SkipList.hpp"
13   #include "AbstractClasses.hpp"
14   #include "MakeStamps.hpp"
15   #include "SimState.hpp"
16 + #include "Restraints.hpp"
17  
18   #define __C
19   #include "fSimulation.h"
20   #include "fortranWrapDefines.hpp"
21   #include "GenericData.hpp"
22 < #include "Minimizer.hpp"
22 > //#include "Minimizer.hpp"
23 > //#include "OOPSEMinimizer.hpp"
24  
25  
26 + double roundMe( double x );
27 + class OOPSEMinimizer;
28   class SimInfo{
29  
30   public:
# Line 27 | Line 34 | class SimInfo{ (public)
34  
35    int n_atoms; // the number of atoms
36    Atom **atoms; // the array of atom objects
37 +
38 +  vector<RigidBody*> rigidBodies;  // A vector of rigid bodies
39 +  vector<StuntDouble*> integrableObjects;
40    
41    double tau[9]; // the stress tensor
42  
# Line 44 | Line 54 | class SimInfo{ (public)
54  
55    int n_dipoles; // number of dipoles
56  
57 <
58 <  int n_exclude;  // the # of pairs excluded from long range forces
49 <  Exclude** excludes;       // the pairs themselves
50 <
57 >  int n_exclude;
58 >  Exclude* excludes;  // the exclude list for ignoring pairs in fortran
59    int nGlobalExcludes;
60    int* globalExcludes; // same as above, but these guys participate in
61                         // no long range forces.
# Line 86 | 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 110 | Line 118 | class SimInfo{ (public)
118    char mixingRule[100]; // the mixing rules for Lennard jones/van der walls
119    BaseIntegrator *the_integrator; // the integrator of the simulation
120  
121 <  Minimizer* the_minimizer; // the energy minimizer
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 137 | Line 161 | class SimInfo{ (public)
161    int getNDF();
162    int getNDFraw();
163    int getNDFtranslational();
164 <
164 >  int getTotIntegrableObjects();
165    void setBox( double newBox[3] );
166    void setBoxM( double newBox[3][3] );
167    void getBoxM( double theBox[3][3] );
168    void scaleBox( double scale );
169    
170    void setDefaultRcut( double theRcut );
171 <  void setDefaultEcr( double theEcr );
148 <  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; }
154 <  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 161 | Line 183 | class SimInfo{ (public)
183  
184    void wrapVector( double thePos[3] );
185  
164  void matMul3(double a[3][3], double b[3][3], double out[3][3]);
165  void matVecMul3(double m[3][3], double inVec[3], double outVec[3]);
166  void invertMat3(double in[3][3], double out[3][3]);
167  void transposeMat3(double in[3][3], double out[3][3]);
168  void printMat3(double A[3][3]);
169  void printMat9(double A[9]);
170  double matDet3(double m[3][3]);
171  double matTrace3(double m[3][3]);
172
173  void crossProduct3(double a[3],double b[3], double out[3]);
174  double dotProduct3(double a[3], double b[3]);
175  double length3(double a[3]);
176  
186    SimState* getConfiguration( void ) { return myConfiguration; }
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 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;
207    double distYZ;
208    double distZX;
200
201
209    
210    void calcHmatInv( void );
211    void calcBoxL();
212    double calcMaxCutOff();
213  
207
214    // private function to initialize the fortran side of the simulation
215    setFortranSim_TD setFsimulation;
216  
# Line 214 | 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  
221
231   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines