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 1711 by gezelter, Sat May 19 02:58:35 2012 UTC vs.
Revision 1744 by gezelter, Tue Jun 5 18:07:08 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 +
59    DefineParameter(ForceField, "forceField")
60  
61    DefineOptionalParameter(TargetTemp, "targetTemp");
# Line 91 | Line 95 | Globals::Globals() {
95    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
96    DefineOptionalParameter(SurfaceTension, "surfaceTension");
97    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
98 +  DefineOptionalParameter(PrintHeatFlux, "printHeatFlux");
99    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
100    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
101    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
# Line 121 | Line 126 | Globals::Globals() {
126    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
127    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
128    DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
129 +  DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
130 +  DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges, "outputFluctuatingCharges", false);
131    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
132    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
133    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
134    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
135  
129 –  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
130 –  DefineOptionalParameterWithDefaultValue(RNEMD_exchangeTime, "RNEMD_exchangeTime", 100.0);
131 –  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 16);
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(RNEMD_binShift, "RNEMD_binShift", false);
137 –  DefineOptionalParameterWithDefaultValue(RNEMD_outputDimensionalTemperature, "RNEMD_outputDimensionalTemperature", false);
136    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
137    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
138    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
139    DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
140  
143 –
144 –
141    deprecatedKeywords_.insert("nComponents");
142    deprecatedKeywords_.insert("nZconstraints");
143    deprecatedKeywords_.insert("initialConfig");
# Line 207 | Line 203 | void Globals::validate() {
203    CheckParameter(FrozenBufferRadius, isPositive());
204    CheckParameter(LangevinBufferRadius, isPositive());
205    CheckParameter(NeighborListNeighbors, isPositive());
210 –  CheckParameter(RNEMD_exchangeTime, isPositive());
211 –  CheckParameter(RNEMD_nBins, isPositive() && isEven());
212 –  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
206    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
207    CheckParameter(Alpha, isPositive());
215 –
208    
209    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
210      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
# Line 238 | Line 230 | bool Globals::addRestraintStamp(RestraintStamp* rest)
230      return true;
231   }
232  
233 + bool Globals::addFluctuatingChargeParameters(FluctuatingChargeParameters* fqp) {
234 +  if (flucQpars_ != NULL)
235 +    delete flucQpars_;
236 +    
237 +  flucQpars_ = fqp;
238 +  return true;
239 + }
240 +
241 + bool Globals::addRNEMDParameters(RNEMDParameters* rnemdPars) {
242 +  if (rnemdPars_ != NULL)
243 +    delete rnemdPars_;
244 +    
245 +  rnemdPars_ = rnemdPars;
246 +  return true;
247 + }
248 +
249   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
250      std::string molStampName = molStamp->getName();
251      std::map<std::string, MoleculeStamp*>::iterator i;

Diff Legend

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