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 426 by gezelter, Thu Mar 10 20:40:56 2005 UTC vs.
Revision 536 by tim, Thu May 19 04:28:26 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 63 | Line 63 | class Globals{
63   */
64   class Globals{
65    
66 < public:
66 > public:
67    
68    Globals();
69    ~Globals();
# Line 139 | Line 139 | class Globals{
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; }
143 +  
144    short int haveDt( void )            { return have_dt; }
145    short int haveRunTime( void )       { return have_run_time; }
146    short int haveEnsemble( void )      { return have_ensemble; }
# Line 186 | Line 188 | class Globals{
188    short int haveDistSpringConst(void) { return have_dist_spring_constant; }
189    short int haveThetaSpringConst(void) { return have_theta_spring_constant; }
190    short int haveOmegaSpringConst(void) { return have_omega_spring_constant; }
191 +  short int haveTargetStress(void) { return have_targetstress; }
192    /* other accessors */
193    Component** getComponents( void )   { return components; }
194    ZconStamp** getZconStamp( void )    { return zConstraints; }
195    
196 < private:
196 > private:
197    
198  
199    typedef std::map<std::string, int> CommandMapType;
# Line 261 | Line 264 | class Globals{
264    double therm_int_dist_spring;
265    double therm_int_theta_spring;
266    double therm_int_omega_spring;
267 +  double target_stress;
268 +  
269    //required arguments
270    short int have_force_field, have_n_components, have_target_temp;
271    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 287 | Line 292 | class Globals{
292    short int have_dist_spring_constant;
293    short int have_theta_spring_constant;
294    short int have_omega_spring_constant;
295 +  short int have_targetstress;
296   };
297  
298   #endif

Diff Legend

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