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 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

# Line 91 | Line 91 | Globals::Globals() {
91    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
92    DefineOptionalParameter(SurfaceTension, "surfaceTension");
93    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
94 +  DefineOptionalParameter(PrintHeatFlux, "printHeatFlux");
95    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
96    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
97    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
# Line 118 | Line 119 | Globals::Globals() {
119    DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
120    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
121    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
122 <  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
123 <  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
124 <  DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", 0);
122 >  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
123 >  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
124 >  DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
125 >  DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
126 >  DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges, "outputFluctuatingCharges", false);
127    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
128    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
129    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
130    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
131  
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);
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");
142 –
143 –
136  
137    deprecatedKeywords_.insert("nComponents");
138    deprecatedKeywords_.insert("nZconstraints");
# Line 207 | Line 199 | void Globals::validate() {
199    CheckParameter(FrozenBufferRadius, isPositive());
200    CheckParameter(LangevinBufferRadius, isPositive());
201    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"));
202    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
203    CheckParameter(Alpha, isPositive());
215 –
204    
205    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
206      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
# Line 238 | 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