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 1327 by gezelter, Mon Mar 9 14:03:31 2009 UTC vs.
Revision 1354 by gezelter, Mon Jun 15 20:12:09 2009 UTC

# Line 139 | Line 139 | namespace oopse {
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      
152    public:
153      bool addComponent(Component* comp);
# Line 159 | Line 168 | namespace oopse {
168      std::vector<ZConsStamp*> zconstraints_;    
169      std::map<std::string, MoleculeStamp*> moleculeStamps_;
170      std::pair<int, int> taggedAtomPair_;
162 –
171   };
172   }
173   #endif

Diff Legend

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