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 1181 by chrisfen, Thu May 20 20:27:26 2004 UTC vs.
Revision 1210 by chrisfen, Tue Jun 1 14:27:28 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 <  double getThermIntLambda(void) {return thermodynamic_integration_lambda;}
85 <  double getThermIntK(void) {return thermodynamic_integration_k;}
84 >  int    getUseSolidThermInt(void)  { return useSolidThermInt; }
85 >  int    getUseLiquidThermInt(void) { return useLiquidThermInt; }
86 >  double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
87 >  double getThermIntK(void)         { return thermodynamic_integration_k; }
88  
89    short int haveInitialConfig( void ) { return have_initial_config; }
90    short int haveFinalConfig( void )   { return have_final_config; }
# Line 120 | Line 122 | class Globals{ (public)
122    short int haveMinGTol(void)         { return have_minimizer_gtol; }
123    short int haveMinLSTol(void)        { return have_minimizer_ls_tol; }
124    short int haveMinLSMaxIter(void)    { return have_minimizer_ls_maxiteration;}
125 <  short int haveThermIntLambda(void) {return have_thermodynamic_integration_lambda;}
126 <  short int haveThermIntK(void) {return have_thermodynamic_integration_k;}
125 >  short int haveThermIntLambda(void)  { return have_thermodynamic_integration_lambda; }
126 >  short int haveThermIntK(void)       { return have_thermodynamic_integration_k; }
127  
128    /* other accessors */
129    Component** getComponents( void )   { return components; }
# Line 190 | Line 192 | class Globals{ (public)
192    double minimizer_gtol;
193    double minimizer_ls_tol;
194    int minimizer_ls_maxiteration;
195 +  int useSolidThermInt;
196 +  int useLiquidThermInt;
197    double thermodynamic_integration_lambda;
198    double thermodynamic_integration_k;
199  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines