ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.hpp
(Generate patch)

Comparing trunk/src/io/Globals.hpp (file contents):
Revision 536 by tim, Thu May 19 04:28:26 2005 UTC vs.
Revision 580 by chrisfen, Tue Aug 30 18:23:50 2005 UTC

# Line 132 | Line 132 | class Globals{
132    int    getMinLSMaxIter(void)      { return minimizer_ls_maxiteration; }
133    int    getUseSolidThermInt(void)  { return useSolidThermInt; }
134    int    getUseLiquidThermInt(void) { return useLiquidThermInt; }
135 <  double getThermIntLambda(void)   { return thermodynamic_integration_lambda; }
135 >  double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
136    double getThermIntK(void)         { return thermodynamic_integration_k; }
137    char*  getForceFieldVariant( void ) { return forcefield_variant; }
138 <  char* getForceFieldFileName() { return forcefield_filename;}
138 >  char*  getForceFieldFileName()    { return forcefield_filename; }
139    double getDistSpringConst(void)   { return therm_int_dist_spring; }
140    double getThetaSpringConst(void)  { return therm_int_theta_spring; }
141    double getOmegaSpringConst(void)  { return therm_int_omega_spring; }
142 <  double getTargetStress(void) {return target_stress; }
142 >  double getSurfaceTension(void)    { return surface_tension; }
143 >  bool   getPrintPressureTensor(void) { return print_pressure_tensor;}
144 >  bool   getUseUndampedWolf(void)   { return useUndampedWolf; }
145 >  bool   getUseDampedWolf(void)     { return useDampedWolf; }
146    
147    short int haveDt( void )            { return have_dt; }
148    short int haveRunTime( void )       { return have_run_time; }
# Line 188 | Line 191 | class Globals{
191    short int haveDistSpringConst(void) { return have_dist_spring_constant; }
192    short int haveThetaSpringConst(void) { return have_theta_spring_constant; }
193    short int haveOmegaSpringConst(void) { return have_omega_spring_constant; }
194 <  short int haveTargetStress(void) { return have_targetstress; }
194 >  short int haveSurfaceTension(void) { return have_surface_tension; }
195 >  short int havePrintPressureTensor(void) {return have_print_pressure_tensor;}
196 >  
197    /* other accessors */
198    Component** getComponents( void )   { return components; }
199    ZconStamp** getZconStamp( void )    { return zConstraints; }
# Line 264 | Line 269 | class Globals{
269    double therm_int_dist_spring;
270    double therm_int_theta_spring;
271    double therm_int_omega_spring;
272 <  double target_stress;
272 >  double surface_tension;
273 >  bool print_pressure_tensor;
274 >  bool useUndampedWolf;
275 >  bool useDampedWolf;
276    
277    //required arguments
278    short int have_force_field, have_n_components, have_target_temp;
# Line 292 | Line 300 | class Globals{
300    short int have_dist_spring_constant;
301    short int have_theta_spring_constant;
302    short int have_omega_spring_constant;
303 <  short int have_targetstress;
303 >  short int have_surface_tension;
304 >  short int have_print_pressure_tensor;
305   };
306  
307   #endif

Diff Legend

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