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

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/atype.F90 (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2086 by gezelter, Tue Mar 8 21:06:12 2005 UTC

# Line 54 | Line 54 | contains
54   contains
55    
56    subroutine new_atype(ident, is_Directional, is_LennardJones, &
57 <       is_Electrostatic, is_Charge, is_Dipole, is_Sticky, is_GayBerne, &
58 <       is_EAM, is_Shape, is_FLARB, status)
57 >       is_Electrostatic, is_Charge, is_Dipole, is_Quadrupole, &
58 >       is_Sticky, is_GayBerne, is_EAM, is_Shape, is_FLARB, status)
59      
60      integer,intent(in) :: ident
61      logical,intent(in) :: is_Directional, is_LennardJones, is_Electrostatic
62 <    logical,intent(in) :: is_Charge, is_Dipole, is_Sticky, is_GayBerne, is_EAM
63 <    logical,intent(in) :: is_Shape, is_FLARB
62 >    logical,intent(in) :: is_Charge, is_Dipole, is_Quadrupole
63 >    logical,intent(in) :: is_Sticky, is_GayBerne, is_EAM, is_Shape, is_FLARB
64      integer,intent(out) :: status
65  
66      integer :: me
# Line 68 | Line 68 | contains
68      status = 0
69      
70      if (.not. associated(atypes)) then
71 <       !! There are 16 properties to worry about for now.  
71 >       !! There are 17 properties to worry about for now.  
72         !! Fix this if needed for more atomic properties
73 <       atypes => initialize(17)
73 >       atypes => initialize(18)
74         if (.not.associated(atypes)) then
75            status = -1
76            return
# Line 86 | Line 86 | contains
86      call setElementProperty(atypes, me, "is_Electrostatic", is_Electrostatic)
87      call setElementProperty(atypes, me, "is_Charge", is_Charge)
88      call setElementProperty(atypes, me, "is_Dipole", is_Dipole)
89 +    call setElementProperty(atypes, me, "is_Quadrupole", is_Quadrupole)
90      call setElementProperty(atypes, me, "is_Sticky", is_Sticky)
91      call setElementProperty(atypes, me, "is_GayBerne", is_GayBerne)
92      call setElementProperty(atypes, me, "is_EAM", is_EAM)
# Line 96 | Line 97 | end module atype_module
97    
98   end module atype_module
99  
99 ! provide interface for c calls....
100
101 subroutine makeatype(atp, status)
102  
103  use atype_module, ONLY: new_atype
104
105 #define __FORTRAN90
106 #include "types/AtomTypeProperties.h"    
107
108  type(AtomTypeProperties), intent(in) :: atp
109  integer, intent(inout) :: status
110
111  integer :: ident
112  logical :: is_Directional, is_LennardJones, is_Electrostatic
113  logical :: is_Charge, is_Dipole, is_Sticky, is_GayBerne, is_EAM
114  logical :: is_Shape, is_FLARB
115
116  ident = atp%ident
117  is_Directional = (atp%is_Directional .ne. 0)
118  is_LennardJones = (atp%is_LennardJones .ne. 0)
119  is_Electrostatic = (atp%is_Charge .ne. 0) .or. (atp%is_Dipole .ne. 0) .and. &
120                     (atp%is_Quadrupole .ne. 0)
121  
122  is_Charge = (atp%is_Charge .ne. 0)
123  is_Dipole = (atp%is_Dipole .ne. 0)
124  is_Sticky = (atp%is_Sticky .ne. 0)
125  is_GayBerne = (atp%is_GayBerne .ne. 0)
126  is_EAM = (atp%is_EAM .ne. 0)
127  is_Shape = (atp%is_Shape .ne. 0)
128  is_FLARB = (atp%is_FLARB .ne. 0)
129
130  call new_atype(ident, is_Directional, is_LennardJones, is_Electrostatic, &
131       is_Charge, is_Dipole, is_Sticky, is_GayBerne, is_EAM, is_Shape, &
132       is_FLARB, status)
133  
134 end subroutine

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines