ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/io/Globals.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/io/Globals.cpp (file contents):
Revision 2515 by tim, Fri Dec 16 18:26:41 2005 UTC vs.
Revision 2917 by chrisfen, Mon Jul 3 13:18:43 2006 UTC

# Line 98 | Line 98 | Globals::Globals() {
98    DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
99    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
100    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101 <  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
101 >  DefineOptionalParameter(HydroPropFile, "HydroPropFile");
102 >  DefineOptionalParameter(Viscosity, "viscosity");
103 >  DefineOptionalParameter(BeadSize, "beadSize");
104 >  DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
105 >  DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
106 >  
107    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
108    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
109    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
# Line 113 | Line 118 | Globals::Globals() {
118    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
119    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
120    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
121 +  DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
122 +  DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole, "accumulateBoxDipole", false);
123  
124  
125      deprecatedKeywords_.insert("nComponents");
# Line 130 | Line 137 | void Globals::validate() {
137  
138    CheckParameter(ForceField, isNotEmpty());
139    CheckParameter(TargetTemp, isPositive());
140 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) || isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf")) || isEqualIgnoreCase(std::string("NPTxyz")) );
140 >  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT"));
141    CheckParameter(Dt, isPositive());
142    CheckParameter(RunTime, isPositive());
143    CheckParameter(InitialConfig, isNotEmpty());
# Line 148 | Line 155 | void Globals::validate() {
155    CheckParameter(ZconsTime, isPositive());
156    CheckParameter(ZconsTol, isPositive());
157    CheckParameter(Seed, isPositive());
158 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) || isEqualIgnoreCase(std::string("CG")));
158 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
159    CheckParameter(MinimizerMaxIter, isPositive());
160    CheckParameter(MinimizerWriteFrq, isPositive());
161    CheckParameter(MinimizerStepSize, isPositive());
# Line 158 | Line 165 | void Globals::validate() {
165    CheckParameter(MinimizerLSMaxIter, isPositive());
166    CheckParameter(ZconsGap, isPositive());
167    CheckParameter(ZconsFixtime, isPositive());
168 <  CheckParameter(ThermodynamicIntegrationLambda, isPositive());
168 >  CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
169    CheckParameter(ThermodynamicIntegrationK, isPositive());
170    CheckParameter(ForceFieldVariant, isNotEmpty());
171    CheckParameter(ForceFieldFileName, isNotEmpty());
172    CheckParameter(ThermIntDistSpringConst, isPositive());
173    CheckParameter(ThermIntThetaSpringConst, isPositive());
174    CheckParameter(ThermIntOmegaSpringConst, isPositive());
175 <  CheckParameter(SurfaceTension, isPositive());
176 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE")) || isEqualIgnoreCase(std::string("REACTION_FIELD")));
177 <  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
178 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
179 <  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase(std::string("CUBIC")) || isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
175 >  CheckParameter(SurfaceTension, isNonNegative());
176 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
177 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
178 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
179 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
180    //CheckParameter(StatFileFormat,);    
174 –  //CheckParameter(MixingRule,);
181    CheckParameter(OrthoBoxTolerance, isPositive());  
182    CheckParameter(ThermIntDistSpringConst, isPositive());
183    CheckParameter(ThermIntThetaSpringConst, isPositive());
184    CheckParameter(ThermIntOmegaSpringConst, isPositive());
185    CheckParameter(DampingAlpha,isNonNegative());
186    CheckParameter(SkinThickness, isPositive());
187 <
187 >  CheckParameter(Viscosity, isNonNegative());
188 >  CheckParameter(BeadSize, isPositive());
189 >  CheckParameter(FrozenBufferRadius, isPositive());
190 >  CheckParameter(LangevinBufferRadius, isPositive());
191    for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
192      if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
193 <        std::cout << "Globals Error: can not find molecule stamp for component" << std::endl;
193 >        std::ostringstream oss;
194 >        oss << "Globals Error: can not find molecule stamp for component " << (*i)->getType() << std::endl;
195 >        throw OOPSEException(oss.str());          
196      }
197    }
198   }
# Line 205 | Line 216 | bool Globals::addMoleculeStamp(MoleculeStamp* molStamp
216          moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
217          ret = true;
218      } else {
219 <        std::cout << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
219 >        std::ostringstream oss;
220 >        oss << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
221 >        throw OOPSEException(oss.str());  
222      }
223      return ret;
224   }

Diff Legend

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