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 674 by mmeineke, Mon Aug 11 18:29:46 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 n_Zconstraints; // the number of zConstraints
40  
41    unsigned int setTemp;   // boolean to set the temperature at each sampleTime
42  
# Line 151 | Line 156 | class SimInfo{ (public)
156    void printMat3(double A[3][3]);
157    void printMat9(double A[9]);
158    double matDet3(double m[3][3]);
159 +
160 +  SimState* getConfiguration( void ) { return myConfiguration; }
161    
162 +  void addProperty(GenericData* prop);
163 +  GenericData* getProperty(const string& propName);
164 +  vector<GenericData*> getProperties();      
165 +
166   private:
167  
168 +  SimState* myConfiguration;
169 +
170    double origRcut, origEcr;
171    int boxIsInit, haveOrigRcut, haveOrigEcr;
172  
# Line 175 | Line 188 | class SimInfo{ (public)
188    void (*setFortranBoxSize) setFortranBoxList;
189    
190    void (*notifyFortranCutOffs) notifyFortranCutOffList;
191 +  
192 +  //Addtional Properties of SimInfo
193 +  map<string, GenericData*> properties;
194  
195   };
196  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines