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

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 905 by tim, Mon Mar 13 22:42:40 2006 UTC vs.
Revision 906 by tim, Fri Mar 17 23:20:35 2006 UTC

# Line 99 | Line 99 | Globals::Globals() {
99    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
100    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101    DefineOptionalParameter(HydroPropFile, "HydroPropFile");
102 +  DefineOptionalParameter(Viscosity, "viscosity");
103 +  DefineOptionalParameter(BeadSize, "beadSize");
104 +  
105    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
106    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
107    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
# Line 177 | Line 180 | void Globals::validate() {
180    CheckParameter(ThermIntOmegaSpringConst, isPositive());
181    CheckParameter(DampingAlpha,isNonNegative());
182    CheckParameter(SkinThickness, isPositive());
183 <
183 >  CheckParameter(Viscosity,isNonNegative());
184 >  CheckParameter(BeadSize,isPositive());
185    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
186      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
187          std::ostringstream oss;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines