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 2409 by chrisfen, Wed Nov 2 20:36:25 2005 UTC vs.
Revision 2415 by chrisfen, Thu Nov 3 23:12:27 2005 UTC

# Line 121 | Line 121 | Globals::Globals(){
121    DefineOptionalParameter(SurfaceTension, "surfaceTension");
122    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
123    DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
124 <  DefineOptionalParameter(ScreeningMethod, "screeningMethod");
124 >  DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
125    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
126    
127    DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
# Line 134 | Line 134 | Globals::Globals(){
134    DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0);
135    DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5);
136    DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5);
137 <  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
137 >  DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2);
138    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
139    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
140    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
# Line 387 | Line 387 | char* Globals::checkMe( void ){
387    CheckParameter(ThermIntOmegaSpringConst, isPositive());
388    CheckParameter(SurfaceTension, isPositive());
389    CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) || isEqualIgnoreCase(std::string("SHIFTED_FORCE"))  || isEqualIgnoreCase(std::string("REACTION_FIELD")));
390 <  CheckParameter(ScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
390 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase(std::string("UNDAMPED")) || isEqualIgnoreCase(std::string("DAMPED")));
391    CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
392    //CheckParameter(StatFileFormat,);    
393    //CheckParameter(MixingRule,);
# Line 395 | Line 395 | char* Globals::checkMe( void ){
395    CheckParameter(ThermIntDistSpringConst, isPositive());
396    CheckParameter(ThermIntThetaSpringConst, isPositive());
397    CheckParameter(ThermIntOmegaSpringConst, isPositive());
398 <  CheckParameter(DampingAlpha,isPositive());
398 >  CheckParameter(DampingAlpha,isNonNegative());
399    CheckParameter(SkinThickness, isPositive());
400    
401    //@todo memory leak

Diff Legend

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