ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE_old/src/mdtools/libmdCode/atype_typedefs.F90
(Generate patch)

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/atype_typedefs.F90 (file contents):
Revision 295 by chuckv, Thu Mar 6 19:57:03 2003 UTC vs.
Revision 306 by chuckv, Mon Mar 10 19:26:45 2003 UTC

# Line 4 | Line 4 | module atype_typedefs
4    use definitions, only: dp
5    implicit none
6  
7
8 !! Atype for lennard-jones module
9  type :: lj_atype
10    
11 !! Unique number for place in linked list
12     integer :: atype_number = 0
13 !! Unique indentifier number (ie atomic no, etc)
14     integer :: atype_ident = 0
15 !! Mass of Particle
16     real ( kind = dp )  :: mass = 0.0_dp
17 !! Lennard-Jones epslon
18     real ( kind = dp )  :: epsilon = 0.0_dp
19 !! Lennard-Jones Sigma
20     real ( kind = dp )  :: sigma = 0.0_dp
21 !! Lennard-Jones Sigma Squared
22     real ( kind = dp )  :: sigma2 = 0.0_dp
23 !! Lennard-Jones Sigma to sixth
24     real ( kind = dp )  :: sigma6 = 0.0_dp
25 !! Pointer for linked list creation
26     type (lj_atype), pointer :: next => null()
27     type (lj_atype), pointer :: prev => null()
28  end type lj_atype
29 !! Pointer list for ljAtype
30  type :: lj_identPtrList
31     type(lj_atype), pointer :: this => null()
32  end type lj_identPtrList
33
34 !! Atype for soft sticky dipole water module
35  type :: ssd_atype
36
37     integer :: atype_ident
38    
39 !! Lennard-Jones portion of SSD model
40     type (lj_atype) :: lj_params
41    
42     logical :: hasDipole
43     real ( kind = dp ) :: dipoleMoment = 0.0_dp
44     real ( kind = dp ) :: w0
45     real ( kind = dp ) :: v0
46 !! Pointer for linked list creation
47     type (ssd_atype), pointer :: next => null()
48     type (ssd_atype), pointer :: prev => null()
49
50  end type ssd_atype
51 !! Pointer list for ljAtype
52  type :: ssd_identPtrList
53     type(ssd_atype), pointer :: this => null()
54  end type ssd_identPtrList
55
56
7    type :: atype
8  
9       integer :: atype_ident
# Line 65 | Line 15 | module atype_typedefs
15       logical :: is_GB = .false.
16       logical :: is_eam = .false.
17      
68 !! Mass of Particle
69     real ( kind = dp )  :: mass = 0.0_dp
18   !! Lennard-Jones epslon
19 <     real ( kind = dp )  :: epsilon = 0.0_dp
19 >     real ( kind = dp )  :: lj_epsilon = 0.0_dp
20   !! Lennard-Jones Sigma
21 <     real ( kind = dp )  :: sigma = 0.0_dp
74 < !! Lennard-Jones Sigma Squared
75 <     real ( kind = dp )  :: sigma2 = 0.0_dp
76 < !! Lennard-Jones Sigma to sixth
77 <     real ( kind = dp )  :: sigma6 = 0.0_dp
21 >     real ( kind = dp )  :: lj_sigma = 0.0_dp
22  
23 <     real ( kind = dp ) :: dipoleMoment = 0.0_dp
24 <     real ( kind = dp ) :: w0 = 0.0_dp
25 <     real ( kind = dp ) :: v0 = 0.0_dp
23 > !!  Dipole
24 >     real ( kind = dp )  :: dipoleMoment = 0.0_dp
25 > !!  Sticky Potenial
26 >     real ( kind = dp )  :: sticky_w0 = 0.0_dp
27 >     real ( kind = dp )  :: sticky_v0 = 0.0_dp
28 > !! Gay-Berne  
29 >     real ( kind = dp)   :: gb_sigma = 0.0_dp
30 >     real ( kind = dp)   :: gb_l2b_ratio = 0.0_dp
31 >     real ( kind = dp)   :: gb_eps = 0.0_dp
32 >     real ( kind = dp)   :: gb_eps_ratio = 0.0_dp
33 >     real ( kind = dp)   :: gb_mu = 0.0_dp
34 >     real ( kind = dp)   :: gb_nu = 0.0_dp
35 >
36   !
37  
38   !! Pointer for linked list creation
39 <     type (lj_atype), pointer :: next => null()
40 <     type (lj_atype), pointer :: prev => null()
87 <
39 >     type (atype), pointer :: next => null()
40 >     type (atype), pointer :: prev => null()
41    end type atype
42  
43   type :: identPtrList
# Line 92 | Line 45 | module atype_typedefs
45    end type identPtrList
46  
47  
95
48   end module atype_typedefs

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines