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 660 by tim, Thu Jul 31 19:59:34 2003 UTC vs.
Revision 836 by mmeineke, Tue Oct 28 22:25:46 2003 UTC

# Line 9 | Line 9
9   #include "Molecule.hpp"
10   #include "AbstractClasses.hpp"
11   #include "MakeStamps.hpp"
12 + #include "SimState.hpp"
13  
14   #define __C
15   #include "fSimulation.h"
# Line 29 | Line 30 | class SimInfo{ (public)
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 53 | 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 88 | 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
99    
100 <  int nComponents;           // the number of componentsin the system
100 >  int nComponents;           // the number of components in the system
101    int* componentsNmol;       // the number of molecules of each component
102    MoleculeStamp** compStamps;// the stamps matching the components
103    LinkedMolStamp* headStamp; // list of stamps used in the simulation
# Line 106 | 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 115 | Line 120 | class SimInfo{ (public)
120  
121    // sets the internal function pointer to fortran.
122  
123 <  void setInternal( void (*fSetup) setFortranSimList,
124 <                    void (*fBox) setFortranBoxList,
125 <                    void (*fCut) notifyFortranCutOffList ){
123 >  void setInternal( setFortranSim_TD fSetup,
124 >                    setFortranBox_TD fBox,
125 >                    notifyFortranCutOff_TD fCut){
126      setFsimulation = fSetup;
127      setFortranBoxSize = fBox;
128      notifyFortranCutOffs = fCut;
# Line 125 | 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 139 | Line 145 | class SimInfo{ (public)
145    double getRlist( void ) { return rList; }
146    double getEcr( void )   { return ecr; }
147    double getEst( void )   { return est; }
148 +  double getMaxCutoff( void ) { return maxCutoff; }
149  
150    void setTime( double theTime ) { currentTime = theTime; }
151 <  void incrTime( double dt ) { currentTime += dt; }
152 <  void decrTime( double dt ) { currentTime -= dt; }
151 >  void incrTime( double the_dt ) { currentTime += the_dt; }
152 >  void decrTime( double the_dt ) { currentTime -= the_dt; }
153    double getTime( void ) { return currentTime; }
154  
155    void wrapVector( double thePos[3] );
# Line 154 | Line 161 | class SimInfo{ (public)
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();      
175 <  
175 >
176 >  int getSeed(void) {  return seed; }
177 >  void setSeed(int theSeed) {  seed = theSeed;}
178 >
179   private:
180  
181 +  SimState* myConfiguration;
182 +
183    double origRcut, origEcr;
184    int boxIsInit, haveOrigRcut, haveOrigEcr;
185  
# Line 172 | Line 190 | class SimInfo{ (public)
190    double ecr;             // the electrostatic cutoff radius
191    double est;             // the electrostatic skin thickness
192    double maxCutoff;
193 +
194 +  double distXY;
195 +  double distYZ;
196 +  double distZX;
197    
198    void calcHmatInv( void );
199    void calcBoxL();
200 +  double calcMaxCutOff();
201    void checkCutOffs( void );
202  
203    // private function to initialize the fortran side of the simulation
204 <  void (*setFsimulation) setFortranSimList;
204 >  setFortranSim_TD setFsimulation;
205  
206 <  void (*setFortranBoxSize) setFortranBoxList;
206 >  setFortranBox_TD setFortranBoxSize;
207    
208 <  void (*notifyFortranCutOffs) notifyFortranCutOffList;
208 >  notifyFortranCutOff_TD notifyFortranCutOffs;
209    
210    //Addtional Properties of SimInfo
211    map<string, GenericData*> properties;

Diff Legend

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