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

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/LJ.F90 (file contents):
Revision 1633 by gezelter, Fri Oct 22 20:22:48 2004 UTC vs.
Revision 2461 by gezelter, Mon Nov 21 22:59:02 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 +
43   !! Calculates Long Range forces Lennard-Jones interactions.
44   !! @author Charles F. Vardeman II
45   !! @author Matthew Meineke
46 < !! @version $Id: LJ.F90,v 1.4 2004-10-22 20:22:47 gezelter Exp $, $Date: 2004-10-22 20:22:47 $, $Name: not supported by cvs2svn $, $Revision: 1.4 $
46 > !! @version $Id: LJ.F90,v 1.19 2005-11-21 22:59:01 gezelter Exp $, $Date: 2005-11-21 22:59:01 $, $Name: not supported by cvs2svn $, $Revision: 1.19 $
47  
48 +
49   module lj
50    use atype_module
8  use switcheroo
51    use vector_class
52    use simulation
53    use status
# Line 16 | Line 58 | module lj
58  
59    implicit none
60    PRIVATE
61 <  
61 > #define __FORTRAN90
62 > #include "UseTheForce/DarkSide/fInteractionMap.h"
63 >
64    integer, parameter :: DP = selected_real_kind(15)
65 <  
66 <  type, private :: LjType
67 <     integer :: ident
65 >
66 >  logical, save :: useGeometricDistanceMixing = .false.
67 >  logical, save :: haveMixingMap = .false.
68 >
69 >  real(kind=DP), save :: defaultCutoff = 0.0_DP
70 >  logical, save :: defaultShift = .false.
71 >  logical, save :: haveDefaultCutoff = .false.
72 >
73 >
74 >  type, private :: LJtype
75 >     integer       :: atid
76       real(kind=dp) :: sigma
77       real(kind=dp) :: epsilon
78 <  end type LjType
79 <  
80 <  type(LjType), dimension(:), allocatable :: ParameterMap
81 <  
82 <  logical, save :: haveMixingMap = .false.
83 <  
78 >     logical       :: isSoftCore = .false.
79 >  end type LJtype
80 >
81 >  type, private :: LJList
82 >     integer               :: Nljtypes = 0
83 >     integer               :: currentLJtype = 0
84 >     type(LJtype), pointer :: LJtypes(:)      => null()
85 >     integer, pointer      :: atidToLJtype(:) => null()
86 >  end type LJList
87 >
88 >  type(LJList), save :: LJMap
89 >
90    type :: MixParameters
91       real(kind=DP) :: sigma
92       real(kind=DP) :: epsilon
93 <     real(kind=dp)  :: sigma6
94 <     real(kind=dp)  :: tp6
95 <     real(kind=dp)  :: tp12
96 <     real(kind=dp)  :: delta
93 >     real(kind=dp) :: sigma6
94 >     real(kind=dp) :: rCut
95 >     real(kind=dp) :: delta
96 >     logical       :: rCutWasSet = .false.
97 >     logical       :: shiftedPot
98 >     logical       :: isSoftCore = .false.
99    end type MixParameters
100 <  
100 >
101    type(MixParameters), dimension(:,:), allocatable :: MixingMap
102 <  
103 <  real(kind=DP), save :: LJ_rcut
104 <  logical, save :: have_rcut = .false.
45 <  logical, save :: LJ_do_shift = .false.
46 <  logical, save :: useGeometricDistanceMixing = .false.
47 <  
48 <  !! Public methods and data
49 <  
50 <  public :: setCutoffLJ
51 <  public :: useGeometricMixing
52 <  public :: do_lj_pair
53 <  public :: newLJtype  
102 >
103 >  public :: newLJtype
104 >  public :: setLJDefaultCutoff
105    public :: getSigma
106    public :: getEpsilon
107 <  
107 >  public :: useGeometricMixing
108 >  public :: do_lj_pair
109 >  public :: destroyLJtypes
110 >
111   contains
112  
113 <  subroutine newLJtype(ident, sigma, epsilon, status)
114 <    integer,intent(in) :: ident
113 >  subroutine newLJtype(c_ident, sigma, epsilon, isSoftCore, status)
114 >    integer,intent(in) :: c_ident
115      real(kind=dp),intent(in) :: sigma
116      real(kind=dp),intent(in) :: epsilon
117 +    integer, intent(in) :: isSoftCore
118      integer,intent(out) :: status
119 <    integer :: nAtypes
119 >    integer :: nLJTypes, ntypes, myATID
120 >    integer, pointer :: MatchList(:) => null()
121 >    integer :: current
122  
123      status = 0
124 <    
125 <    !! Be simple-minded and assume that we need a ParameterMap that
69 <    !! is the same size as the total number of atom types
124 >    ! check to see if this is the first time into this routine...
125 >    if (.not.associated(LJMap%LJtypes)) then
126  
127 <    if (.not.allocated(ParameterMap)) then
127 >       call getMatchingElementList(atypes, "is_LennardJones", .true., &
128 >            nLJTypes, MatchList)
129        
130 <       nAtypes = getSize(atypes)
131 <    
132 <       if (nAtypes == 0) then
133 <          status = -1
134 <          return
135 <       end if
136 <      
80 <       if (.not. allocated(ParameterMap)) then
81 <          allocate(ParameterMap(nAtypes))
82 <       endif
83 <      
130 >       LJMap%nLJtypes =  nLJTypes
131 >
132 >       allocate(LJMap%LJtypes(nLJTypes))
133 >
134 >       ntypes = getSize(atypes)
135 >
136 >       allocate(LJMap%atidToLJtype(ntypes))
137      end if
138  
139 <    if (ident .gt. size(ParameterMap)) then
140 <       status = -1
88 <       return
89 <    endif
90 <    
91 <    ! set the values for ParameterMap for this atom type:
139 >    LJMap%currentLJtype = LJMap%currentLJtype + 1
140 >    current = LJMap%currentLJtype
141  
142 <    ParameterMap(ident)%ident = ident
143 <    ParameterMap(ident)%epsilon = epsilon
144 <    ParameterMap(ident)%sigma = sigma
145 <    
142 >    myATID = getFirstMatchingElement(atypes, "c_ident", c_ident)
143 >    LJMap%atidToLJtype(myATID)        = current
144 >    LJMap%LJtypes(current)%atid       = myATID
145 >    LJMap%LJtypes(current)%sigma      = sigma
146 >    LJMap%LJtypes(current)%epsilon    = epsilon
147 >    if (isSoftCore .eq. 1) then
148 >       LJMap%LJtypes(current)%isSoftCore = .true.
149 >    else
150 >       LJMap%LJtypes(current)%isSoftCore = .false.
151 >    endif
152    end subroutine newLJtype
153  
154 +  subroutine setLJDefaultCutoff(thisRcut, shiftedPot)
155 +    real(kind=dp), intent(in) :: thisRcut
156 +    logical, intent(in) :: shiftedPot
157 +    defaultCutoff = thisRcut
158 +    defaultShift = shiftedPot
159 +    haveDefaultCutoff = .true.
160 +    !we only want to build LJ Mixing map if LJ is being used.
161 +    if(LJMap%nLJTypes /= 0) then
162 +       call createMixingMap()
163 +    end if
164 +  end subroutine setLJDefaultCutoff
165 +
166    function getSigma(atid) result (s)
167      integer, intent(in) :: atid
168 <    integer :: localError
168 >    integer :: ljt1
169      real(kind=dp) :: s
170 <    
171 <    if (.not.allocated(ParameterMap)) then
172 <       call handleError("LJ", "no ParameterMap was present before first call of getSigma!")
170 >
171 >    if (LJMap%currentLJtype == 0) then
172 >       call handleError("LJ", "No members in LJMap")
173         return
174      end if
175 <    
176 <    s = ParameterMap(atid)%sigma
175 >
176 >    ljt1 = LJMap%atidToLJtype(atid)
177 >    s = LJMap%LJtypes(ljt1)%sigma
178 >
179    end function getSigma
180  
181    function getEpsilon(atid) result (e)
182      integer, intent(in) :: atid
183 <    integer :: localError
183 >    integer :: ljt1
184      real(kind=dp) :: e
185 <    
186 <    if (.not.allocated(ParameterMap)) then
187 <       call handleError("dipole-dipole", "no ParameterMap was present before first call of getEpsilon!")
185 >
186 >    if (LJMap%currentLJtype == 0) then
187 >       call handleError("LJ", "No members in LJMap")
188         return
189      end if
121    
122    e = ParameterMap(atid)%epsilon
123  end function getEpsilon
190  
191 +    ljt1 = LJMap%atidToLJtype(atid)
192 +    e = LJMap%LJtypes(ljt1)%epsilon
193  
194 <  subroutine setCutoffLJ(rcut, do_shift, status)
127 <    logical, intent(in):: do_shift
128 <    integer :: status, myStatus
129 <    real(kind=dp) :: rcut
194 >  end function getEpsilon
195  
131 #define __FORTRAN90
132 #include "UseTheForce/fSwitchingFunction.h"
133
134    status = 0
135
136    LJ_rcut = rcut
137    LJ_do_shift = do_shift
138    call set_switch(LJ_SWITCH, rcut, rcut)
139    have_rcut = .true.
140    
141    return
142  end subroutine setCutoffLJ
143
196    subroutine useGeometricMixing()
197      useGeometricDistanceMixing = .true.
198      haveMixingMap = .false.
199      return
200    end subroutine useGeometricMixing
149  
150  subroutine createMixingMap(status)
151    integer :: nAtypes
152    integer :: status
153    integer :: i
154    integer :: j
155    real ( kind = dp ) :: Sigma_i, Sigma_j
156    real ( kind = dp ) :: Epsilon_i, Epsilon_j
157    real ( kind = dp ) :: rcut6
201  
202 <    status = 0
203 <    
204 <    nAtypes = size(ParameterMap)
205 <    
206 <    if (nAtypes == 0) then
207 <       status = -1
202 >  subroutine createMixingMap()
203 >    integer :: nLJtypes, i, j
204 >    real ( kind = dp ) :: s1, s2, e1, e2
205 >    real ( kind = dp ) :: rcut6, tp6, tp12
206 >    logical :: isSoftCore1, isSoftCore2, doShift
207 >
208 >    if (LJMap%currentLJtype == 0) then
209 >       call handleError("LJ", "No members in LJMap")
210         return
211      end if
212  
213 <    if (.not.have_rcut) then
214 <       status = -1
170 <       return
171 <    endif
172 <    
213 >    nLJtypes = LJMap%nLJtypes
214 >
215      if (.not. allocated(MixingMap)) then
216 <       allocate(MixingMap(nAtypes, nAtypes))
216 >       allocate(MixingMap(nLJtypes, nLJtypes))
217      endif
218 <    
219 <    rcut6 = LJ_rcut**6
220 <    
221 <    ! This loops through all atypes, even those that don't support LJ forces.
222 <    do i = 1, nAtypes
223 <      
224 <       Epsilon_i = ParameterMap(i)%epsilon
225 <       Sigma_i = ParameterMap(i)%sigma
184 <      
185 <       ! do self mixing rule
186 <       MixingMap(i,i)%sigma   = Sigma_i          
187 <       MixingMap(i,i)%sigma6  = Sigma_i ** 6          
188 <       MixingMap(i,i)%tp6     = (MixingMap(i,i)%sigma6)/rcut6          
189 <       MixingMap(i,i)%tp12    = (MixingMap(i,i)%tp6) ** 2
190 <       MixingMap(i,i)%epsilon = Epsilon_i          
191 <       MixingMap(i,i)%delta   = -4.0_DP * MixingMap(i,i)%epsilon * &
192 <            (MixingMap(i,i)%tp12 - MixingMap(i,i)%tp6)
193 <      
194 <       do j = i + 1, nAtypes
218 >
219 >    do i = 1, nLJtypes
220 >
221 >       s1 = LJMap%LJtypes(i)%sigma
222 >       e1 = LJMap%LJtypes(i)%epsilon
223 >       isSoftCore1 = LJMap%LJtypes(i)%isSoftCore
224 >
225 >       do j = i, nLJtypes
226            
227 <          Epsilon_j = ParameterMap(j)%epsilon
228 <          Sigma_j = ParameterMap(j)%sigma
227 >          s2 = LJMap%LJtypes(j)%sigma
228 >          e2 = LJMap%LJtypes(j)%epsilon
229 >          isSoftCore2 = LJMap%LJtypes(j)%isSoftCore
230            
231 +          MixingMap(i,j)%isSoftCore = isSoftCore1 .or. isSoftCore2
232 +
233            ! only the distance parameter uses different mixing policies
234            if (useGeometricDistanceMixing) then
235 <             ! only for OPLS as far as we can tell
202 <             MixingMap(i,j)%sigma = dsqrt(Sigma_i * Sigma_j)
235 >             MixingMap(i,j)%sigma = dsqrt(s1 * s2)
236            else
237 <             ! everyone else
205 <             MixingMap(i,j)%sigma = 0.5_dp * (Sigma_i + Sigma_j)
237 >             MixingMap(i,j)%sigma = 0.5_dp * (s1 + s2)
238            endif
239            
240 <          ! energy parameter is always geometric mean:
241 <          MixingMap(i,j)%epsilon = dsqrt(Epsilon_i * Epsilon_j)
210 <                    
240 >          MixingMap(i,j)%epsilon = dsqrt(e1 * e2)
241 >
242            MixingMap(i,j)%sigma6 = (MixingMap(i,j)%sigma)**6
243 <          MixingMap(i,j)%tp6    = MixingMap(i,j)%sigma6/rcut6
244 <          MixingMap(i,j)%tp12    = (MixingMap(i,j)%tp6) ** 2
245 <          
246 <          MixingMap(i,j)%delta = -4.0_DP * MixingMap(i,j)%epsilon * &
247 <               (MixingMap(i,j)%tp12 - MixingMap(i,j)%tp6)
248 <          
249 <          MixingMap(j,i)%sigma   = MixingMap(i,j)%sigma
250 <          MixingMap(j,i)%sigma6  = MixingMap(i,j)%sigma6
251 <          MixingMap(j,i)%tp6     = MixingMap(i,j)%tp6
252 <          MixingMap(j,i)%tp12    = MixingMap(i,j)%tp12
253 <          MixingMap(j,i)%epsilon = MixingMap(i,j)%epsilon
254 <          MixingMap(j,i)%delta   = MixingMap(i,j)%delta
255 <          
256 <       end do
257 <    end do
243 >
244 >          if (haveDefaultCutoff) then
245 >             rcut6 = defaultCutoff**6
246 >             tp6    = MixingMap(i,j)%sigma6/rcut6
247 >             tp12    = tp6**2          
248 >             MixingMap(i,j)%delta =-4.0_DP*MixingMap(i,j)%epsilon*(tp12 - tp6)
249 >             MixingMap(i,j)%shiftedPot = defaultShift
250 >          else
251 >             MixingMap(i,j)%delta = 0.0_DP
252 >             MixingMap(i,j)%shiftedPot = defaultShift
253 >          endif          
254 >
255 >          if (i.ne.j) then
256 >             MixingMap(j,i)%sigma      = MixingMap(i,j)%sigma
257 >             MixingMap(j,i)%epsilon    = MixingMap(i,j)%epsilon
258 >             MixingMap(j,i)%sigma6     = MixingMap(i,j)%sigma6
259 >             MixingMap(j,i)%rCut       = MixingMap(i,j)%rCut
260 >             MixingMap(j,i)%delta      = MixingMap(i,j)%delta
261 >             MixingMap(j,i)%rCutWasSet = MixingMap(i,j)%rCutWasSet
262 >             MixingMap(j,i)%shiftedPot = MixingMap(i,j)%shiftedPot
263 >             MixingMap(j,i)%isSoftCore = MixingMap(i,j)%isSoftCore
264 >          endif
265 >
266 >       enddo
267 >    enddo
268      
269 +    haveMixingMap = .true.
270 +    
271    end subroutine createMixingMap
272 <        
273 <  subroutine do_lj_pair(atom1, atom2, d, rij, r2, sw, vpair, fpair, &
272 >  
273 >  subroutine do_lj_pair(atom1, atom2, d, rij, r2, rcut, sw, vpair, fpair, &
274         pot, f, do_pot)
275 <
275 >    
276      integer, intent(in) ::  atom1, atom2
277 <    real( kind = dp ), intent(in) :: rij, r2
277 >    integer :: atid1, atid2, ljt1, ljt2
278 >    real( kind = dp ), intent(in) :: rij, r2, rcut
279      real( kind = dp ) :: pot, sw, vpair
280      real( kind = dp ), dimension(3,nLocal) :: f    
281      real( kind = dp ), intent(in), dimension(3) :: d
# Line 244 | Line 288 | contains
288      real( kind = dp ) :: pot_temp, dudr
289      real( kind = dp ) :: sigma6
290      real( kind = dp ) :: epsilon
291 <    real( kind = dp ) :: r6
292 <    real( kind = dp ) :: t6
293 <    real( kind = dp ) :: t12
291 >    real( kind = dp ) :: r6, rc6
292 >    real( kind = dp ) :: t6, tp6
293 >    real( kind = dp ) :: t12, tp12
294      real( kind = dp ) :: delta
295 +    logical :: isSoftCore, shiftedPot
296      integer :: id1, id2, localError
297  
298      if (.not.haveMixingMap) then
299 <       localError = 0
255 <       call createMixingMap(localError)
256 <       if ( localError .ne. 0 ) then
257 <          call handleError("LJ", "MixingMap creation failed!")
258 <          return
259 <       end if
299 >       call createMixingMap()
300      endif
301  
302      ! Look up the correct parameters in the mixing matrix
303   #ifdef IS_MPI
304 <    sigma6   = MixingMap(atid_Row(atom1),atid_Col(atom2))%sigma6
305 <    epsilon  = MixingMap(atid_Row(atom1),atid_Col(atom2))%epsilon
266 <    delta    = MixingMap(atid_Row(atom1),atid_Col(atom2))%delta
304 >    atid1 = atid_Row(atom1)
305 >    atid2 = atid_Col(atom2)
306   #else
307 <    sigma6   = MixingMap(atid(atom1),atid(atom2))%sigma6
308 <    epsilon  = MixingMap(atid(atom1),atid(atom2))%epsilon
270 <    delta    = MixingMap(atid(atom1),atid(atom2))%delta
307 >    atid1 = atid(atom1)
308 >    atid2 = atid(atom2)
309   #endif
310  
311 +    ljt1 = LJMap%atidToLJtype(atid1)
312 +    ljt2 = LJMap%atidToLJtype(atid2)
313 +
314 +    sigma6     = MixingMap(ljt1,ljt2)%sigma6
315 +    epsilon    = MixingMap(ljt1,ljt2)%epsilon
316 +    delta      = MixingMap(ljt1,ljt2)%delta
317 +    isSoftCore = MixingMap(ljt1,ljt2)%isSoftCore
318 +    shiftedPot = MixingMap(ljt1,ljt2)%shiftedPot
319 +
320      r6 = r2 * r2 * r2
321 <    
321 >
322      t6  = sigma6/ r6
323      t12 = t6 * t6    
277  
278    pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
279    if (LJ_do_shift) then
280       pot_temp = pot_temp + delta
281    endif
324  
325 <    vpair = vpair + pot_temp
325 >    if (isSoftCore) then
326        
327 <    dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
327 >       pot_temp = 4.0E0_DP * epsilon * t6
328 >       if (shiftedPot) then
329 >          rc6 = rcut**6
330 >          tp6 = sigma6 / rc6
331 >          delta =-4.0_DP*epsilon*(tp6)
332 >          pot_temp = pot_temp + delta
333 >       endif
334        
335 +       vpair = vpair + pot_temp
336 +      
337 +       dudr = -sw * 24.0E0_DP * epsilon * t6 / rij
338 +      
339 +    else
340 +       pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
341 +       if (shiftedPot) then
342 +          rc6 = rcut**6
343 +          tp6 = sigma6 / rc6
344 +          tp12 = tp6*tp6
345 +          delta =-4.0_DP*epsilon*(tp12 - tp6)
346 +          pot_temp = pot_temp + delta
347 +       endif
348 +      
349 +       vpair = vpair + pot_temp
350 +      
351 +       dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
352 +    endif
353 +
354      drdx = d(1) / rij
355      drdy = d(2) / rij
356      drdz = d(3) / rij
357 <      
357 >
358      fx = dudr * drdx
359      fy = dudr * drdy
360      fz = dudr * drdz
361 <    
295 <      
361 >
362   #ifdef IS_MPI
363      if (do_pot) then
364 <       pot_Row(atom1) = pot_Row(atom1) + sw*pot_temp*0.5
365 <       pot_Col(atom2) = pot_Col(atom2) + sw*pot_temp*0.5
364 >       pot_Row(VDW_POT,atom1) = pot_Row(VDW_POT,atom1) + sw*pot_temp*0.5
365 >       pot_Col(VDW_POT,atom2) = pot_Col(VDW_POT,atom2) + sw*pot_temp*0.5
366      endif
367 <    
367 >
368      f_Row(1,atom1) = f_Row(1,atom1) + fx
369      f_Row(2,atom1) = f_Row(2,atom1) + fy
370      f_Row(3,atom1) = f_Row(3,atom1) + fz
371 <    
371 >
372      f_Col(1,atom2) = f_Col(1,atom2) - fx
373      f_Col(2,atom2) = f_Col(2,atom2) - fy
374      f_Col(3,atom2) = f_Col(3,atom2) - fz      
375 <    
375 >
376   #else
377      if (do_pot) pot = pot + sw*pot_temp
378  
379      f(1,atom1) = f(1,atom1) + fx
380      f(2,atom1) = f(2,atom1) + fy
381      f(3,atom1) = f(3,atom1) + fz
382 <    
382 >
383      f(1,atom2) = f(1,atom2) - fx
384      f(2,atom2) = f(2,atom2) - fy
385      f(3,atom2) = f(3,atom2) - fz
386   #endif
387 <        
387 >
388   #ifdef IS_MPI
389      id1 = AtomRowToGlobal(atom1)
390      id2 = AtomColToGlobal(atom2)
# Line 328 | Line 394 | contains
394   #endif
395  
396      if (molMembershipList(id1) .ne. molMembershipList(id2)) then
397 <      
397 >
398         fpair(1) = fpair(1) + fx
399         fpair(2) = fpair(2) + fy
400         fpair(3) = fpair(3) + fz
# Line 336 | Line 402 | contains
402      endif
403  
404      return    
405 <    
405 >
406    end subroutine do_lj_pair
341  
342  
343  !! Calculates the mixing for sigma or epslon
344    
345 end module lj
407  
408 < subroutine newLJtype(ident, sigma, epsilon, status)
348 <  use lj, ONLY : module_newLJtype => newLJtype
349 <  integer, parameter :: DP = selected_real_kind(15)
350 <  integer,intent(inout) :: ident
351 <  real(kind=dp),intent(inout) :: sigma
352 <  real(kind=dp),intent(inout) :: epsilon
353 <  integer,intent(inout) :: status
354 <  
355 <  call module_newLJtype(ident, sigma, epsilon, status)
356 <  
357 < end subroutine newLJtype
408 >  subroutine destroyLJTypes()
409  
410 < subroutine useGeometricMixing()
411 <  use lj, ONLY: module_useGeometricMixing => useGeometricMixing
412 <  
413 <  call module_useGeometricMixing()
414 <  return
415 < end subroutine useGeometricMixing
410 >    LJMap%nLJtypes = 0
411 >    LJMap%currentLJtype = 0
412 >    
413 >    if (associated(LJMap%LJtypes)) then
414 >       deallocate(LJMap%LJtypes)
415 >       LJMap%LJtypes => null()
416 >    end if
417 >    
418 >    if (associated(LJMap%atidToLJtype)) then
419 >       deallocate(LJMap%atidToLJtype)
420 >       LJMap%atidToLJtype => null()
421 >    end if
422 >    
423 >    haveMixingMap = .false.
424 >  end subroutine destroyLJTypes
425 >
426 > end module lj

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines