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 1154 by gezelter, Tue May 11 16:00:22 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"
# Line 15 | Line 18
18   #include "fSimulation.h"
19   #include "fortranWrapDefines.hpp"
20   #include "GenericData.hpp"
21 < #include "Minimizer.hpp"
22 <
23 <
21 > //#include "Minimizer.hpp"
22 > //#include "OOPSEMinimizer.hpp"
23 > double roundMe( double x );
24 > class OOPSEMinimizer;
25   class SimInfo{
26  
27   public:
# Line 27 | Line 31 | class SimInfo{ (public)
31  
32    int n_atoms; // the number of atoms
33    Atom **atoms; // the array of atom objects
34 +
35 +  vector<RigidBody*> rigidBodies;  // A vector of rigid bodies
36 +  vector<StuntDouble*> integrableObjects;
37    
38    double tau[9]; // the stress tensor
39  
# Line 44 | Line 51 | class SimInfo{ (public)
51  
52    int n_dipoles; // number of dipoles
53  
54 <
55 <  int n_exclude;  // the # of pairs excluded from long range forces
49 <  Exclude** excludes;       // the pairs themselves
50 <
54 >  int n_exclude;
55 >  Exclude* excludes;  // the exclude list for ignoring pairs in fortran
56    int nGlobalExcludes;
57    int* globalExcludes; // same as above, but these guys participate in
58                         // no long range forces.
# Line 86 | Line 91 | class SimInfo{ (public)
91    int useReactionField;
92    int useGB;
93    int useEAM;
94 +  int useMolecularCutoffs;
95    
96    bool useInitXSstate;
97    double orthoTolerance;
# Line 110 | Line 116 | class SimInfo{ (public)
116    char mixingRule[100]; // the mixing rules for Lennard jones/van der walls
117    BaseIntegrator *the_integrator; // the integrator of the simulation
118  
119 <  Minimizer* the_minimizer; // the energy minimizer
119 >  OOPSEMinimizer* the_minimizer; // the energy minimizer
120    bool has_minimizer;
121  
122    char finalName[300];  // the name of the eor file to be written
# Line 118 | Line 124 | class SimInfo{ (public)
124    char statusName[300]; // the name of the stat file to be written
125  
126    int seed;                    //seed for random number generator
127 +
128 +
129 +  vector<double> mfact;
130 +  int ngroup;
131 +  vector<int> groupList;
132 +  vector<int> groupStart;
133 +  
134    // refreshes the sim if things get changed (load balanceing, volume
135    // adjustment, etc.)
136  
# Line 137 | Line 150 | class SimInfo{ (public)
150    int getNDF();
151    int getNDFraw();
152    int getNDFtranslational();
153 <
153 >  int getTotIntegrableObjects();
154    void setBox( double newBox[3] );
155    void setBoxM( double newBox[3][3] );
156    void getBoxM( double theBox[3][3] );
157    void scaleBox( double scale );
158    
159    void setDefaultRcut( double theRcut );
160 <  void setDefaultEcr( double theEcr );
148 <  void setDefaultEcr( double theEcr, double theEst );
160 >  void setDefaultRcut( double theRcut, double theRsw );
161    void checkCutOffs( void );
162  
163    double getRcut( void )  { return rCut; }
164    double getRlist( void ) { return rList; }
165 <  double getEcr( void )   { return ecr; }
154 <  double getEst( void )   { return est; }
165 >  double getRsw( void )   { return rSw; }
166    double getMaxCutoff( void ) { return maxCutoff; }
167 <
167 >  
168    void setTime( double theTime ) { currentTime = theTime; }
169    void incrTime( double the_dt ) { currentTime += the_dt; }
170    void decrTime( double the_dt ) { currentTime -= the_dt; }
# Line 161 | Line 172 | class SimInfo{ (public)
172  
173    void wrapVector( double thePos[3] );
174  
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  
175    SimState* getConfiguration( void ) { return myConfiguration; }
176    
177    void addProperty(GenericData* prop);
178    GenericData* getProperty(const string& propName);
179 <  vector<GenericData*> getProperties();      
179 >  //vector<GenericData*>& getProperties()  {return properties;}    
180  
181    int getSeed(void) {  return seed; }
182    void setSeed(int theSeed) {  seed = theSeed;}
# Line 187 | Line 185 | class SimInfo{ (public)
185  
186    SimState* myConfiguration;
187  
188 <  int boxIsInit, haveRcut, haveEcr;
188 >  int boxIsInit, haveRcut, haveRsw;
189  
190    double rList, rCut; // variables for the neighborlist
191 <  double ecr;             // the electrostatic cutoff radius
192 <  double est;             // the electrostatic skin thickness
191 >  double rSw;         // the switching radius
192 >
193    double maxCutoff;
194  
195    double distXY;
196    double distYZ;
197    double distZX;
200
201
198    
199    void calcHmatInv( void );
200    void calcBoxL();
201    double calcMaxCutOff();
202  
207
203    // private function to initialize the fortran side of the simulation
204    setFortranSim_TD setFsimulation;
205  
# Line 217 | Line 212 | class SimInfo{ (public)
212  
213   };
214  
215 + void getFortranGroupArray(SimInfo* info, vector<double>& mfact, int& ngroup,
216 +                                                          vector<int>& groupList, vector<int>& groupStart);
217  
221
218   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines