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

Comparing branches/development/src/io/Globals.cpp (file contents):
Revision 1723 by gezelter, Thu May 24 20:59:54 2012 UTC vs.
Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

# Line 129 | Line 129 | Globals::Globals() {
129    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
130    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
131  
132 –  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
133 –  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0);
134 –  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
135 –  DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16);
136 –  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
137 –  DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
138 –  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzKE, "RNEMD_targetJzKE", 0.0);
139 –  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpx, "RNEMD_targetJzpx", 0.0);
140 –  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpy, "RNEMD_targetJzpy", 0.0);
141 –  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpz, "RNEMD_targetJzpz", 0.0);
142 –  DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
143 –  DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
144 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputTemperature, "RNEMD_outputTemperature", false);
145 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputVx, "RNEMD_outputVx", false);
146 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputVy, "RNEMD_outputVy", false);
147 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputXyzTemperature, "RNEMD_outputXyzTemperature", false);
148 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputRotTemperature, "RNEMD_outputRotTemperature", false);
149 –
132    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
133    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
134    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
135    DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
154 –  DefineOptionalParameterWithDefaultValue(FlucQPropagator, "flucQ.propagator", "NVT");
155 –  DefineOptionalParameterWithDefaultValue(FlucQFriction, "flucQ.friction", 1600.0);    
156 –  DefineOptionalParameterWithDefaultValue(FlucQTolerance, "flucQ.tolerance", 1.0e-6);    
157 –  DefineOptionalParameterWithDefaultValue(FlucQMaxIterations, "flucQ.maxIterations", 100);    
158 –  DefineOptionalParameterWithDefaultValue(FlucQTargetTemp, "flucQ.targetTemp", 1.0e-6);
159 –  DefineOptionalParameterWithDefaultValue(FlucQtauThermostat, "flucQ.tauThermostat", 10.0);
136  
137    deprecatedKeywords_.insert("nComponents");
138    deprecatedKeywords_.insert("nZconstraints");
# Line 223 | Line 199 | void Globals::validate() {
199    CheckParameter(FrozenBufferRadius, isPositive());
200    CheckParameter(LangevinBufferRadius, isPositive());
201    CheckParameter(NeighborListNeighbors, isPositive());
226 –  CheckParameter(RNEMD_exchangeTime, isPositive());
227 –  CheckParameter(RNEMD_nBins, isPositive() && isEven());
228 –  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("KineticScaleVAM") || isEqualIgnoreCase("KineticScaleAM") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale") || isEqualIgnoreCase("ShiftScaleV") || isEqualIgnoreCase("ShiftScaleVAM"));
202    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
203    CheckParameter(Alpha, isPositive());
231 –  CheckParameter(FlucQPropagator, isEqualIgnoreCase("NVT") || isEqualIgnoreCase("Langevin") || isEqualIgnoreCase("Minimizer") || isEqualIgnoreCase("Exact") );
232 –  CheckParameter(FlucQFriction, isNonNegative());    
233 –  CheckParameter(FlucQTolerance, isPositive());    
234 –  CheckParameter(FlucQMaxIterations, isPositive());    
235 –  CheckParameter(FlucQTargetTemp,  isNonNegative());
236 –  CheckParameter(FlucQtauThermostat, isPositive());
204    
205    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
206      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
# Line 259 | Line 226 | bool Globals::addRestraintStamp(RestraintStamp* rest)
226      return true;
227   }
228  
229 + bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
230 +  if (flucQpars_ != NULL)
231 +    delete flucQpars_;
232 +    
233 +  flucQpars_ = fqp;
234 +  return true;
235 + }
236 +
237 + bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
238 +  if (rnemdPars_ != NULL)
239 +    delete rnemdPars_;
240 +    
241 +  rnemdPars_ = rnemdPars;
242 +  return true;
243 + }
244 +
245   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
246      std::string molStampName = molStamp->getName();
247      std::map<std::string, MoleculeStamp*>::iterator i;

Diff Legend

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