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

Comparing:
branches/mmeineke/mdtools/headers/SimInfo.hpp (file contents), Revision 10 by mmeineke, Tue Jul 9 18:40:59 2002 UTC vs.
trunk/mdtools/headers/SimInfo.hpp (file contents), Revision 197 by mmeineke, Fri Dec 6 21:20:39 2002 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines