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 659 by tim, Thu Jul 31 15:38:08 2003 UTC vs.
Revision 708 by tim, Wed Aug 20 22:23:34 2003 UTC

# Line 1 | Line 1
1   #ifndef __GLOBALS_H__
2   #define __GLOBALS_H__
3  
4 + #include <iostream>
5 +
6   #include <cstdlib>
7   #include <vector>
8  
# Line 8 | Line 10
10   #include "Component.hpp"
11   #include "LinkedCommand.hpp"
12   #include "MakeStamps.hpp"
13 + #include "ZconStamp.hpp"
14  
15   using namespace std;
16  
# Line 20 | Line 23 | class Globals{ (public)
23    
24    int newComponent( event* the_event );
25    int componentAssign( event* the_event );
23 –  int componentStartIndex( event* the_event );
26    int componentEnd( event* the_event );
27 +
28 +  int newZconstraint( event* the_event );
29 +  int zConstraintAssign( event* the_event );
30 +  int zConstraintEnd( event* the_event );
31    
32    int globalAssign( event* the_event );
33    int globalEnd( event* the_event );
# Line 37 | Line 43 | class Globals{ (public)
43    double getDt( void )              { return dt; }
44    double getRunTime( void )         { return run_time; }
45    
46 +
47 +  int    getNzConstraints( void )   { return n_zConstraints; }
48    char*  getInitialConfig( void )   { return initial_config; }
49    char*  getFinalConfig( void )     { return final_config; }
50    int    getNMol( void )            { return n_mol; }
# Line 55 | Line 63 | class Globals{ (public)
63    int    getPBC( void )             { return usePBC;}
64    int    getUseRF( void )           { return useRF;}
65    char*  getMixingRule( void)       { return mixingRule;}
66 <  double getZConsTime(void)         { return zcons_time;}
67 <  vector<int> getIndexOfAllZConsMols(void){ return zconsMolIndex;}
66 >  double getZconsTime(void)         { return zcons_time;}
67 >  double getZconsTol(void)    { return zcons_tol;}
68 >  char* getZconsForcePolicy(void)  { return zconsForcePolicy;}
69 >  int getSeed(void) { return seed;}
70    
71    short int haveInitialConfig( void ) { return have_initial_config; }
72    short int haveFinalConfig( void )   { return have_final_config; }
# Line 77 | Line 87 | class Globals{ (public)
87    short int haveQmass( void )         { return have_q_mass; }
88    short int haveTauThermostat( void ) { return have_tau_thermostat;}
89    short int haveTauBarostat( void )   { return have_tau_barostat;}
90 <  short int haveZConsTime(void)       { return have_zcons_time;}
91 <  short int haveIndexOfAllZConsMols() { return have_index_of_all_zcons_mols;}
92 <
93 <  
90 >  short int haveZconstraintTime(void) { return have_zcons_time; }
91 >  short int haveZconstraints( void )  { return have_zConstraints;}
92 >  short int haveZconsTol(void) {return have_zcons_tol;}
93 >  short int haveZconsForcePolicy(void) { return have_zcons_force_policy;}
94 >  short int haveSeed(void) { return have_seed;}
95    /* other accessors */
96    Component** getComponents( void ) { return components; }
97 +  ZconStamp** getZconStamp( void ) { return zConstraints; }
98    
99   private:
100    
# Line 96 | Line 108 | class Globals{ (public)
108    
109    Component* current_component;
110    Component** components; // the array of components
111 +
112 +  ZconStamp* current_zConstraint;
113 +  ZconStamp** zConstraints; // the array of zConstraints
114 +
115    char force_field[100];
116    int n_components;
117 +  int n_zConstraints;
118    double target_temp;
119    double target_pressure;
120    char ensemble[100];
# Line 122 | Line 139 | class Globals{ (public)
139    double q_mass;
140    double tau_thermostat;
141    double tau_barostat;
142 <  double zcons_time;
143 <  vector<int> zconsMolIndex;
142 >  double zcons_time;    
143 >  double zcons_tol;
144 >  char zconsForcePolicy[100];
145 >  int seed;
146  
147    //required arguments
148    short int have_force_field, have_n_components, have_target_temp;
# Line 135 | Line 154 | class Globals{ (public)
154    short int have_sample_time, have_status_time, have_ecr, have_dielectric;
155    short int have_tempSet, have_thermal_time, have_est, have_q_mass;
156    short int have_tau_thermostat, have_tau_barostat;
157 <  short int have_zcons_time, have_index_of_all_zcons_mols;  
157 >  short int have_zcons_time, have_zConstraints, have_n_zConstraints;
158 >  short int have_zcons_tol, have_seed;  
159 >  short int have_zcons_force_policy;
160  
161   };
162  

Diff Legend

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