ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/UseTheForce/DarkSide/fInteractionMap.h
(Generate patch)

Comparing trunk/OOPSE-3.0/src/UseTheForce/DarkSide/fInteractionMap.h (file contents):
Revision 2360 by chuckv, Wed Oct 12 18:59:16 2005 UTC vs.
Revision 2361 by gezelter, Wed Oct 12 21:00:50 2005 UTC

# Line 13 | Line 13
13   #define SHAPE_LJ           256
14   #define FLARB_PAIR         512
15  
16 < #define POT_ARRAY_SIZE 11
16 > #define LR_POT_TYPES      4
17  
18 < #define LJ_POT            1
18 > #define VDW_POT           1
19   #define ELECTROSTATIC_POT 2
20 < #define STICKY_POT        3
21 < #define STICKYPOWER_POT   4
22 < #define GB_POT            5
23 < #define GB_LJ_POT         6
24 < #define EAM_POT           7
25 < #define SHAPE_POT         8
26 < #define SHAPE_LJ_POT      9
27 < #define FLARB_POT         10
28 < #define RF_POT            11
20 > #define HB_POT            3
21 > #define METALLIC_POT      4
22  
23 +
24   #endif
25   #endif /*__C*/
26  
# Line 43 | Line 37
37    INTEGER, PARAMETER:: SHAPE_LJ           = 256
38    INTEGER, PARAMETER:: FLARB_PAIR         = 512
39  
40 <  INTEGER, PARAMETER:: POT_ARRAY_SIZE    =   10
40 >  INTEGER, PARAMETER:: LR_POT_TYPES      =   4
41  
42 <  INTEGER, PARAMETER:: LJ_POT            =   1
42 >  INTEGER, PARAMETER:: VDW_POT           =   1
43    INTEGER, PARAMETER:: ELECTROSTATIC_POT =   2
44 <  INTEGER, PARAMETER:: STICKY_POT        =   3
45 <  INTEGER, PARAMETER:: STICKYPOWER_POT   =   4
52 <  INTEGER, PARAMETER:: GAYBERNE_POT      =   5
53 <  INTEGER, PARAMETER:: GAYBERNE_LJ_POT   =   6
54 <  INTEGER, PARAMETER:: EAM_POT           =   7
55 <  INTEGER, PARAMETER:: SHAPE_POT         =   8
56 <  INTEGER, PARAMETER:: SHAPE_LJ_POT      =   9
57 <  INTEGER, PARAMETER:: FLARB_POT         =   10
58 <  INTEGER, PARAMETER:: RF_POT            =   11
44 >  INTEGER, PARAMETER:: HB_POT            =   3
45 >  INTEGER, PARAMETER:: METALLIC_POT      =   4
46  
60
61
47   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines