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

Comparing trunk/OOPSE/libBASS/Globals.hpp (file contents):
Revision 1153 by gezelter, Tue May 11 04:21:52 2004 UTC vs.
Revision 1209 by chrisfen, Tue Jun 1 14:21:06 2004 UTC

# Line 81 | Line 81 | class Globals{ (public)
81    double getMinGTol(void)           { return minimizer_gtol; }
82    double getMinLSTol(void)          { return minimizer_ls_tol; }
83    int    getMinLSMaxIter(void)      { return minimizer_ls_maxiteration; }
84 +  int    getUseSolidThermInt(void)  { return useSolidThermInt; }
85 +  double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
86 +  double getThermIntK(void)         { return thermodynamic_integration_k; }
87  
88    short int haveInitialConfig( void ) { return have_initial_config; }
89    short int haveFinalConfig( void )   { return have_final_config; }
# Line 118 | Line 121 | class Globals{ (public)
121    short int haveMinGTol(void)         { return have_minimizer_gtol; }
122    short int haveMinLSTol(void)        { return have_minimizer_ls_tol; }
123    short int haveMinLSMaxIter(void)    { return have_minimizer_ls_maxiteration;}
124 +  short int haveThermIntLambda(void)  { return have_thermodynamic_integration_lambda; }
125 +  short int haveThermIntK(void)       { return have_thermodynamic_integration_k; }
126  
127    /* other accessors */
128    Component** getComponents( void )   { return components; }
# Line 186 | Line 191 | class Globals{ (public)
191    double minimizer_gtol;
192    double minimizer_ls_tol;
193    int minimizer_ls_maxiteration;
194 +  int useSolidThermInt;
195 +  double thermodynamic_integration_lambda;
196 +  double thermodynamic_integration_k;
197 +
198    //required arguments
199    short int have_force_field, have_n_components, have_target_temp;
200    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 205 | Line 214 | class Globals{ (public)
214    short int have_minimizer_writefrq, have_minimizer_stepsize;
215    short int have_minimizer_ftol, have_minimizer_gtol;
216    short int have_minimizer_ls_tol, have_minimizer_ls_maxiteration;
217 +  short int have_thermodynamic_integration_lambda;
218 +  short int have_thermodynamic_integration_k;
219   };
220  
221   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines