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 836 by mmeineke, Tue Oct 28 22:25:46 2003 UTC vs.
Revision 1139 by gezelter, Wed Apr 28 22:06:29 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 <
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 81 | Line 86 | class SimInfo{ (public)
86    int usePBC; // whether we use periodic boundry conditions.
87    int useLJ;
88    int useSticky;
89 <  int useDipole;
89 >  int useCharges;
90 >  int useDipoles;
91    int useReactionField;
92    int useGB;
93    int useEAM;
94 +  int useMolecularCutoffs;
95    
96 +  bool useInitXSstate;
97 +  double orthoTolerance;
98  
99    double dt, run_time;           // the time step and total time
100    double sampleTime, statusTime; // the position and energy dump frequencies
# Line 107 | 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 +  OOPSEMinimizer* the_minimizer; // the energy minimizer
120 +  bool has_minimizer;
121 +
122    char finalName[300];  // the name of the eor file to be written
123    char sampleName[300]; // the name of the dump file to be written
124    char statusName[300]; // the name of the stat file to be written
# Line 131 | Line 143 | class SimInfo{ (public)
143    int getNDF();
144    int getNDFraw();
145    int getNDFtranslational();
146 <
146 >  int getTotIntegrableObjects();
147    void setBox( double newBox[3] );
148    void setBoxM( double newBox[3][3] );
149    void getBoxM( double theBox[3][3] );
150    void scaleBox( double scale );
151    
152 <  void setRcut( double theRcut );
153 <  void setEcr( double theEcr );
154 <  void setEcr( double theEcr, double theEst );
152 >  void setDefaultRcut( double theRcut );
153 >  void setDefaultEcr( double theEcr );
154 >  void setDefaultEcr( double theEcr, double theEst );
155 >  void checkCutOffs( void );
156  
157    double getRcut( void )  { return rCut; }
158    double getRlist( void ) { return rList; }
# Line 154 | Line 167 | class SimInfo{ (public)
167  
168    void wrapVector( double thePos[3] );
169  
157  void matMul3(double a[3][3], double b[3][3], double out[3][3]);
158  void matVecMul3(double m[3][3], double inVec[3], double outVec[3]);
159  void invertMat3(double in[3][3], double out[3][3]);
160  void transposeMat3(double in[3][3], double out[3][3]);
161  void printMat3(double A[3][3]);
162  void printMat9(double A[9]);
163  double matDet3(double m[3][3]);
164  double matTrace3(double m[3][3]);
165
166  void crossProduct3(double a[3],double b[3], double out[3]);
167  double dotProduct3(double a[3], double b[3]);
168  double length3(double a[3]);
169  
170    SimState* getConfiguration( void ) { return myConfiguration; }
171    
172    void addProperty(GenericData* prop);
173    GenericData* getProperty(const string& propName);
174 <  vector<GenericData*> getProperties();      
174 >  //vector<GenericData*>& getProperties()  {return properties;}    
175  
176    int getSeed(void) {  return seed; }
177    void setSeed(int theSeed) {  seed = theSeed;}
# Line 180 | Line 180 | class SimInfo{ (public)
180  
181    SimState* myConfiguration;
182  
183 <  double origRcut, origEcr;
184 <  int boxIsInit, haveOrigRcut, haveOrigEcr;
183 >  int boxIsInit, haveRcut, haveEcr;
184  
186  double oldEcr;
187  double oldRcut;
188
185    double rList, rCut; // variables for the neighborlist
186    double ecr;             // the electrostatic cutoff radius
187    double est;             // the electrostatic skin thickness
# Line 198 | Line 194 | class SimInfo{ (public)
194    void calcHmatInv( void );
195    void calcBoxL();
196    double calcMaxCutOff();
201  void checkCutOffs( void );
197  
198    // private function to initialize the fortran side of the simulation
199    setFortranSim_TD setFsimulation;
# Line 212 | Line 207 | class SimInfo{ (public)
207  
208   };
209  
215
216
210   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines