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 1715 by gezelter, Tue May 22 21:55:31 2012 UTC vs.
Revision 1749 by gezelter, Thu Jun 7 02:47:21 2012 UTC

# Line 52 | Line 52 | Globals::Globals() {
52  
53   namespace OpenMD {
54   Globals::Globals() {
55 +  
56 +  flucQpars_ = new FluctuatingChargeParameters();
57 +  rnemdPars_ = new RNEMDParameters();
58 +  minimizerPars_ = new MinimizerParameters();
59 +
60    DefineParameter(ForceField, "forceField")
61  
62    DefineOptionalParameter(TargetTemp, "targetTemp");
# Line 73 | Line 78 | Globals::Globals() {
78    DefineOptionalParameter(ZconsTol, "zconsTol");
79    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
80    DefineOptionalParameter(Seed, "seed");
76 –  DefineOptionalParameter(Minimizer, "minimizer");
77 –  DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
78 –  DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
79 –  DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
80 –  DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
81 –  DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
82 –  DefineOptionalParameter(MinimizerLSTol, "minimizerLSTol");
83 –  DefineOptionalParameter(MinimizerLSMaxIter, "minimizerLSMaxIter");
81    DefineOptionalParameter(ZconsGap, "zconsGap");
82    DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
83    DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
# Line 91 | Line 88 | Globals::Globals() {
88    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
89    DefineOptionalParameter(SurfaceTension, "surfaceTension");
90    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
91 +
92    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
93    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
94    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
# Line 119 | Line 117 | Globals::Globals() {
117    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
118    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
119    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
120 +  DefineOptionalParameterWithDefaultValue(PrintHeatFlux, "printHeatFlux", false);
121    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
122    DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
123    DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
# Line 128 | Line 127 | Globals::Globals() {
127    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
128    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
129  
131 –  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
132 –  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0);
133 –  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
134 –  DefineOptionalParameterWithDefaultValue(RNEMD_logWidth, "RNEMD_logWidth", 16);
135 –  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
136 –  DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
137 –  DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
138 –  DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
139 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputDimensionalTemperature, "RNEMD_outputDimensionalTemperature", false);
130    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
131    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
132    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
133    DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
144 –  DefineOptionalParameterWithDefaultValue(FlucQPropagator, "flucQ.propagator", "NVT");
145 –  DefineOptionalParameterWithDefaultValue(FlucQFriction, "flucQ.friction", 1600.0);    
146 –  DefineOptionalParameterWithDefaultValue(FlucQTolerance, "flucQ.tolerance", 1.0e-6);    
147 –  DefineOptionalParameterWithDefaultValue(FlucQMaxIterations, "flucQ.maxIterations", 100);    
148 –  DefineOptionalParameterWithDefaultValue(FlucQTargetTemp, "flucQ.targetTemp", 1.0e-6);
149 –  DefineOptionalParameterWithDefaultValue(FlucQtauThermostat, "flucQ.tauThermostat", 10.0);
134  
135    deprecatedKeywords_.insert("nComponents");
136    deprecatedKeywords_.insert("nZconstraints");
# Line 156 | Line 140 | Globals::Globals() {
140    deprecatedKeywords_.insert("thermIntOmegaSpringConst");
141    deprecatedKeywords_.insert("useSolidThermInt");  
142    deprecatedKeywords_.insert("useLiquidThermInt");
143 +  deprecatedKeywords_.insert("minimizerMaxIter");
144 +  deprecatedKeywords_.insert("minimizerWriteFreq");
145 +  deprecatedKeywords_.insert("minimizerStepSize");
146 +  deprecatedKeywords_.insert("minimizerFTol");
147 +  deprecatedKeywords_.insert("minimizerGTol");
148 +  deprecatedKeywords_.insert("minimizerLSTol");
149 +  deprecatedKeywords_.insert("minimizerLSMaxIter");
150 +
151      
152   }
153  
# Line 186 | Line 178 | void Globals::validate() {
178    CheckParameter(ZconsTime, isPositive());
179    CheckParameter(ZconsTol, isPositive());
180    CheckParameter(Seed, isPositive());
189 –  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
190 –  CheckParameter(MinimizerMaxIter, isPositive());
191 –  CheckParameter(MinimizerWriteFreq, isPositive());
192 –  CheckParameter(MinimizerStepSize, isPositive());
193 –  CheckParameter(MinimizerFTol, isPositive());
194 –  CheckParameter(MinimizerGTol, isPositive());
195 –  CheckParameter(MinimizerLSTol, isPositive());
196 –  CheckParameter(MinimizerLSMaxIter, isPositive());
181    CheckParameter(ZconsGap, isPositive());
182    CheckParameter(ZconsFixtime, isPositive());
183    CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
# Line 213 | Line 197 | void Globals::validate() {
197    CheckParameter(FrozenBufferRadius, isPositive());
198    CheckParameter(LangevinBufferRadius, isPositive());
199    CheckParameter(NeighborListNeighbors, isPositive());
216 –  CheckParameter(RNEMD_exchangeTime, isPositive());
217 –  CheckParameter(RNEMD_nBins, isPositive() && isEven());
218 –  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
200    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
201    CheckParameter(Alpha, isPositive());
221 –  CheckParameter(FlucQPropagator, isEqualIgnoreCase("NVT") || isEqualIgnoreCase("Langevin") || isEqualIgnoreCase("Minimizer") || isEqualIgnoreCase("Exact") );
222 –  CheckParameter(FlucQFriction, isNonNegative());    
223 –  CheckParameter(FlucQTolerance, isPositive());    
224 –  CheckParameter(FlucQMaxIterations, isPositive());    
225 –  CheckParameter(FlucQTargetTemp,  isNonNegative());
226 –  CheckParameter(FlucQtauThermostat, isPositive());
202    
203    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
204      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
# Line 249 | Line 224 | bool Globals::addRestraintStamp(RestraintStamp* rest)
224      return true;
225   }
226  
227 + bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
228 +  if (flucQpars_ != NULL)
229 +    delete flucQpars_;
230 +    
231 +  flucQpars_ = fqp;
232 +  return true;
233 + }
234 +
235 + bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
236 +  if (rnemdPars_ != NULL)
237 +    delete rnemdPars_;
238 +    
239 +  rnemdPars_ = rnemdPars;
240 +  return true;
241 + }
242 +
243 + bool Globals::addMinimizerParameters(MinimizerParameters* miniPars) {
244 +  if (minimizerPars_ != NULL)
245 +    delete minimizerPars_;
246 +    
247 +  minimizerPars_ = miniPars;
248 +  return true;
249 + }
250 +
251   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
252      std::string molStampName = molStamp->getName();
253      std::map<std::string, MoleculeStamp*>::iterator i;

Diff Legend

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