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 1609 by gezelter, Wed Oct 20 04:12:01 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC

# Line 1 | Line 1
1 + !!
2 + !! Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 + !!
4 + !! The University of Notre Dame grants you ("Licensee") a
5 + !! non-exclusive, royalty free, license to use, modify and
6 + !! redistribute this software in source and binary code form, provided
7 + !! that the following conditions are met:
8 + !!
9 + !! 1. Acknowledgement of the program authors must be made in any
10 + !!    publication of scientific results based in part on use of the
11 + !!    program.  An acceptable form of acknowledgement is citation of
12 + !!    the article in which the program was described (Matthew
13 + !!    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 + !!    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 + !!    Parallel Simulation Engine for Molecular Dynamics,"
16 + !!    J. Comput. Chem. 26, pp. 252-271 (2005))
17 + !!
18 + !! 2. Redistributions of source code must retain the above copyright
19 + !!    notice, this list of conditions and the following disclaimer.
20 + !!
21 + !! 3. Redistributions in binary form must reproduce the above copyright
22 + !!    notice, this list of conditions and the following disclaimer in the
23 + !!    documentation and/or other materials provided with the
24 + !!    distribution.
25 + !!
26 + !! This software is provided "AS IS," without a warranty of any
27 + !! kind. All express or implied conditions, representations and
28 + !! warranties, including any implied warranty of merchantability,
29 + !! fitness for a particular purpose or non-infringement, are hereby
30 + !! excluded.  The University of Notre Dame and its licensors shall not
31 + !! be liable for any damages suffered by licensee as a result of
32 + !! using, modifying or distributing the software or its
33 + !! derivatives. In no event will the University of Notre Dame or its
34 + !! licensors be liable for any lost revenue, profit or data, or for
35 + !! direct, indirect, special, consequential, incidental or punitive
36 + !! damages, however caused and regardless of the theory of liability,
37 + !! arising out of the use of or inability to use software, even if the
38 + !! University of Notre Dame has been advised of the possibility of
39 + !! such damages.
40 + !!
41 +
42   !! module defines atypes available to simulation
43  
44   module atype_module
45 <  use definitions, only: dp
45 >
46    use vector_class
47    implicit none
48    private
49 <  
49 >
50    type (Vector), pointer, public :: atypes => null()
51 <  
11 <  
51 >
52    public :: new_atype
53    
54   contains
55    
56 <  subroutine new_atype(c_ident, is_LJ, is_Sticky, is_DP, is_GB, &
57 <       is_EAM, is_Charge, lj_epsilon, lj_sigma, charge, dipole_moment, &
58 <       status)
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)
59      
60 <    real( kind = dp ), intent(in) :: lj_epsilon
61 <    real( kind = dp ), intent(in) :: lj_sigma
62 <    real( kind = dp ), intent(in) :: dipole_moment
63 <    real( kind = dp ), intent(in) :: charge
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
64 >    integer,intent(out) :: status
65  
25    integer, intent(in)  :: c_ident
26    integer, intent(out) :: status
27    integer, intent(in)  :: is_Sticky
28    integer, intent(in)  :: is_DP
29    integer, intent(in)  :: is_GB
30    integer, intent(in)  :: is_EAM
31    integer, intent(in)  :: is_LJ
32    integer, intent(in)  :: is_Charge
66      integer :: me
67 <    logical :: l_is_LJ, l_is_DP, l_is_Sticky, l_is_GB
35 <    logical :: l_is_EAM, l_is_Charge
36 <    integer :: FFcheckStatus
67 >        
68      status = 0
69 <
69 >    
70      if (.not. associated(atypes)) then
71         !! There are 16 properties to worry about for now.  
72         !! Fix this if needed for more atomic properties
# Line 45 | Line 76 | contains
76            return
77         endif
78      endif
79 <
79 >    
80      me = addElement(atypes)
50    call setElementProperty(atypes, me, "c_ident", c_ident)
81  
82 <    l_is_LJ = (is_LJ .ne. 0)
83 <    l_is_DP = (is_DP .ne. 0)
84 <    l_is_Sticky = (is_Sticky .ne. 0)
85 <    l_is_GB = (is_GB .ne. 0)
86 <    l_is_EAM = (is_EAM .ne. 0)
87 <    l_is_Charge = (is_Charge .ne. 0)
82 >    call setElementProperty(atypes, me, "c_ident", ident)
83 >    
84 >    call setElementProperty(atypes, me, "is_Directional", is_Directional)
85 >    call setElementProperty(atypes, me, "is_LennardJones", is_LennardJones)
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_Sticky", is_Sticky)
90 >    call setElementProperty(atypes, me, "is_GayBerne", is_GayBerne)
91 >    call setElementProperty(atypes, me, "is_EAM", is_EAM)
92 >    call setElementProperty(atypes, me, "is_Shape", is_Shape)
93 >    call setElementProperty(atypes, me, "is_FLARB", is_FLARB)
94 >    
95 >  end subroutine new_atype
96 >  
97 > end module atype_module
98  
99 <    call setElementProperty(atypes, me, "is_LJ", l_is_LJ)
60 <    call setElementProperty(atypes, me, "is_DP", l_is_DP)
61 <    call setElementProperty(atypes, me, "is_Sticky", l_is_Sticky)
62 <    call setElementProperty(atypes, me, "is_GB", l_is_GB)
63 <    call setElementProperty(atypes, me, "is_EAM", l_is_EAM)
64 <    call setElementProperty(atypes, me, "is_Charge", l_is_Charge)
99 > ! provide interface for c calls....
100  
101 <    if (l_is_LJ) then
102 <       call setElementProperty(atypes, me, "lj_sigma", lj_sigma)
103 <       call setElementProperty(atypes, me, "lj_epsilon", lj_epsilon)
69 <    endif
70 <    if (l_is_DP) then
71 <       call setElementProperty(atypes, me, "dipole_moment", dipole_moment)
72 <    endif
73 <    if (l_is_Charge) then
74 <       call setElementProperty(atypes, me, "charge", charge)
75 <    endif
101 > subroutine makeatype(atp, status)
102 >  
103 >  use atype_module, ONLY: new_atype
104  
105 <  end subroutine new_atype
105 > #define __FORTRAN90
106 > #include "types/AtomTypeProperties.h"    
107  
108 < end module atype_module
108 >  type(AtomTypeProperties), intent(in) :: atp
109 >  integer, intent(inout) :: status
110  
111 <  ! provide interface for c calls....
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 < subroutine makeatype(c_ident, is_LJ, is_Sticky, is_DP, is_GB, &
117 <       is_EAM, is_Charge, lj_epsilon, lj_sigma, charge, dipole_moment, &
118 <       status)
119 <    use definitions, only: dp  
120 <    use atype_module, ONLY: new_atype
121 <    
122 <    real( kind = dp ), intent(in) :: lj_epsilon
123 <    real( kind = dp ), intent(in) :: lj_sigma
124 <    real( kind = dp ), intent(in) :: dipole_moment
125 <    real( kind = dp ), intent(in) :: charge
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 <    integer, intent(in)  :: c_ident
131 <    integer, intent(out) :: status
132 <    integer, intent(in)  :: is_Sticky
133 <    integer, intent(in)  :: is_DP
98 <    integer, intent(in)  :: is_GB
99 <    integer, intent(in)  :: is_EAM
100 <    integer, intent(in)  :: is_LJ
101 <    integer, intent(in)  :: is_Charge
102 <
103 <    call new_atype(c_ident, is_LJ, is_Sticky, is_DP, is_GB, &
104 <       is_EAM, is_Charge, lj_epsilon, lj_sigma, charge, dipole_moment, &
105 <       status)
106 <      
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