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 1291 by gezelter, Thu Sep 11 19:40:59 2008 UTC vs.
Revision 1354 by gezelter, Mon Jun 15 20:12:09 2009 UTC

# Line 83 | Line 83 | namespace oopse {
83      DeclareParameter(ZconsTime, RealType);
84      DeclareParameter(ZconsTol, RealType);
85      DeclareParameter(ZconsForcePolicy, std::string);
86 <    DeclareParameter(Seed, int);
86 >    DeclareParameter(Seed, unsigned long int);
87      DeclareParameter(UseInitalTime, bool);
88      DeclareParameter(UseIntialExtendedSystemState, bool);
89      DeclareParameter(OrthoBoxTolerance, RealType);
# Line 129 | Line 129 | namespace oopse {
129      DeclareParameter(LangevinBufferRadius, RealType);
130      DeclareParameter(AccumulateBoxDipole, bool);
131      DeclareParameter(NeighborListNeighbors, int);
132 +    DeclareParameter(UseMultipleTemperatureMethod, bool);
133 +    DeclareParameter(MTM_Ce, RealType);
134 +    DeclareParameter(MTM_G, RealType);
135 +    DeclareParameter(MTM_Io, RealType);
136 +    DeclareParameter(MTM_Sigma, RealType);    
137 +    DeclareParameter(MTM_R, RealType);    
138 +    DeclareParameter(UseRNEMD, bool);
139 +    DeclareParameter(RNEMD_swapTime, RealType);
140 +    DeclareParameter(RNEMD_nBins, int);
141 +    DeclareParameter(RNEMD_swapType, std::string);
142 +    DeclareParameter(RNEMD_objectSelection, std::string);
143 +    DeclareParameter(UseRestraints, bool);
144 +    DeclareParameter(Restraint_objectSelection, std::string);
145 +    DeclareParameter(Restraint_type, std::string);
146 +    DeclareParameter(Restraint_file, std::string);
147 +    DeclareParameter(Restraint_DisplacementSpringConstant, RealType);
148 +    DeclareParameter(Restraint_RollSpringConstant, RealType);  // phi
149 +    DeclareParameter(Restraint_PitchSpringConstant, RealType); // theta
150 +    DeclareParameter(Restraint_YawSpringConstant, RealType);   // psi
151      
133 –    
152    public:
153      bool addComponent(Component* comp);
154      bool addZConsStamp(ZConsStamp* zcons);
# Line 150 | Line 168 | namespace oopse {
168      std::vector<ZConsStamp*> zconstraints_;    
169      std::map<std::string, MoleculeStamp*> moleculeStamps_;
170      std::pair<int, int> taggedAtomPair_;
153 –
171   };
172   }
173   #endif

Diff Legend

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