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 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1126 by gezelter, Fri Apr 6 21:53:43 2007 UTC

# Line 45 | Line 45
45   #include <string>
46  
47   #include "io/Globals.hpp"
48 + #include "io/ParamConstraint.hpp"
49 + #include "utils/MemoryUtils.hpp"
50   #include "utils/simError.h"
51  
50 – #include "io/ParamConstraint.hpp"
51 –
52   namespace oopse {
53   Globals::Globals() {
54    DefineParameter(ForceField, "forceField")
# 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");
68 >  DefineOptionalParameter(TargetPressure, "targetPressure");  
69    DefineOptionalParameter(TauThermostat, "tauThermostat");
70    DefineOptionalParameter(TauBarostat, "tauBarostat");
71    DefineOptionalParameter(ZconsTime, "zconsTime");
# 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 <  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
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(UseAtomicVirial, "useAtomicVirial", true);
112    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
113    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
114    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
# Line 108 | Line 117 | Globals::Globals() {
117    DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
118    DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
119    DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
120 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
120 >  DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
121 >  DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
122 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
123    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
124    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
125    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
126    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
127 +  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
128 +  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
129  
130 <
131 <    deprecatedKeywords_.insert("nComponents");
132 <    deprecatedKeywords_.insert("nZconstraints");
130 >  deprecatedKeywords_.insert("nComponents");
131 >  deprecatedKeywords_.insert("nZconstraints");
132 >  deprecatedKeywords_.insert("initialConfig");
133      
134   }
135  
136   Globals::~Globals() {
137 <
138 <
137 >    MemoryUtils::deletePointers(components_);
138 >    MemoryUtils::deletePointers(zconstraints_);
139   }
140  
141   void Globals::validate() {
# Line 130 | Line 143 | void Globals::validate() {
143  
144    CheckParameter(ForceField, isNotEmpty());
145    CheckParameter(TargetTemp, isPositive());
146 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) );
146 >  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"));
147    CheckParameter(Dt, isPositive());
148    CheckParameter(RunTime, isPositive());
136 –  CheckParameter(InitialConfig, isNotEmpty());
149    CheckParameter(FinalConfig, isNotEmpty());
150    CheckParameter(SampleTime, isNonNegative());
151    CheckParameter(ResetTime, isNonNegative());
# Line 142 | Line 154 | void Globals::validate() {
154    CheckParameter(SwitchingRadius, isNonNegative());
155    CheckParameter(Dielectric, isPositive());
156    CheckParameter(ThermalTime,  isNonNegative());
145 –  CheckParameter(TargetPressure,  isPositive());
157    CheckParameter(TauThermostat, isPositive());
158    CheckParameter(TauBarostat, isPositive());
159    CheckParameter(ZconsTime, isPositive());
160    CheckParameter(ZconsTol, isPositive());
161    CheckParameter(Seed, isPositive());
162 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
162 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
163    CheckParameter(MinimizerMaxIter, isPositive());
164    CheckParameter(MinimizerWriteFrq, isPositive());
165    CheckParameter(MinimizerStepSize, isPositive());
# Line 158 | Line 169 | void Globals::validate() {
169    CheckParameter(MinimizerLSMaxIter, isPositive());
170    CheckParameter(ZconsGap, isPositive());
171    CheckParameter(ZconsFixtime, isPositive());
172 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
172 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
173    CheckParameter(ThermodynamicIntegrationK, isPositive());
174    CheckParameter(ForceFieldVariant, isNotEmpty());
175    CheckParameter(ForceFieldFileName, isNotEmpty());
176    CheckParameter(ThermIntDistSpringConst, isPositive());
177    CheckParameter(ThermIntThetaSpringConst, isPositive());
178    CheckParameter(ThermIntOmegaSpringConst, isPositive());
179 <  CheckParameter(SurfaceTension, isPositive());
180 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE")) || isEqualIgnoreCase(std::string("REACTION_FIELD")));
181 <  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
182 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
172 <  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase(std::string("CUBIC")) || isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
179 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
180 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
181 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
182 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
183    //CheckParameter(StatFileFormat,);    
174 –  //CheckParameter(MixingRule,);
184    CheckParameter(OrthoBoxTolerance, isPositive());  
185    CheckParameter(ThermIntDistSpringConst, isPositive());
186    CheckParameter(ThermIntThetaSpringConst, isPositive());
187    CheckParameter(ThermIntOmegaSpringConst, isPositive());
188    CheckParameter(DampingAlpha,isNonNegative());
189    CheckParameter(SkinThickness, isPositive());
190 +  CheckParameter(Viscosity, isNonNegative());
191 +  CheckParameter(BeadSize, isPositive());
192 +  CheckParameter(FrozenBufferRadius, isPositive());
193 +  CheckParameter(LangevinBufferRadius, isPositive());
194 +  CheckParameter(NeighborListNeighbors, isPositive());
195  
196    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
197      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
198 <        std::cout << "Globals Error: can not find molecule stamp for component" << std::endl;
198 >        std::ostringstream oss;
199 >        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
200 >        throw OOPSEException(oss.str());          
201      }
202    }
203   }
# Line 205 | Line 221 | bool Globals::addMoleculeStamp(MoleculeStamp* molStamp
221          moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
222          ret = true;
223      } else {
224 <
224 >        std::ostringstream oss;
225 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
226 >        throw OOPSEException(oss.str());  
227      }
228      return ret;
229   }

Diff Legend

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