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 1126 by gezelter, Fri Apr 6 21:53:43 2007 UTC vs.
Revision 1327 by gezelter, Mon Mar 9 14:03:31 2009 UTC

# Line 93 | Line 93 | Globals::Globals() {
93    DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
94    DefineOptionalParameter(SurfaceTension, "surfaceTension");
95    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
96 +  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
97 +  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
98    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
99    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
100    DefineOptionalParameter(HydroPropFile, "HydroPropFile");
# Line 101 | Line 103 | Globals::Globals() {
103    DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
104    DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
105    DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
106 <  DefineOptionalParameter(TempDepViscosityA,"tempDepViscosityA");
107 <  DefineOptionalParameter(TempDepViscosityB,"tempDepViscosityB");
108 <  DefineOptionalParameter(TempDepViscosityC,"tempDepViscosityC");
109 <  DefineOptionalParameter(TempDepViscosityD,"tempDepViscosityD");
106 >  DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
107 >  DefineOptionalParameter(MTM_Ce, "MTM_Ce");
108 >  DefineOptionalParameter(MTM_G, "MTM_G");
109 >  DefineOptionalParameter(MTM_Io, "MTM_Io");
110 >  DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
111 >  DefineOptionalParameter(MTM_R, "MTM_R");
112 >  
113  
114    
115    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
# Line 127 | Line 132 | Globals::Globals() {
132    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
133    DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
134  
135 +  DefineOptionalParameterWithDefaultValue(UseRNEMD, "useRNEMD", false);
136 +  DefineOptionalParameterWithDefaultValue(RNEMD_swapTime, "RNEMD_swapTime", 100.0);
137 +  DefineOptionalParameterWithDefaultValue(RNEMD_nBins, "RNEMD_nBins", 15);
138 +  DefineOptionalParameterWithDefaultValue(RNEMD_swapType, "RNEMD_swapType", "Kinetic");
139 +  
140 +
141    deprecatedKeywords_.insert("nComponents");
142    deprecatedKeywords_.insert("nZconstraints");
143    deprecatedKeywords_.insert("initialConfig");
# Line 143 | Line 154 | void Globals::validate() {
154  
155    CheckParameter(ForceField, isNotEmpty());
156    CheckParameter(TargetTemp, isPositive());
157 <  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"));
157 >  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"));
158    CheckParameter(Dt, isPositive());
159    CheckParameter(RunTime, isPositive());
160    CheckParameter(FinalConfig, isNotEmpty());
# Line 192 | Line 203 | void Globals::validate() {
203    CheckParameter(FrozenBufferRadius, isPositive());
204    CheckParameter(LangevinBufferRadius, isPositive());
205    CheckParameter(NeighborListNeighbors, isPositive());
206 +  CheckParameter(RNEMD_swapTime, isPositive());
207 +  CheckParameter(RNEMD_nBins, isPositive());
208 +  CheckParameter(RNEMD_swapType, isEqualIgnoreCase("Kinetic") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz"));
209  
210    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
211      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {

Diff Legend

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