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 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2109 by tim, Thu Mar 10 20:28:17 2005 UTC

# Line 46 | Line 46
46  
47   #include <stdlib.h>
48   #include <vector>
49 + #include <string>
50 + #include <map>
51  
52   #include "io/BASS_interface.h"
53   #include "types/Component.hpp"
# Line 55 | Line 57 | class Globals{
57  
58  
59  
60 + /**
61 + * @class Globals Globals.hpp "io/Globals.hpp"
62 + * @brief parsing and storing global parameters for simulation
63 + * @todo need refactorying
64 + */
65   class Globals{
66    
67   public:
# Line 126 | Line 133 | class Globals{ (public)
133    int    getMinLSMaxIter(void)      { return minimizer_ls_maxiteration; }
134    int    getUseSolidThermInt(void)  { return useSolidThermInt; }
135    int    getUseLiquidThermInt(void) { return useLiquidThermInt; }
136 <  double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
136 >  double getThermIntLambda(void)   { return thermodynamic_integration_lambda; }
137    double getThermIntK(void)         { return thermodynamic_integration_k; }
138    char*  getForceFieldVariant( void ) { return forcefield_variant; }
139 <
139 >  char* getForceFieldFileName() { return forcefield_filename;}
140 >  double getDistSpringConst(void)   { return therm_int_dist_spring; }
141 >  double getThetaSpringConst(void)  { return therm_int_theta_spring; }
142 >  double getOmegaSpringConst(void)  { return therm_int_omega_spring; }
143    short int haveDt( void )            { return have_dt; }
144    short int haveRunTime( void )       { return have_run_time; }
145    short int haveEnsemble( void )      { return have_ensemble; }
# Line 171 | Line 181 | class Globals{ (public)
181    short int haveMinLSTol(void)        { return have_minimizer_ls_tol; }
182    short int haveMinLSMaxIter(void)    { return have_minimizer_ls_maxiteration;}
183    short int haveThermIntLambda(void)  { return have_thermodynamic_integration_lambda; }
184 <  short int haveThermIntK(void)       { return have_thermodynamic_integration_k; }
184 >  short int haveThermIntK(void)    { return have_thermodynamic_integration_k; }
185    short int haveForceFieldVariant(void) { return have_forcefield_variant; }
186 <
186 >  short int haveForceFieldFileName(void) { return have_forcefield_filename; }
187 >  short int haveDistSpringConst(void) { return have_dist_spring_constant; }
188 >  short int haveThetaSpringConst(void) { return have_theta_spring_constant; }
189 >  short int haveOmegaSpringConst(void) { return have_omega_spring_constant; }
190    /* other accessors */
191    Component** getComponents( void )   { return components; }
192    ZconStamp** getZconStamp( void )    { return zConstraints; }
193    
194   private:
195    
196 <  int hash_size;
197 <  int hash_shift;
198 <  int hash( char* text );
199 <  void addHash( char* text, int token );
187 <  LinkedCommand** command_table;
196 >
197 >  typedef std::map<std::string, int> CommandMapType;
198 >  CommandMapType command_table;
199 >
200    
201    char* checkMe( void );
202    
# Line 246 | Line 258 | class Globals{ (public)
258    double thermodynamic_integration_lambda;
259    double thermodynamic_integration_k;
260    char forcefield_variant[100];
261 <
261 >  char forcefield_filename[100];
262 >  double therm_int_dist_spring;
263 >  double therm_int_theta_spring;
264 >  double therm_int_omega_spring;
265    //required arguments
266    short int have_force_field, have_n_components, have_target_temp;
267    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 269 | Line 284 | class Globals{ (public)
284    short int have_thermodynamic_integration_lambda;
285    short int have_thermodynamic_integration_k;
286    short int have_forcefield_variant;
287 +  short int have_forcefield_filename;  
288 +  short int have_dist_spring_constant;
289 +  short int have_theta_spring_constant;
290 +  short int have_omega_spring_constant;
291   };
292  
293   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines