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

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/SimInfo.hpp (file contents):
Revision 270 by mmeineke, Fri Feb 14 17:08:46 2003 UTC vs.
Revision 362 by mmeineke, Tue Mar 18 21:25:45 2003 UTC

# Line 8 | Line 8
8   #include "AbstractClasses.hpp"
9   #include "MakeStamps.hpp"
10  
11 + #define __C
12 + #include "fSimulation.h"
13 + #include <fortranWrapDefines.hpp>
14 +
15 +
16 +
17   class SimInfo{
18  
19   public:
# Line 17 | Line 23 | class SimInfo{ (public)
23  
24    int n_atoms; // the number of atoms
25    Atom **atoms; // the array of atom objects
26 +  
27 +  double tau[9]; // the stress tensor
28  
29    unsigned int n_bonds;    // number of bends
30    unsigned int n_bends;    // number of bends
# Line 29 | Line 37 | class SimInfo{ (public)
37    double rRF;             // the reaction field cut off radius
38    double dielectric;      // the dielectric of the medium for reaction field
39  
40 <  unsigned int n_exclude;  // the number of pairs excluded from LJ and VDW
41 <  ex_pair *excludes;       // the pairs themselves
40 >  unsigned int n_exclude;  // the # of pairs excluded from long range forces
41 >  int *excludes;       // the pairs themselves
42  
43 +  int nGlobalExclude;
44 +  int* globalExcludes; // same as above, but these guys participate in
45 +                       // no long range forces.
46 +
47 +  int* identArray;     // array of unique identifiers for the atoms
48 +
49    int n_constraints; // the number of constraints on the system
50  
51    unsigned int n_SRI;   // the number of short range interactions
# Line 41 | Line 55 | class SimInfo{ (public)
55  
56    double box_x, box_y, box_z; // the periodic boundry conditions
57    double rList, rCut; // variables for the neighborlist
58 +  
59 +  int usePBC; // whether we use periodic boundry conditions.
60 +  int useLJ;
61 +  int useSticky;
62 +  int useDipole;
63 +  int useReactionField;
64 +  int useGB;
65 +  int useEAM;
66 +  
67  
68    double dt, run_time;           // the time step and total time
69    double sampleTime, statusTime; // the position and energy dump frequencies
# Line 56 | Line 79 | class SimInfo{ (public)
79    LinkedMolStamp* headStamp; // list of stamps used in the simulation
80    
81    
82 <
82 >  char ensemble[100]; // the enesemble of the simulation (NVT, NVE, etc. )
83 >  char mixingRule[100]; // the mixing rules for Lennard jones/van der walls
84    Integrator *the_integrator; // the integrator of the simulation
85  
86    char finalName[300];  // the name of the eor file to be written
# Line 64 | Line 88 | class SimInfo{ (public)
88    char statusName[300]; // the name of the stat file to be written
89  
90  
91 <  // refreshes the sim if things get changed (lode balanceing, volume
91 >  // refreshes the sim if things get changed (load balanceing, volume
92    // adjustment, etc.)
93  
94    void refreshSim( void );
# Line 72 | Line 96 | class SimInfo{ (public)
96  
97    // sets the internal function pointer to fortran.
98  
99 <  void setInternal( void (*fSetup)( int*, double*, double*, double*) ){
99 >  void setInternal( void (*fSetup) setFortranSimList,
100 >                    void (*fBox) setFortranBoxList ){
101      setFsimulation = fSetup;
102 +    setFortranBoxSize = fBox;
103    }
104  
105   private:
106    
81  // function to wrap the fortran function
82  void wrapMe();
83  
107    // private function to initialize the fortran side of the simulation
108 <  void (*setFsimulation)(int* nLocal, double *boxSizeArray,
86 <                         double* rList, double* rCut );
108 >  void (*setFsimulation) setFortranSimList;
109  
110 <
110 >  void (*setFortanBoxSize) setFortranBoxList;
111   };
112  
113  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines