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 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 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 "BASS_interface.h"
53 < #include "Component.hpp"
54 < #include "LinkedCommand.hpp"
55 < #include "MakeStamps.hpp"
13 < #include "ZconStamp.hpp"
52 > #include "io/BASS_interface.h"
53 > #include "types/Component.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 85 | Line 132 | class Globals{ (public)
132    int    getMinLSMaxIter(void)      { return minimizer_ls_maxiteration; }
133    int    getUseSolidThermInt(void)  { return useSolidThermInt; }
134    int    getUseLiquidThermInt(void) { return useLiquidThermInt; }
135 <  double getThermIntLambda(void)    { return thermodynamic_integration_lambda; }
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    short int haveDt( void )            { return have_dt; }
143    short int haveRunTime( void )       { return have_run_time; }
144    short int haveEnsemble( void )      { return have_ensemble; }
# Line 130 | Line 180 | class Globals{ (public)
180    short int haveMinLSTol(void)        { return have_minimizer_ls_tol; }
181    short int haveMinLSMaxIter(void)    { return have_minimizer_ls_maxiteration;}
182    short int haveThermIntLambda(void)  { return have_thermodynamic_integration_lambda; }
183 <  short int haveThermIntK(void)       { return have_thermodynamic_integration_k; }
183 >  short int haveThermIntK(void)    { return have_thermodynamic_integration_k; }
184    short int haveForceFieldVariant(void) { return have_forcefield_variant; }
185 <
185 >  short int haveForceFieldFileName(void) { return have_forcefield_filename; }
186 >  short int haveDistSpringConst(void) { return have_dist_spring_constant; }
187 >  short int haveThetaSpringConst(void) { return have_theta_spring_constant; }
188 >  short int haveOmegaSpringConst(void) { return have_omega_spring_constant; }
189    /* other accessors */
190    Component** getComponents( void )   { return components; }
191    ZconStamp** getZconStamp( void )    { return zConstraints; }
192    
193 < private:
193 > private:
194    
195 <  int hash_size;
196 <  int hash_shift;
197 <  int hash( char* text );
198 <  void addHash( char* text, int token );
146 <  LinkedCommand** command_table;
195 >
196 >  typedef std::map<std::string, int> CommandMapType;
197 >  CommandMapType command_table;
198 >
199    
200    char* checkMe( void );
201    
# Line 205 | Line 257 | class Globals{ (public)
257    double thermodynamic_integration_lambda;
258    double thermodynamic_integration_k;
259    char forcefield_variant[100];
260 <
260 >  char forcefield_filename[100];
261 >  double therm_int_dist_spring;
262 >  double therm_int_theta_spring;
263 >  double therm_int_omega_spring;
264    //required arguments
265    short int have_force_field, have_n_components, have_target_temp;
266    short int have_target_pressure, have_ensemble, have_dt, have_run_time;
# Line 228 | Line 283 | class Globals{ (public)
283    short int have_thermodynamic_integration_lambda;
284    short int have_thermodynamic_integration_k;
285    short int have_forcefield_variant;
286 +  short int have_forcefield_filename;  
287 +  short int have_dist_spring_constant;
288 +  short int have_theta_spring_constant;
289 +  short int have_omega_spring_constant;
290   };
291  
292   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines