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 1633 by gezelter, Fri Oct 22 20:22:48 2004 UTC vs.
Revision 2086 by gezelter, Tue Mar 8 21:06:12 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
# Line 13 | 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 27 | 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 37 | Line 78 | contains
78      endif
79      
80      me = addElement(atypes)
81 +
82      call setElementProperty(atypes, me, "c_ident", ident)
83      
84      call setElementProperty(atypes, me, "is_Directional", is_Directional)
# Line 44 | 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 54 | Line 97 | end module atype_module
97    
98   end module atype_module
99  
57 ! provide interface for c calls....
58
59 subroutine makeatype(atp, status)
60  
61  use atype_module, ONLY: new_atype
62
63 #define __FORTRAN90
64 #include "types/AtomTypeProperties.h"    
65
66  type(AtomTypeProperties), intent(in) :: atp
67  integer, intent(inout) :: status
68
69  integer :: ident
70  logical :: is_Directional, is_LennardJones, is_Electrostatic
71  logical :: is_Charge, is_Dipole, is_Sticky, is_GayBerne, is_EAM
72  logical :: is_Shape, is_FLARB
73  
74  ident = atp%ident
75  is_Directional = (atp%is_Directional .ne. 0)
76  is_LennardJones = (atp%is_LennardJones .ne. 0)
77  is_Electrostatic = (atp%is_Electrostatic .ne. 0)
78  is_Charge = (atp%is_Charge .ne. 0)
79  is_Dipole = (atp%is_Dipole .ne. 0)
80  is_Sticky = (atp%is_Sticky .ne. 0)
81  is_GayBerne = (atp%is_GayBerne .ne. 0)
82  is_EAM = (atp%is_EAM .ne. 0)
83  is_Shape = (atp%is_Shape .ne. 0)
84  is_FLARB = (atp%is_FLARB .ne. 0)
85
86  call new_atype(ident, is_Directional, is_LennardJones, is_Electrostatic, &
87       is_Charge, is_Dipole, is_Sticky, is_GayBerne, is_EAM, is_Shape, &
88       is_FLARB, status)
89  
90 end subroutine

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines