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 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1423 by gezelter, Tue Mar 30 15:05:13 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
# Line 90 | Line 90 | namespace OpenMD {
90      DeclareParameter(OrthoBoxTolerance, RealType);
91      DeclareParameter(Minimizer, std::string);
92      DeclareParameter(MinimizerMaxIter, RealType);
93 <    DeclareParameter(MinimizerWriteFrq, int);
93 >    DeclareParameter(MinimizerWriteFreq, int);
94      DeclareParameter(MinimizerStepSize, RealType);
95      DeclareParameter(MinimizerFTol, RealType);
96      DeclareParameter(MinimizerGTol, RealType);
# Line 121 | Line 121 | namespace OpenMD {
121      DeclareParameter(HydroPropFile, std::string);
122      DeclareParameter(Viscosity, RealType);
123      DeclareParameter(BeadSize, RealType);  
124 –    DeclareParameter(ThermalConductivity, RealType);
125 –    DeclareParameter(ThermalLength, RealType);
124      DeclareParameter(UseSphericalBoundaryConditions, bool);
125      DeclareParameter(FrozenBufferRadius, RealType);
126      DeclareParameter(LangevinBufferRadius, RealType);
# Line 143 | Line 141 | namespace OpenMD {
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);

Diff Legend

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