ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/atype_module.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/atype_module.F90 (file contents):
Revision 378 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
Revision 633 by chuckv, Thu Jul 17 19:32:13 2003 UTC

# Line 3 | Line 3 | module atype_module
3   module atype_module
4    use definitions, only: dp
5    use vector_class
6  use sticky_pair
7  use gb_pair
6    implicit none
7    private
8    
# Line 15 | Line 13 | contains
13    
14   contains
15    
16 <  subroutine new_atype(c_ident, is_LJ, is_Sticky, is_DP, is_GB, &
17 <       lj_epsilon, lj_sigma, &
20 <       dipole_moment, &
21 <       sticky_w0, sticky_v0, &
22 <       GB_sigma, GB_l2b_ratio, GB_eps, GB_eps_ratio, GB_mu, GB_nu, &
23 <       status)
16 >  subroutine new_atype(c_ident, is_LJ, is_Sticky, is_DP, is_GB, is_EAM,&
17 >       lj_epsilon, lj_sigma, dipole_moment, status)
18      
19      real( kind = dp ), intent(in) :: lj_epsilon
20      real( kind = dp ), intent(in) :: lj_sigma
27    real( kind = dp ), intent(in) :: sticky_w0
28    real( kind = dp ), intent(in) :: sticky_v0
21      real( kind = dp ), intent(in) :: dipole_moment
30    real( kind = dp ), intent(in) :: GB_sigma, GB_l2b_ratio, GB_eps
31    real( kind = dp ), intent(in) :: GB_eps_ratio, GB_mu, GB_nu
22  
23      integer, intent(in)  :: c_ident
24      integer, intent(out) :: status
25      integer, intent(in)  :: is_Sticky
26      integer, intent(in)  :: is_DP
27      integer, intent(in)  :: is_GB
28 +    integer, intent(in)  :: is_EAM
29      integer, intent(in)  :: is_LJ
30      integer :: me
31      logical :: l_is_LJ, l_is_DP, l_is_Sticky, l_is_GB
32 +    logical :: l_is_EAM
33      integer :: FFcheckStatus
34      status = 0
35  
# Line 58 | Line 50 | contains
50      l_is_DP = (is_DP .ne. 0)
51      l_is_Sticky = (is_Sticky .ne. 0)
52      l_is_GB = (is_GB .ne. 0)
53 +    l_is_EAM = (is_EAM .ne. 0)
54  
55      call setElementProperty(atypes, me, "is_LJ", l_is_LJ)
56      call setElementProperty(atypes, me, "is_DP", l_is_DP)
57      call setElementProperty(atypes, me, "is_Sticky", l_is_Sticky)
58      call setElementProperty(atypes, me, "is_GB", l_is_GB)
59 +    call setElementProperty(atypes, me, "is_EAM", l_is_EAM)
60  
61      if (l_is_LJ) then
62         call setElementProperty(atypes, me, "lj_sigma", lj_sigma)
# Line 71 | Line 65 | contains
65      if (l_is_DP) then
66         call setElementProperty(atypes, me, "dipole_moment", dipole_moment)
67      endif
74    if (l_is_Sticky) then
75       call setElementProperty(atypes, me, "sticky_w0", sticky_w0)
76       call setElementProperty(atypes, me, "sticky_v0", sticky_v0)
77       call check_sticky_FF(FFcheckStatus)
78       if (FFcheckStatus .ne. 0) call set_sticky_params(sticky_w0, sticky_v0)
79    endif
80    if (l_is_GB) then
81       call setElementProperty(atypes, me, "GB_sigma", GB_sigma)
82       call setElementProperty(atypes, me, "GB_l2b_ratio", GB_l2b_ratio)
83       call setElementProperty(atypes, me, "GB_eps", GB_eps)
84       call setElementProperty(atypes, me, "GB_eps_ratio", GB_eps_ratio)
85       call setElementProperty(atypes, me, "GB_mu", GB_mu)
86       call setElementProperty(atypes, me, "GB_nu", GB_nu)
87       call check_gb_pair_FF(FFcheckStatus)
88       if (FFcheckStatus .ne. 0) call set_gb_pair_params(GB_sigma, GB_l2b_ratio, &
89            GB_eps, GB_eps_ratio, GB_mu, GB_nu)
90    endif
68  
69    end subroutine new_atype
70  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines