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 2109 by tim, Thu Mar 10 20:28:17 2005 UTC vs.
Revision 2238 by tim, Sun May 22 21:05:15 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 51 | Line 51
51  
52   #include "io/BASS_interface.h"
53   #include "types/Component.hpp"
54 – #include "io/LinkedCommand.hpp"
54   #include "types/MakeStamps.hpp"
55   #include "types/ZconStamp.hpp"
56  
# Line 64 | Line 63 | class Globals{ (public)
63   */
64   class Globals{
65    
66 < public:
66 > public:
67    
68    Globals();
69    ~Globals();
# Line 140 | Line 139 | class Globals{ (public)
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 getSurfaceTension(void) {return surface_tension; }
143 +  bool getPrintPressureTensor(void) {return print_pressure_tensor;}
144 +  
145    short int haveDt( void )            { return have_dt; }
146    short int haveRunTime( void )       { return have_run_time; }
147    short int haveEnsemble( void )      { return have_ensemble; }
# Line 187 | Line 189 | class Globals{ (public)
189    short int haveDistSpringConst(void) { return have_dist_spring_constant; }
190    short int haveThetaSpringConst(void) { return have_theta_spring_constant; }
191    short int haveOmegaSpringConst(void) { return have_omega_spring_constant; }
192 +  short int haveSurfaceTension(void) { return have_surface_tension; }
193 +  short int havePrintPressureTensor(void) {return have_print_pressure_tensor;}
194 +  
195    /* other accessors */
196    Component** getComponents( void )   { return components; }
197    ZconStamp** getZconStamp( void )    { return zConstraints; }
198    
199 < private:
199 > private:
200    
201  
202    typedef std::map<std::string, int> CommandMapType;
# Line 262 | Line 267 | class Globals{ (public)
267    double therm_int_dist_spring;
268    double therm_int_theta_spring;
269    double therm_int_omega_spring;
270 +  double surface_tension;
271 +  bool print_pressure_tensor;
272 +  
273    //required arguments
274    short int have_force_field, have_n_components, have_target_temp;
275    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 288 | Line 296 | class Globals{ (public)
296    short int have_dist_spring_constant;
297    short int have_theta_spring_constant;
298    short int have_omega_spring_constant;
299 +  short int have_surface_tension;
300 +  short int have_print_pressure_tensor;
301   };
302  
303   #endif

Diff Legend

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