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 131 by chuckv, Wed Oct 9 22:29:40 2002 UTC vs.
Revision 249 by chuckv, Mon Jan 27 21:28:19 2003 UTC

# Line 1 | Line 1
1   #ifndef __SIMINFO_H__
2   #define __SIMINFO_H__
3  
4 #include <cstdlib>
4  
5 +
6   #include "Atom.hpp"
7   #include "Molecule.hpp"
8   #include "AbstractClasses.hpp"
9 < #ifdef IS_MPI
10 < #include "mpiSimulation.hpp"
9 > #include "MakeStamps.hpp"
10  
12 #endif
11   class SimInfo{
12  
13   public:
14  
15 <  SimInfo(){
18 <    excludes = NULL;
19 <    n_constraints = 0;
20 <    n_oriented = 0;
21 <    n_dipoles = 0;
22 <    longRange = NULL;
23 <    the_integrator = NULL;
24 <    setTemp = 0;
25 <    thermalTime = 0.0;
26 <  }
15 >  SimInfo();
16    ~SimInfo(){}
17  
18    int n_atoms; // the number of atoms
# Line 49 | Line 38 | class SimInfo{ (public)
38    SRI **sr_interactions;// the array of short range force objects
39    LRI *longRange;       // the long range force object
40  
41 +  double lrPot; // the potential energy from the long range calculations.
42 +
43    double box_x, box_y, box_z; // the periodic boundry conditions
44 +  double rList, rCut; // variables for the neighborlist
45  
46    double dt, run_time;           // the time step and total time
47    double sampleTime, statusTime; // the position and energy dump frequencies
# Line 58 | Line 50 | class SimInfo{ (public)
50  
51    int n_mol;           // n_molecules;
52    Molecule* molecules; // the array of molecules
53 +  
54 +  int nComponents;           // the number of componentsin the system
55 +  int* componentsNmol;       // the number of molecules of each component
56 +  MoleculeStamp** compStamps;// the stamps matching the components
57 +  LinkedMolStamp* headStamp; // list of stamps used in the simulation
58 +  
59 +  
60  
61    Integrator *the_integrator; // the integrator of the simulation
62  
63    char finalName[300];  // the name of the eor file to be written
64    char sampleName[300]; // the name of the dump file to be written
65    char statusName[300]; // the name of the stat file to be written
66 < #ifdef IS_MPI
67 <  mpiSimulation* mpiSim;
68 < #endif
66 >
67 >
68 >  // refreshes the sim if things get changed (lode balanceing, volume
69 >  // adjustment, etc.)
70 >
71 >  void refreshSim( void );
72 >  
73 >
74 >  // sets the internal function pointer to fortran.
75 >
76 >  void setInternal( void (*fSetup)( int*, double*, double*, double*) ){
77 >    setFsimulation = fSetup;
78 >  }
79 >
80 > private:
81 >  
82 >  // function to wrap the fortran function
83 >  void wrapMe();
84 >  
85 >  // private function to initialize the fortran side of the simulation
86 >  void (*setFsimulation)(int* nLocal, double *boxSizeArray,
87 >                         double* rList, double* rCut );
88 >
89 >
90   };
91  
92  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines