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

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 927 by tim, Fri Mar 31 18:09:22 2006 UTC vs.
Revision 1095 by chuckv, Tue Dec 5 00:17:24 2006 UTC

# Line 57 | Line 57 | Globals::Globals() {
57    DefineOptionalParameter(Ensemble, "ensemble");
58    DefineOptionalParameter(Dt, "dt");
59    DefineOptionalParameter(RunTime, "runTime");
60 –  DefineOptionalParameter(InitialConfig, "initialConfig");
60    DefineOptionalParameter(FinalConfig, "finalConfig");
61    DefineOptionalParameter(SampleTime, "sampleTime");
62    DefineOptionalParameter(ResetTime, "resetTime");
63    DefineOptionalParameter(StatusTime, "statusTime");
64    DefineOptionalParameter(CutoffRadius, "cutoffRadius");
65    DefineOptionalParameter(SwitchingRadius, "switchingRadius");
67 –  DefineOptionalParameter(Dielectric, "dielectric");
66    DefineOptionalParameter(TempSet, "tempSet");
67    DefineOptionalParameter(ThermalTime, "thermalTime");
68    DefineOptionalParameter(TargetPressure, "targetPressure");
# Line 89 | Line 87 | Globals::Globals() {
87    DefineOptionalParameter(ThermodynamicIntegrationK, "thermodynamicIntegrationK");
88    DefineOptionalParameter(ForceFieldVariant, "forceFieldVariant");
89    DefineOptionalParameter(ForceFieldFileName, "forceFieldFileName");
90 +  DefineOptionalParameter(DampingAlpha, "dampingAlpha");
91    DefineOptionalParameter(ThermIntDistSpringConst, "thermIntDistSpringConst");
92    DefineOptionalParameter(ThermIntThetaSpringConst, "thermIntThetaSpringConst");
93    DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
94    DefineOptionalParameter(SurfaceTension, "surfaceTension");
95    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
97 –  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
98 –  DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
96    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
97    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
98    DefineOptionalParameter(HydroPropFile, "HydroPropFile");
99    DefineOptionalParameter(Viscosity, "viscosity");
100    DefineOptionalParameter(BeadSize, "beadSize");
101 +  DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
102 +  DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
103 +  DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
104 +  DefineOptionalParameter(TempDepViscosityA,"tempDepViscosityA");
105 +  DefineOptionalParameter(TempDepViscosityB,"tempDepViscosityB");
106 +  DefineOptionalParameter(TempDepViscosityC,"tempDepViscosityC");
107 +  DefineOptionalParameter(TempDepViscosityD,"tempDepViscosityD");
108 +
109    
110    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
111    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
# Line 111 | Line 116 | Globals::Globals() {
116    DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
117    DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
118    DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
119 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
119 >  DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
120 >  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
121 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
122    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
123    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
124    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
125    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
126 +  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
127 +  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
128  
129 <
130 <    deprecatedKeywords_.insert("nComponents");
131 <    deprecatedKeywords_.insert("nZconstraints");
129 >  deprecatedKeywords_.insert("nComponents");
130 >  deprecatedKeywords_.insert("nZconstraints");
131 >  deprecatedKeywords_.insert("initialConfig");
132      
133   }
134  
# Line 133 | Line 142 | void Globals::validate() {
142  
143    CheckParameter(ForceField, isNotEmpty());
144    CheckParameter(TargetTemp, isPositive());
145 <  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("NPRT"));
145 >  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"));
146    CheckParameter(Dt, isPositive());
147    CheckParameter(RunTime, isPositive());
139 –  CheckParameter(InitialConfig, isNotEmpty());
148    CheckParameter(FinalConfig, isNotEmpty());
149    CheckParameter(SampleTime, isNonNegative());
150    CheckParameter(ResetTime, isNonNegative());
# Line 145 | Line 153 | void Globals::validate() {
153    CheckParameter(SwitchingRadius, isNonNegative());
154    CheckParameter(Dielectric, isPositive());
155    CheckParameter(ThermalTime,  isNonNegative());
148 –  CheckParameter(TargetPressure,  isPositive());
156    CheckParameter(TauThermostat, isPositive());
157    CheckParameter(TauBarostat, isPositive());
158    CheckParameter(ZconsTime, isPositive());
# Line 161 | Line 168 | void Globals::validate() {
168    CheckParameter(MinimizerLSMaxIter, isPositive());
169    CheckParameter(ZconsGap, isPositive());
170    CheckParameter(ZconsFixtime, isPositive());
171 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
171 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
172    CheckParameter(ThermodynamicIntegrationK, isPositive());
173    CheckParameter(ForceFieldVariant, isNotEmpty());
174    CheckParameter(ForceFieldFileName, isNotEmpty());
175    CheckParameter(ThermIntDistSpringConst, isPositive());
176    CheckParameter(ThermIntThetaSpringConst, isPositive());
177    CheckParameter(ThermIntOmegaSpringConst, isPositive());
171 –  CheckParameter(SurfaceTension, isNonNegative());
178    CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
179    CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
180    CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
# Line 180 | Line 186 | void Globals::validate() {
186    CheckParameter(ThermIntOmegaSpringConst, isPositive());
187    CheckParameter(DampingAlpha,isNonNegative());
188    CheckParameter(SkinThickness, isPositive());
189 <  CheckParameter(Viscosity,isNonNegative());
190 <  CheckParameter(BeadSize,isPositive());
189 >  CheckParameter(Viscosity, isNonNegative());
190 >  CheckParameter(BeadSize, isPositive());
191 >  CheckParameter(FrozenBufferRadius, isPositive());
192 >  CheckParameter(LangevinBufferRadius, isPositive());
193 >  CheckParameter(NeighborListNeighbors, isPositive());
194 >
195    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
196      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
197          std::ostringstream oss;

Diff Legend

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