ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.hpp
(Generate patch)

Comparing:
trunk/src/io/Globals.hpp (file contents), Revision 906 by tim, Fri Mar 17 23:20:35 2006 UTC vs.
branches/development/src/io/Globals.hpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2 > * Copyright (c) 2005, 2010 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
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #ifndef IO_GLOBALS_HPP
# Line 51 | Line 51
51  
52   #include "types/Component.hpp"
53   #include "types/ZconsStamp.hpp"
54 + #include "types/RestraintStamp.hpp"
55   #include "types/MoleculeStamp.hpp"
56   #include "utils/ParameterManager.hpp"
57  
58 < namespace oopse {
59 < class Globals : public DataHolder {
58 > namespace OpenMD {
59 >  class Globals : public DataHolder {
60    public:
61 +    typedef std::pair<int, int> intPair;
62 +
63      Globals();
64      virtual ~Globals();
65      
66 <  DeclareParameter(ForceField, std::string);
67 <  DeclareParameter(TargetTemp, double);
68 <  DeclareParameter(Ensemble, std::string);
69 <  DeclareParameter(Dt, double);
70 <  DeclareParameter(RunTime, double);
71 <  DeclareParameter(InitialConfig, std::string);
72 <  DeclareParameter(FinalConfig, std::string);
73 <  DeclareParameter(SampleTime, double);
74 <  DeclareParameter(ResetTime, double);
75 <  DeclareParameter(StatusTime, double);
76 <  DeclareParameter(CutoffRadius, double);
77 <  DeclareParameter(SwitchingRadius, double);
78 <  DeclareParameter(Dielectric, double);
79 <  DeclareParameter(TempSet, bool);
80 <  DeclareParameter(ThermalTime, double);
81 <  DeclareParameter(UsePeriodicBoundaryConditions, bool);
82 <  DeclareParameter(TargetPressure, double);
83 <  DeclareParameter(TauThermostat, double);
84 <  DeclareParameter(TauBarostat, double);
85 <  DeclareParameter(ZconsTime, double);
86 <  DeclareParameter(ZconsTol, double);
87 <  DeclareParameter(ZconsForcePolicy, std::string);
88 <  DeclareParameter(Seed, int);
89 <  DeclareParameter(UseInitalTime, bool);
90 <  DeclareParameter(UseIntialExtendedSystemState, bool);
91 <  DeclareParameter(OrthoBoxTolerance, double);
92 <  DeclareParameter(Minimizer, std::string);
93 <  DeclareParameter(MinimizerMaxIter, double);
94 <  DeclareParameter(MinimizerWriteFrq, int);
95 <  DeclareParameter(MinimizerStepSize, double);
96 <  DeclareParameter(MinimizerFTol, double);
97 <  DeclareParameter(MinimizerGTol, double);
98 <  DeclareParameter(MinimizerLSTol, double);
99 <  DeclareParameter(MinimizerLSMaxIter, int);
100 <  DeclareParameter(ZconsGap, double);
101 <  DeclareParameter(ZconsFixtime, double);
102 <  DeclareParameter(ZconsUsingSMD, bool);
103 <  DeclareParameter(UseSolidThermInt, bool);
104 <  DeclareParameter(UseLiquidThermInt, bool);
105 <  DeclareParameter(ThermodynamicIntegrationLambda, double);
106 <  DeclareParameter(ThermodynamicIntegrationK, double);
107 <  DeclareParameter(ForceFieldVariant, std::string);
108 <  DeclareParameter(ForceFieldFileName, std::string);
109 <  DeclareParameter(ThermIntDistSpringConst, double);
110 <  DeclareParameter(ThermIntThetaSpringConst, double);
111 <  DeclareParameter(ThermIntOmegaSpringConst, double);
112 <  DeclareParameter(SurfaceTension, double);
113 <  DeclareParameter(PrintPressureTensor, bool);
114 <  DeclareParameter(ElectrostaticSummationMethod, std::string);
115 <  DeclareParameter(ElectrostaticScreeningMethod, std::string);
116 <  DeclareParameter(DampingAlpha, double);
117 <  DeclareParameter(CutoffPolicy, std::string);
118 <  DeclareParameter(SwitchingFunctionType, std::string);
119 <  DeclareParameter(CompressDumpFile, bool);
120 <  DeclareParameter(OutputForceVector, bool);
121 <  DeclareParameter(SkinThickness, double);
122 <  DeclareParameter(StatFileFormat, std::string);    
123 <  DeclareParameter(HydroPropFile, std::string);
124 <  DeclareParameter(Viscosity, double);
125 <  DeclareParameter(BeadSize, double);  
126 <  
66 >    DeclareParameter(ForceField, std::string);
67 >    DeclareParameter(TargetTemp, RealType);
68 >    DeclareParameter(Ensemble, std::string);
69 >    DeclareParameter(Dt, RealType);
70 >    DeclareParameter(RunTime, RealType);
71 >    DeclareParameter(FinalConfig, std::string);
72 >    DeclareParameter(SampleTime, RealType);
73 >    DeclareParameter(ResetTime, RealType);
74 >    DeclareParameter(StatusTime, RealType);
75 >    DeclareParameter(CutoffRadius, RealType);
76 >    DeclareParameter(SwitchingRadius, RealType);
77 >    DeclareParameter(TempSet, bool);
78 >    DeclareParameter(ThermalTime, RealType);
79 >    DeclareParameter(UsePeriodicBoundaryConditions, bool);
80 >    DeclareParameter(TargetPressure, RealType);
81 >    DeclareParameter(UseAtomicVirial, bool);
82 >    DeclareParameter(TauThermostat, RealType);
83 >    DeclareParameter(TauBarostat, RealType);
84 >    DeclareParameter(ZconsTime, RealType);
85 >    DeclareParameter(ZconsTol, RealType);
86 >    DeclareParameter(ZconsForcePolicy, std::string);
87 >    DeclareParameter(Seed, unsigned long int);
88 >    DeclareParameter(UseInitalTime, bool);
89 >    DeclareParameter(UseIntialExtendedSystemState, bool);
90 >    DeclareParameter(OrthoBoxTolerance, RealType);
91 >    DeclareParameter(Minimizer, std::string);
92 >    DeclareParameter(MinimizerMaxIter, RealType);
93 >    DeclareParameter(MinimizerWriteFreq, int);
94 >    DeclareParameter(MinimizerStepSize, RealType);
95 >    DeclareParameter(MinimizerFTol, RealType);
96 >    DeclareParameter(MinimizerGTol, RealType);
97 >    DeclareParameter(MinimizerLSTol, RealType);
98 >    DeclareParameter(MinimizerLSMaxIter, int);
99 >    DeclareParameter(ZconsGap, RealType);
100 >    DeclareParameter(ZconsFixtime, RealType);
101 >    DeclareParameter(ZconsUsingSMD, bool);
102 >    DeclareParameter(UseThermodynamicIntegration, bool);
103 >    DeclareParameter(ThermodynamicIntegrationLambda, RealType);
104 >    DeclareParameter(ThermodynamicIntegrationK, RealType);
105 >    DeclareParameter(ForceFieldVariant, std::string);
106 >    DeclareParameter(ForceFieldFileName, std::string);
107 >    DeclareParameter(SurfaceTension, RealType);
108 >    DeclareParameter(PrintPressureTensor, bool);
109 >    DeclareParameter(TaggedAtomPair, intPair);
110 >    DeclareParameter(PrintTaggedPairDistance, bool);
111 >    DeclareParameter(ElectrostaticSummationMethod, std::string);
112 >    DeclareParameter(ElectrostaticScreeningMethod, std::string);
113 >    DeclareParameter(DampingAlpha, RealType);
114 >    DeclareParameter(Dielectric, RealType);
115 >    DeclareParameter(CutoffPolicy, std::string);
116 >    DeclareParameter(SwitchingFunctionType, std::string);
117 >    DeclareParameter(CompressDumpFile, bool);
118 >    DeclareParameter(OutputForceVector, bool);
119 >    DeclareParameter(SkinThickness, RealType);
120 >    DeclareParameter(StatFileFormat, std::string);    
121 >    DeclareParameter(HydroPropFile, std::string);
122 >    DeclareParameter(Viscosity, RealType);
123 >    DeclareParameter(BeadSize, RealType);  
124 >    DeclareParameter(UseSphericalBoundaryConditions, bool);
125 >    DeclareParameter(FrozenBufferRadius, RealType);
126 >    DeclareParameter(LangevinBufferRadius, RealType);
127 >    DeclareParameter(AccumulateBoxDipole, bool);
128 >    DeclareParameter(NeighborListNeighbors, int);
129 >    DeclareParameter(UseMultipleTemperatureMethod, bool);
130 >    DeclareParameter(MTM_Ce, RealType);
131 >    DeclareParameter(MTM_G, RealType);
132 >    DeclareParameter(MTM_Io, RealType);
133 >    DeclareParameter(MTM_Sigma, RealType);    
134 >    DeclareParameter(MTM_R, RealType);    
135 >    DeclareParameter(UseRNEMD, bool);
136 >    DeclareParameter(RNEMD_exchangeTime, RealType);
137 >    DeclareParameter(RNEMD_nBins, int);
138 >    DeclareParameter(RNEMD_logWidth, int);
139 >    DeclareParameter(RNEMD_exchangeType, std::string);
140 >    DeclareParameter(RNEMD_objectSelection, std::string);
141 >    DeclareParameter(RNEMD_targetFlux, RealType);
142 >    DeclareParameter(UseRestraints, bool);
143 >    DeclareParameter(Restraint_file, std::string);
144 >    DeclareParameter(HULL_Method, std::string);
145 >    DeclareParameter(Alpha, RealType);
146 >    
147    public:
148      bool addComponent(Component* comp);
149      bool addZConsStamp(ZConsStamp* zcons);
150 +    bool addRestraintStamp(RestraintStamp* rest);
151      bool addMoleculeStamp(MoleculeStamp* molStamp);
152      int getNComponents() {return components_.size();}
153      std::vector<Component*> getComponents() {return components_;}
154      Component* getComponentAt(int index) {return components_.at(index);}    
155 <
155 >    
156      int getNZconsStamps() {return zconstraints_.size();}
157      std::vector<ZConsStamp*> getZconsStamps() {return zconstraints_;}
158      ZConsStamp* getZconsStampAt(int index) {return zconstraints_.at(index);}    
159  
160 +    int getNRestraintStamps() {return restraints_.size();}
161 +    std::vector<RestraintStamp*> getRestraintStamps() {return restraints_;}
162 +    RestraintStamp* getRestraintStampAt(int index) {return restraints_.at(index);}    
163 +
164 +    //std::string getRestraint_file(){
165 +    
166      virtual void validate();
167    private:
138
139    void parseHydroPropFile(const std::string& filename);
168      
169      std::vector<Component*> components_;
170      std::vector<ZConsStamp*> zconstraints_;    
171 +    std::vector<RestraintStamp*> restraints_;    
172      std::map<std::string, MoleculeStamp*> moleculeStamps_;
173 <
173 >    std::pair<int, int> taggedAtomPair_;
174   };
175   }
176   #endif
148

Comparing:
trunk/src/io/Globals.hpp (property svn:keywords), Revision 906 by tim, Fri Mar 17 23:20:35 2006 UTC vs.
branches/development/src/io/Globals.hpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines