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 131 by chuckv, Wed Oct 9 22:29:40 2002 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines