ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/mdtools/headers/SimInfo.hpp
(Generate patch)

Comparing trunk/mdtools/headers/SimInfo.hpp (file contents):
Revision 11 by mmeineke, Tue Jul 9 18:40:59 2002 UTC vs.
Revision 215 by chuckv, Thu Dec 19 21:59:51 2002 UTC

# Line 6 | Line 6
6   #include "Atom.hpp"
7   #include "Molecule.hpp"
8   #include "AbstractClasses.hpp"
9 + #include "MakeStamps.hpp"
10  
11   class SimInfo{
12  
13   public:
14 <  
15 <  SimInfo(){
16 <    excludes = NULL;
17 <    n_constraints = 0;
14 >
15 >  SimInfo(){
16 >    excludes = NULL;
17 >    n_constraints = 0;
18      n_oriented = 0;
19      n_dipoles = 0;
20      longRange = NULL;
# Line 23 | Line 24 | class SimInfo{ (public)
24    }
25    ~SimInfo(){}
26  
27 <  unsigned int n_atoms; // the number of atoms
27 >  int n_atoms; // the number of atoms
28    Atom **atoms; // the array of atom objects
29  
30    unsigned int n_bonds;    // number of bends
# Line 36 | Line 37 | class SimInfo{ (public)
37    unsigned int n_dipoles; // number of dipoles
38    double rRF;             // the reaction field cut off radius
39    double dielectric;      // the dielectric of the medium for reaction field
40 <  
40 >
41    unsigned int n_exclude;  // the number of pairs excluded from LJ and VDW
42    ex_pair *excludes;       // the pairs themselves
43 <  
43 >
44    int n_constraints; // the number of constraints on the system
45  
46    unsigned int n_SRI;   // the number of short range interactions
47 <  SRI **sr_interactions;// the array of short range force objects
47 >  SRI **sr_interactions;// the array of short range force objects
48    LRI *longRange;       // the long range force object
49  
50    double box_x, box_y, box_z; // the periodic boundry conditions
51 <  
52 <  double dt, run_time;           // the time step and total time
51 >
52 >  double dt, run_time;           // the time step and total time
53    double sampleTime, statusTime; // the position and energy dump frequencies
54    double target_temp;            // the target temperature of the system
55    double thermalTime;            // the temp kick interval
56 <  
56 >
57    int n_mol;           // n_molecules;
58    Molecule* molecules; // the array of molecules
59 +  
60 +  int nComponents;           // the number of componentsin the system
61 +  int* componentsNmol;       // the number of molecules of each component
62 +  MoleculeStamp** compStamps;// the stamps matching the components
63 +  LinkedMolStamp* headStamp; // list of stamps used in the simulation
64 +  
65  
66 +
67    Integrator *the_integrator; // the integrator of the simulation
68  
69    char finalName[300];  // the name of the eor file to be written
70    char sampleName[300]; // the name of the dump file to be written
71    char statusName[300]; // the name of the stat file to be written
72 +
73   };
65  
74  
75  
76 +
77   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines