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 674 by tim, Mon Oct 17 03:06:29 2005 UTC vs.
Revision 710 by chrisfen, Wed Nov 2 20:36:25 2005 UTC

# Line 121 | Line 121 | Globals::Globals(){
121    DefineOptionalParameter(SurfaceTension, "surfaceTension");
122    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
123    DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
124 +  DefineOptionalParameter(ScreeningMethod, "screeningMethod");
125    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
125 –  DefineOptionalParameter(StatFileFormat, "statFileFormat");    
126    
127    DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
128    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
# Line 137 | Line 137 | Globals::Globals(){
137    DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 1.5);
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");    
141 +
142    
143   }
144  
# Line 341 | Line 343 | char* Globals::checkMe( void ){
343    CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) || isEqualIgnoreCase(std::string("NVT")) ||
344                                            isEqualIgnoreCase(std::string("NPTi")) || isEqualIgnoreCase(std::string("NPTf"))||
345                                            isEqualIgnoreCase(std::string("NPTxyz")) );
344 –
346    CheckParameter(Dt, isPositive());
347    CheckParameter(RunTime, isPositive());
348    CheckParameter(InitialConfig, isNotEmpty());
# Line 385 | Line 386 | char* Globals::checkMe( void ){
386    CheckParameter(ThermIntThetaSpringConst, isPositive());
387    CheckParameter(ThermIntOmegaSpringConst, isPositive());
388    CheckParameter(SurfaceTension, isPositive());
389 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase(std::string("NONE")) || isEqualIgnoreCase(std::string("UNDAMPED_WOLF")) || isEqualIgnoreCase(std::string("DAMPED_WOLF")) || isEqualIgnoreCase(std::string("REACTION_FIELD")) );
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")));
391    CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) || isEqualIgnoreCase(std::string("MAX")) || isEqualIgnoreCase(std::string("TRADITIONAL")));
392    //CheckParameter(StatFileFormat,);    
393    //CheckParameter(MixingRule,);

Diff Legend

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