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 597 by mmeineke, Mon Jul 14 21:28:54 2003 UTC vs.
Revision 746 by mmeineke, Thu Sep 4 21:48:35 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
# Line 32 | Line 36 | class SimInfo{ (public)
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
39 +  unsigned int nZconstraints; // the number of zConstraints
40  
41    unsigned int setTemp;   // boolean to set the temperature at each sampleTime
42 +  unsigned int resetIntegrator; // boolean to reset the integrator
43  
44    unsigned int n_dipoles; // number of dipoles
39 –  double ecr;             // the electrostatic cutoff radius
40 –  double est;             // the electrostatic skin thickness
41 –  double dielectric;      // the dielectric of the medium for reaction field
45  
46 +
47    int n_exclude;  // the # of pairs excluded from long range forces
48    Exclude** excludes;       // the pairs themselves
49  
# Line 65 | Line 69 | class SimInfo{ (public)
69                        //  
70    double HmatInv[3][3];
71  
72 <  double boxLx, boxLy, boxLz; // the box Lengths
72 >  double boxL[3]; // The Lengths of the 3 column vectors of Hmat
73    double boxVol;
74    int orthoRhombic;
75    
76  
77 +  double dielectric;      // the dielectric of the medium for reaction field
78  
74 –  double rList, rCut; // variables for the neighborlist
79    
80    int usePBC; // whether we use periodic boundry conditions.
81    int useLJ;
# Line 86 | Line 90 | class SimInfo{ (public)
90    double sampleTime, statusTime; // the position and energy dump frequencies
91    double target_temp;            // the target temperature of the system
92    double thermalTime;            // the temp kick interval
93 +  double currentTime;            // Used primarily for correlation Functions
94 +  double resetTime;              // Use to reset the integrator periodically
95  
96    int n_mol;           // n_molecules;
97    Molecule* molecules; // the array of molecules
# Line 104 | Line 110 | class SimInfo{ (public)
110    char sampleName[300]; // the name of the dump file to be written
111    char statusName[300]; // the name of the stat file to be written
112  
113 <
113 >  int seed;                    //seed for random number generator
114    // refreshes the sim if things get changed (load balanceing, volume
115    // adjustment, etc.)
116  
# Line 114 | Line 120 | class SimInfo{ (public)
120    // sets the internal function pointer to fortran.
121  
122    void setInternal( void (*fSetup) setFortranSimList,
123 <                    void (*fBox) setFortranBoxList ){
123 >                    void (*fBox) setFortranBoxList,
124 >                    void (*fCut) notifyFortranCutOffList ){
125      setFsimulation = fSetup;
126      setFortranBoxSize = fBox;
127 +    notifyFortranCutOffs = fCut;
128    }
129  
130    int getNDF();
# Line 126 | Line 134 | class SimInfo{ (public)
134    void setBoxM( double newBox[3][3] );
135    void getBoxM( double theBox[3][3] );
136    void scaleBox( double scale );
137 +  
138 +  void setRcut( double theRcut );
139 +  void setEcr( double theEcr );
140 +  void setEcr( double theEcr, double theEst );
141  
142 +  double getRcut( void )  { return rCut; }
143 +  double getRlist( void ) { return rList; }
144 +  double getEcr( void )   { return ecr; }
145 +  double getEst( void )   { return est; }
146 +
147 +  void setTime( double theTime ) { currentTime = theTime; }
148 +  void incrTime( double dt ) { currentTime += dt; }
149 +  void decrTime( double dt ) { currentTime -= dt; }
150 +  double getTime( void ) { return currentTime; }
151 +
152    void wrapVector( double thePos[3] );
153  
154    void matMul3(double a[3][3], double b[3][3], double out[3][3]);
# Line 136 | Line 158 | class SimInfo{ (public)
158    void printMat3(double A[3][3]);
159    void printMat9(double A[9]);
160    double matDet3(double m[3][3]);
161 +
162 +  SimState* getConfiguration( void ) { return myConfiguration; }
163    
164 +  void addProperty(GenericData* prop);
165 +  GenericData* getProperty(const string& propName);
166 +  vector<GenericData*> getProperties();      
167 +
168 +  int getSeed(void) {  return seed; }
169 +  void setSeed(int theSeed) {  seed = theSeed;}
170 +
171   private:
172 +
173 +  SimState* myConfiguration;
174 +
175 +  double origRcut, origEcr;
176 +  int boxIsInit, haveOrigRcut, haveOrigEcr;
177 +
178 +  double oldEcr;
179 +  double oldRcut;
180 +
181 +  double rList, rCut; // variables for the neighborlist
182 +  double ecr;             // the electrostatic cutoff radius
183 +  double est;             // the electrostatic skin thickness
184 +  double maxCutoff;
185    
186    void calcHmatInv( void );
187    void calcBoxL();
188 +  void checkCutOffs( void );
189  
190    // private function to initialize the fortran side of the simulation
191    void (*setFsimulation) setFortranSimList;
192  
193    void (*setFortranBoxSize) setFortranBoxList;
194 +  
195 +  void (*notifyFortranCutOffs) notifyFortranCutOffList;
196 +  
197 +  //Addtional Properties of SimInfo
198 +  map<string, GenericData*> properties;
199 +
200   };
201  
202  

Diff Legend

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