ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/io/ForceFieldOptions.hpp
(Generate patch)

Comparing trunk/src/io/ForceFieldOptions.hpp (file contents):
Revision 981 by gezelter, Mon Jun 5 18:24:45 2006 UTC vs.
Revision 1293 by chuckv, Sun Sep 14 01:32:26 2008 UTC

# Line 45 | Line 45
45   #include "utils/ParameterManager.hpp"
46   #include "utils/StringUtils.hpp"
47   #include "io/ParamConstraint.hpp"
48 < #define __C
48 > #define __OOPSE_C
49   #include "UseTheForce/fForceOptions.h"
50  
51   namespace oopse {
# Line 58 | Line 58 | namespace oopse {
58      DeclareParameter(EnergyMixingRule, std::string);
59      DeclareParameter(CutoffPolicy, std::string);
60      DeclareParameter(EnergyUnitScaling, RealType);
61 +    DeclareParameter(MetallicEnergyUnitScaling, RealType);
62      DeclareParameter(DistanceUnitScaling, RealType);
63      DeclareParameter(AngleUnitScaling, RealType);
64      DeclareParameter(TorsionAngleConvention, std::string);
65 +    DeclareParameter(vdw12scale, RealType);
66 +    DeclareParameter(vdw13scale, RealType);
67      DeclareParameter(vdw14scale, RealType);
68 +    DeclareParameter(electrostatic12scale, RealType);
69 +    DeclareParameter(electrostatic13scale, RealType);
70      DeclareParameter(electrostatic14scale, RealType);
66 –    DeclareParameter(dielectric, RealType);
71      DeclareParameter(GayBerneMu, RealType);
72      DeclareParameter(GayBerneNu, RealType);
73      

Diff Legend

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