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 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
Revision 1367 by skuang, Mon Oct 19 13:35:42 2009 UTC

# Line 127 | Line 127 | Globals::Globals() {
127    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
128  
129    DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
130 <  DefineOptionalParameterWithDefaultValue(RNEMD_swapTime, "RNEMD_swapTime", 100.0);
130 >  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0);
131    DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
132 <  DefineOptionalParameterWithDefaultValue(RNEMD_swapType, "RNEMD_swapType", "Kinetic");
132 >  DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16);
133 >  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
134 >  DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
135    DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
136    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
137    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
# Line 203 | Line 205 | void Globals::validate() {
205    CheckParameter(FrozenBufferRadius, isPositive());
206    CheckParameter(LangevinBufferRadius, isPositive());
207    CheckParameter(NeighborListNeighbors, isPositive());
208 <  CheckParameter(RNEMD_swapTime, isPositive());
208 >  CheckParameter(RNEMD_exchangeTime, isPositive());
209    CheckParameter(RNEMD_nBins, isPositive() && isEven());
210 <  CheckParameter(RNEMD_swapType, isEqualIgnoreCase("Kinetic") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz"));
210 >  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
211 >  CheckParameter(RNEMD_targetFlux, isNonNegative());
212  
213    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
214      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
# Line 215 | Line 218 | void Globals::validate() {
218      }
219    }
220   }
221 <    
221 >  
222   bool Globals::addComponent(Component* comp) {
223      components_.push_back(comp);
224      return true;

Diff Legend

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