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 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 2285 by gezelter, Wed Sep 7 20:46:46 2005 UTC

# Line 1 | Line 1
1 < #ifndef __GLOBALS_H__
2 < #define __GLOBALS_H__
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
6 > * redistribute this software in source and binary code form, provided
7 > * that the following conditions are met:
8 > *
9 > * 1. Acknowledgement of the program authors must be made in any
10 > *    publication of scientific results based in part on use of the
11 > *    program.  An acceptable form of acknowledgement is citation of
12 > *    the article in which the program was described (Matthew
13 > *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 > *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 > *    Parallel Simulation Engine for Molecular Dynamics,"
16 > *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 > *
18 > * 2. Redistributions of source code must retain the above copyright
19 > *    notice, this list of conditions and the following disclaimer.
20 > *
21 > * 3. Redistributions in binary form must reproduce the above copyright
22 > *    notice, this list of conditions and the following disclaimer in the
23 > *    documentation and/or other materials provided with the
24 > *    distribution.
25 > *
26 > * This software is provided "AS IS," without a warranty of any
27 > * kind. All express or implied conditions, representations and
28 > * warranties, including any implied warranty of merchantability,
29 > * fitness for a particular purpose or non-infringement, are hereby
30 > * excluded.  The University of Notre Dame and its licensors shall not
31 > * be liable for any damages suffered by licensee as a result of
32 > * using, modifying or distributing the software or its
33 > * derivatives. In no event will the University of Notre Dame or its
34 > * licensors be liable for any lost revenue, profit or data, or for
35 > * direct, indirect, special, consequential, incidental or punitive
36 > * damages, however caused and regardless of the theory of liability,
37 > * arising out of the use of or inability to use software, even if the
38 > * University of Notre Dame has been advised of the possibility of
39 > * such damages.
40 > */
41 >
42 > #ifndef IO_GLOBALS_HPP
43 > #define IO_GLOBALS_HPP
44  
45   #include <iostream>
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"
11 #include "io/LinkedCommand.hpp"
54   #include "types/MakeStamps.hpp"
55   #include "types/ZconStamp.hpp"
56  
15 using namespace std;
57  
58 +
59 + /**
60 + * @class Globals Globals.hpp "io/Globals.hpp"
61 + * @brief parsing and storing global parameters for simulation
62 + * @todo need refactorying
63 + */
64   class Globals{
65    
66 < public:
66 > public:
67    
68    Globals();
69    ~Globals();
# Line 88 | Line 135 | class Globals{ (public)
135    double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
136    double getThermIntK(void)         { return thermodynamic_integration_k; }
137    char*  getForceFieldVariant( void ) { return forcefield_variant; }
138 <
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 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 >  char*  getCutoffPolicy(void)      { return cutoffPolicy; }
147 >  
148    short int haveDt( void )            { return have_dt; }
149    short int haveRunTime( void )       { return have_run_time; }
150    short int haveEnsemble( void )      { return have_ensemble; }
# Line 130 | Line 186 | class Globals{ (public)
186    short int haveMinLSTol(void)        { return have_minimizer_ls_tol; }
187    short int haveMinLSMaxIter(void)    { return have_minimizer_ls_maxiteration;}
188    short int haveThermIntLambda(void)  { return have_thermodynamic_integration_lambda; }
189 <  short int haveThermIntK(void)       { return have_thermodynamic_integration_k; }
190 <  short int haveForceFieldVariant(void) { return have_forcefield_variant; }
189 >  short int haveThermIntK(void)    { return have_thermodynamic_integration_k; }
190 >  short int haveForceFieldVariant(void)  { return have_forcefield_variant; }
191 >  short int haveForceFieldFileName(void) { return have_forcefield_filename; }
192 >  short int haveDistSpringConst(void)    { return have_dist_spring_constant; }
193 >  short int haveThetaSpringConst(void)   { return have_theta_spring_constant; }
194 >  short int haveOmegaSpringConst(void)   { return have_omega_spring_constant; }
195 >  short int haveSurfaceTension(void)     { return have_surface_tension; }
196 >  short int havePrintPressureTensor(void) {return have_print_pressure_tensor;}
197 >  short int haveCutoffPolicy(void)       { return have_cutoff_policy; }
198  
199    /* other accessors */
200    Component** getComponents( void )   { return components; }
201    ZconStamp** getZconStamp( void )    { return zConstraints; }
202    
203 < private:
203 > private:
204    
205 <  int hash_size;
206 <  int hash_shift;
207 <  int hash( char* text );
208 <  void addHash( char* text, int token );
146 <  LinkedCommand** command_table;
205 >
206 >  typedef std::map<std::string, int> CommandMapType;
207 >  CommandMapType command_table;
208 >
209    
210    char* checkMe( void );
211    
# Line 205 | Line 267 | class Globals{ (public)
267    double thermodynamic_integration_lambda;
268    double thermodynamic_integration_k;
269    char forcefield_variant[100];
270 <
270 >  char forcefield_filename[100];
271 >  double therm_int_dist_spring;
272 >  double therm_int_theta_spring;
273 >  double therm_int_omega_spring;
274 >  double surface_tension;
275 >  bool print_pressure_tensor;
276 >  bool useUndampedWolf;
277 >  bool useDampedWolf;
278 >  char cutoffPolicy[100];
279 >  
280    //required arguments
281    short int have_force_field, have_n_components, have_target_temp;
282    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 228 | Line 299 | class Globals{ (public)
299    short int have_thermodynamic_integration_lambda;
300    short int have_thermodynamic_integration_k;
301    short int have_forcefield_variant;
302 +  short int have_forcefield_filename;  
303 +  short int have_dist_spring_constant;
304 +  short int have_theta_spring_constant;
305 +  short int have_omega_spring_constant;
306 +  short int have_surface_tension;
307 +  short int have_print_pressure_tensor;
308 +  short int have_cutoff_policy;
309   };
310  
311   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines