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 1313 by gezelter, Wed Oct 22 20:01:49 2008 UTC vs.
Revision 1355 by gezelter, Mon Jul 20 17:50:40 2009 UTC

# Line 124 | Line 124 | namespace oopse {
124      DeclareParameter(HydroPropFile, std::string);
125      DeclareParameter(Viscosity, RealType);
126      DeclareParameter(BeadSize, RealType);  
127 +    DeclareParameter(ThermalConductivity, RealType);
128 +    DeclareParameter(ThermalLength, RealType);
129      DeclareParameter(UseSphericalBoundaryConditions, bool);
130      DeclareParameter(FrozenBufferRadius, RealType);
131      DeclareParameter(LangevinBufferRadius, RealType);
# Line 135 | Line 137 | namespace oopse {
137      DeclareParameter(MTM_Io, RealType);
138      DeclareParameter(MTM_Sigma, RealType);    
139      DeclareParameter(MTM_R, RealType);    
140 +    DeclareParameter(UseRNEMD, bool);
141 +    DeclareParameter(RNEMD_swapTime, RealType);
142 +    DeclareParameter(RNEMD_nBins, int);
143 +    DeclareParameter(RNEMD_swapType, std::string);
144 +    DeclareParameter(RNEMD_objectSelection, std::string);
145 +    DeclareParameter(UseRestraints, bool);
146 +    DeclareParameter(Restraint_objectSelection, std::string);
147 +    DeclareParameter(Restraint_type, std::string);
148 +    DeclareParameter(Restraint_file, std::string);
149 +    DeclareParameter(Restraint_DisplacementSpringConstant, RealType);
150 +    DeclareParameter(Restraint_RollSpringConstant, RealType);  // phi
151 +    DeclareParameter(Restraint_PitchSpringConstant, RealType); // theta
152 +    DeclareParameter(Restraint_YawSpringConstant, RealType);   // psi
153      
154    public:
155      bool addComponent(Component* comp);
# Line 155 | Line 170 | namespace oopse {
170      std::vector<ZConsStamp*> zconstraints_;    
171      std::map<std::string, MoleculeStamp*> moleculeStamps_;
172      std::pair<int, int> taggedAtomPair_;
158 –
173   };
174   }
175   #endif

Diff Legend

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