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

Comparing trunk/OOPSE/libmdtools/SimInfo.hpp (file contents):
Revision 1157 by tim, Tue May 11 20:33:41 2004 UTC vs.
Revision 1214 by gezelter, Tue Jun 1 18:42:58 2004 UTC

# Line 13 | Line 13
13   #include "AbstractClasses.hpp"
14   #include "MakeStamps.hpp"
15   #include "SimState.hpp"
16 + #include "Restraints.hpp"
17  
18   #define __C
19   #include "fSimulation.h"
# Line 20 | Line 21 | double roundMe( double x );
21   #include "GenericData.hpp"
22   //#include "Minimizer.hpp"
23   //#include "OOPSEMinimizer.hpp"
24 +
25 +
26   double roundMe( double x );
27   class OOPSEMinimizer;
28   class SimInfo{
# Line 116 | Line 119 | class SimInfo{ (public)
119    BaseIntegrator *the_integrator; // the integrator of the simulation
120  
121    OOPSEMinimizer* the_minimizer; // the energy minimizer
122 +  Restraints* restraint;
123    bool has_minimizer;
124  
125    char finalName[300];  // the name of the eor file to be written
126    char sampleName[300]; // the name of the dump file to be written
127    char statusName[300]; // the name of the stat file to be written
128 +  char rawPotName[300];  // the name of the raw file to be written
129  
130    int seed;                    //seed for random number generator
131  
132 +  int useSolidThermInt;  // is solid-state thermodynamic integration being used
133 +  int useLiquidThermInt; // is liquid thermodynamic integration being used
134 +  double thermIntLambda; // lambda for TI
135 +  double thermIntK;      // power of lambda for TI
136 +  double vRaw;           // unperturbed potential for TI
137 +  double vHarm;          // harmonic potential for TI
138 +  int i;                 // just an int
139  
140    vector<double> mfact;
141 +  vector<int> FglobalGroupMembership;
142    int ngroup;
143 <  vector<int> groupList;
131 <  vector<int> groupStart;
143 >  int* globalGroupMembership;
144    
145    // refreshes the sim if things get changed (load balanceing, volume
146    // adjustment, etc.)
# Line 208 | Line 220 | class SimInfo{ (public)
220    
221    //Addtional Properties of SimInfo
222    map<string, GenericData*> properties;
223 +  void getFortranGroupArrays(SimInfo* info,
224 +                             vector<int>& FglobalGroupMembership,
225 +                             vector<double>& mfact);
226  
227 +
228   };
229  
214 void getFortranGroupArray(SimInfo* info, vector<double>& mfact, int& ngroup,
215                                                          vector<int>& groupList, vector<int>& groupStart);
230  
231   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines