ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/io/Globals.hpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/io/Globals.hpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1957 by tim, Tue Jan 25 17:45:23 2005 UTC

# Line 129 | Line 129 | class Globals{ (public)
129    double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
130    double getThermIntK(void)         { return thermodynamic_integration_k; }
131    char*  getForceFieldVariant( void ) { return forcefield_variant; }
132 <
132 >  char* getForceFieldFileName() { return forcefield_filename;}
133    short int haveDt( void )            { return have_dt; }
134    short int haveRunTime( void )       { return have_run_time; }
135    short int haveEnsemble( void )      { return have_ensemble; }
# Line 173 | Line 173 | class Globals{ (public)
173    short int haveThermIntLambda(void)  { return have_thermodynamic_integration_lambda; }
174    short int haveThermIntK(void)       { return have_thermodynamic_integration_k; }
175    short int haveForceFieldVariant(void) { return have_forcefield_variant; }
176 <
176 > short int haveForceFieldFileName(void) { return have_forcefield_filename; }
177    /* other accessors */
178    Component** getComponents( void )   { return components; }
179    ZconStamp** getZconStamp( void )    { return zConstraints; }
# Line 246 | Line 246 | class Globals{ (public)
246    double thermodynamic_integration_lambda;
247    double thermodynamic_integration_k;
248    char forcefield_variant[100];
249 <
249 >  char forcefield_filename[100];
250    //required arguments
251    short int have_force_field, have_n_components, have_target_temp;
252    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 269 | Line 269 | class Globals{ (public)
269    short int have_thermodynamic_integration_lambda;
270    short int have_thermodynamic_integration_k;
271    short int have_forcefield_variant;
272 +  short int have_forcefield_filename;  
273   };
274  
275   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines