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 1576 by gezelter, Wed Jun 8 16:05:07 2011 UTC vs.
Revision 1722 by gezelter, Thu May 24 14:23:40 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include <stdlib.h>
# Line 117 | Line 118 | Globals::Globals() {
118    DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
119    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
120    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
121 <  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
122 <  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
121 >  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
122 >  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
123 >  DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
124 >  DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
125 >  DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges, "outputFluctuatingCharges", false);
126    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
127    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
128    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
# Line 130 | Line 134 | Globals::Globals() {
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_targetJzKE, "RNEMD_targetJzKE", 0.0);
138 +  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpx, "RNEMD_targetJzpx", 0.0);
139 +  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpy, "RNEMD_targetJzpy", 0.0);
140 +  DefineOptionalParameterWithDefaultValue(RNEMD_targetJzpz, "RNEMD_targetJzpz", 0.0);
141    DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
142 +  DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
143 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputTemperature, "RNEMD_outputTemperature", false);
144 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputVx, "RNEMD_outputVx", false);
145 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputVy, "RNEMD_outputVy", false);
146 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputXyzTemperature, "RNEMD_outputXyzTemperature", false);
147 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputRotTemperature, "RNEMD_outputRotTemperature", false);
148 +
149    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
150    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
151    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
152    DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
153 <
154 <
153 >  DefineOptionalParameterWithDefaultValue(FlucQPropagator, "flucQ.propagator", "NVT");
154 >  DefineOptionalParameterWithDefaultValue(FlucQFriction, "flucQ.friction", 1600.0);    
155 >  DefineOptionalParameterWithDefaultValue(FlucQTolerance, "flucQ.tolerance", 1.0e-6);    
156 >  DefineOptionalParameterWithDefaultValue(FlucQMaxIterations, "flucQ.maxIterations", 100);    
157 >  DefineOptionalParameterWithDefaultValue(FlucQTargetTemp, "flucQ.targetTemp", 1.0e-6);
158 >  DefineOptionalParameterWithDefaultValue(FlucQtauThermostat, "flucQ.tauThermostat", 10.0);
159  
160    deprecatedKeywords_.insert("nComponents");
161    deprecatedKeywords_.insert("nZconstraints");
# Line 160 | Line 179 | void Globals::validate() {
179  
180    CheckParameter(ForceField, isNotEmpty());
181    CheckParameter(TargetTemp, isPositive());
182 <  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("SMIPD"));
182 >  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPTsz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("LANGEVINHULL") || isEqualIgnoreCase("LHULL") || isEqualIgnoreCase("SMIPD"));
183    CheckParameter(Dt, isPositive());
184    CheckParameter(RunTime, isPositive());
185    CheckParameter(FinalConfig, isNotEmpty());
# Line 192 | Line 211 | void Globals::validate() {
211    CheckParameter(ForceFieldFileName, isNotEmpty());
212    CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
213    CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
214 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
214 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
215    CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
216    CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
217    CheckParameter(OrthoBoxTolerance, isPositive());  
# Line 205 | Line 224 | void Globals::validate() {
224    CheckParameter(NeighborListNeighbors, isPositive());
225    CheckParameter(RNEMD_exchangeTime, isPositive());
226    CheckParameter(RNEMD_nBins, isPositive() && isEven());
227 <  CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
209 <  CheckParameter(RNEMD_targetFlux, isNonNegative());
227 >  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"));
228    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
229    CheckParameter(Alpha, isPositive());
230 <
230 >  CheckParameter(FlucQPropagator, isEqualIgnoreCase("NVT") || isEqualIgnoreCase("Langevin") || isEqualIgnoreCase("Minimizer") || isEqualIgnoreCase("Exact") );
231 >  CheckParameter(FlucQFriction, isNonNegative());    
232 >  CheckParameter(FlucQTolerance, isPositive());    
233 >  CheckParameter(FlucQMaxIterations, isPositive());    
234 >  CheckParameter(FlucQTargetTemp,  isNonNegative());
235 >  CheckParameter(FlucQtauThermostat, isPositive());
236    
237    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
238      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
# Line 219 | Line 242 | void Globals::validate() {
242      }
243    }
244   }
245 <  
245 >
246   bool Globals::addComponent(Component* comp) {
247      components_.push_back(comp);
248      return true;

Diff Legend

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