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 644 by mmeineke, Tue Jul 22 16:41:08 2003 UTC vs.
Revision 787 by mmeineke, Thu Sep 25 19:27:15 2003 UTC

# Line 1 | Line 1
1   #ifndef __SIMINFO_H__
2   #define __SIMINFO_H__
3  
4 + #include <map>
5 + #include <string>
6 + #include <vector>
7  
5 –
8   #include "Atom.hpp"
9   #include "Molecule.hpp"
10   #include "AbstractClasses.hpp"
11   #include "MakeStamps.hpp"
12 + #include "SimState.hpp"
13  
14   #define __C
15   #include "fSimulation.h"
16   #include "fortranWrapDefines.hpp"
17 + #include "GenericData.hpp"
18  
19  
20  
# Line 19 | Line 23 | class SimInfo{ (public)
23   public:
24  
25    SimInfo();
26 <  ~SimInfo(){}
26 >  ~SimInfo();
27  
28    int n_atoms; // the number of atoms
29    Atom **atoms; // the array of atom objects
30    
31    double tau[9]; // the stress tensor
32  
33 <  unsigned int n_bonds;    // number of bends
34 <  unsigned int n_bends;    // number of bends
35 <  unsigned int n_torsions; // number of torsions
36 <  unsigned int n_oriented; // number of of atoms with orientation
37 <  unsigned int ndf;        // number of actual degrees of freedom
38 <  unsigned int ndfRaw;     // number of settable degrees of freedom
33 >  int n_bonds;    // number of bends
34 >  int n_bends;    // number of bends
35 >  int n_torsions; // number of torsions
36 >  int n_oriented; // number of of atoms with orientation
37 >  int ndf;        // number of actual degrees of freedom
38 >  int ndfRaw;     // number of settable degrees of freedom
39 >  int ndfTrans;   // number of translational degrees of freedom
40 >  int nZconstraints; // the number of zConstraints
41  
42 <  unsigned int setTemp;   // boolean to set the temperature at each sampleTime
42 >  int setTemp;   // boolean to set the temperature at each sampleTime
43 >  int resetIntegrator; // boolean to reset the integrator
44  
45 <  unsigned int n_dipoles; // number of dipoles
45 >  int n_dipoles; // number of dipoles
46  
47  
48    int n_exclude;  // the # of pairs excluded from long range forces
# Line 50 | Line 57 | class SimInfo{ (public)
57  
58    int n_constraints; // the number of constraints on the system
59  
60 <  unsigned int n_SRI;   // the number of short range interactions
60 >  int n_SRI;   // the number of short range interactions
61  
62    double lrPot; // the potential energy from the long range calculations.
63  
# Line 85 | Line 92 | class SimInfo{ (public)
92    double target_temp;            // the target temperature of the system
93    double thermalTime;            // the temp kick interval
94    double currentTime;            // Used primarily for correlation Functions
95 +  double resetTime;              // Use to reset the integrator periodically
96  
97    int n_mol;           // n_molecules;
98    Molecule* molecules; // the array of molecules
# Line 103 | Line 111 | class SimInfo{ (public)
111    char sampleName[300]; // the name of the dump file to be written
112    char statusName[300]; // the name of the stat file to be written
113  
114 <
114 >  int seed;                    //seed for random number generator
115    // refreshes the sim if things get changed (load balanceing, volume
116    // adjustment, etc.)
117  
# Line 122 | Line 130 | class SimInfo{ (public)
130  
131    int getNDF();
132    int getNDFraw();
133 +  int getNDFtranslational();
134  
135    void setBox( double newBox[3] );
136    void setBoxM( double newBox[3][3] );
# Line 151 | Line 160 | class SimInfo{ (public)
160    void printMat3(double A[3][3]);
161    void printMat9(double A[9]);
162    double matDet3(double m[3][3]);
163 +  double matTrace3(double m[3][3]);
164 +
165 +  void crossProduct3(double a[3],double b[3], double out[3]);
166 +  double dotProduct3(double a[3], double b[3]);
167 +  double length3(double a[3]);
168    
169 +  SimState* getConfiguration( void ) { return myConfiguration; }
170 +  
171 +  void addProperty(GenericData* prop);
172 +  GenericData* getProperty(const string& propName);
173 +  vector<GenericData*> getProperties();      
174 +
175 +  int getSeed(void) {  return seed; }
176 +  void setSeed(int theSeed) {  seed = theSeed;}
177 +
178   private:
179  
180 +  SimState* myConfiguration;
181 +
182    double origRcut, origEcr;
183    int boxIsInit, haveOrigRcut, haveOrigEcr;
184  
# Line 164 | Line 189 | class SimInfo{ (public)
189    double ecr;             // the electrostatic cutoff radius
190    double est;             // the electrostatic skin thickness
191    double maxCutoff;
192 +
193 +  double distXY;
194 +  double distYZ;
195 +  double distZX;
196    
197    void calcHmatInv( void );
198    void calcBoxL();
199 +  double calcMaxCutOff();
200    void checkCutOffs( void );
201  
202    // private function to initialize the fortran side of the simulation
# Line 175 | Line 205 | class SimInfo{ (public)
205    void (*setFortranBoxSize) setFortranBoxList;
206    
207    void (*notifyFortranCutOffs) notifyFortranCutOffList;
208 +  
209 +  //Addtional Properties of SimInfo
210 +  map<string, GenericData*> properties;
211  
212   };
213  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines