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 2086 by gezelter, Tue Mar 8 21:06:12 2005 UTC vs.
Revision 2317 by chrisfen, Wed Sep 21 17:20:14 2005 UTC

# Line 43 | Line 43
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.9 2005-03-08 21:06:12 gezelter Exp $, $Date: 2005-03-08 21:06:12 $, $Name: not supported by cvs2svn $, $Revision: 1.9 $
46 > !! @version $Id: LJ.F90,v 1.15 2005-09-21 17:20:14 chrisfen Exp $, $Date: 2005-09-21 17:20:14 $, $Name: not supported by cvs2svn $, $Revision: 1.15 $
47  
48  
49   module lj
50    use atype_module
51  use switcheroo
51    use vector_class
52    use simulation
53    use status
# Line 59 | Line 58 | module lj
58  
59    implicit none
60    PRIVATE
61 <  
61 >
62    integer, parameter :: DP = selected_real_kind(15)
63 <  
64 <  type, private :: LjType
65 <     integer :: c_ident
66 <     integer :: atid
63 >
64 >  logical, save :: useGeometricDistanceMixing = .false.
65 >  logical, save :: haveMixingMap = .false.
66 >
67 >  real(kind=DP), save :: defaultCutoff = 0.0_DP
68 >  logical, save :: defaultShift = .false.
69 >  logical, save :: haveDefaultCutoff = .false.
70 >
71 >
72 >  type, private :: LJtype
73 >     integer       :: atid
74       real(kind=dp) :: sigma
75       real(kind=dp) :: epsilon
76 <     logical :: soft_pot
77 <  end type LjType
78 <  
79 <  type(LjType), dimension(:), allocatable :: ParameterMap
80 <  
81 <  logical, save :: haveMixingMap = .false.
82 <  
76 >     logical       :: isSoftCore = .false.
77 >  end type LJtype
78 >
79 >  type, private :: LJList
80 >     integer               :: nLJtypes = 0
81 >     integer               :: currentLJtype = 0
82 >     type(LJtype), pointer :: LJtypes(:)      => null()
83 >     integer, pointer      :: atidToLJtype(:) => null()
84 >  end type LJList
85 >
86 >  type(LJList), save :: LJMap
87 >
88    type :: MixParameters
89       real(kind=DP) :: sigma
90       real(kind=DP) :: epsilon
91 <     real(kind=dp)  :: sigma6
92 <     real(kind=dp)  :: tp6
93 <     real(kind=dp)  :: tp12
94 <     real(kind=dp)  :: delta
95 <     logical :: soft_pot    
91 >     real(kind=dp) :: sigma6
92 >     real(kind=dp) :: rCut
93 >     real(kind=dp) :: delta
94 >     logical       :: rCutWasSet = .false.
95 >     logical       :: shiftedPot
96 >     logical       :: isSoftCore = .false.
97    end type MixParameters
98 <  
98 >
99    type(MixParameters), dimension(:,:), allocatable :: MixingMap
100 <  
101 <  real(kind=DP), save :: LJ_rcut
102 <  logical, save :: have_rcut = .false.
103 <  logical, save :: LJ_do_shift = .false.
104 <  logical, save :: useGeometricDistanceMixing = .false.
93 <  
94 <  !! Public methods and data
95 <  
96 <  public :: setCutoffLJ
97 <  public :: useGeometricMixing
98 <  public :: do_lj_pair
99 <  public :: newLJtype  
100 >
101 >  public :: newLJtype
102 >  public :: setLJDefaultCutoff
103 >  public :: setLJUniformCutoff
104 >  public :: setLJCutoffByTypes
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(c_ident, sigma, epsilon, soft_pot, status)
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) :: soft_pot
117 >    integer, intent(in) :: isSoftCore
118      integer,intent(out) :: status
119 <    integer :: nATypes, myATID
119 >    integer :: nLJTypes, ntypes, myATID
120      integer, pointer :: MatchList(:) => null()
121 +    integer :: current
122  
123      status = 0
124 <    
125 <    myATID = getFirstMatchingElement(atypes, "c_ident", c_ident)
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 <       !call getMatchingElementList(atypes, "is_LennardJones", .true., &
131 <       !     nLJTypes, MatchList)
132 <       nAtypes = getSize(atypes)
133 <       if (nAtypes == 0) then
134 <          status = -1
135 <          return
136 <       end if
127 <        
128 <       if (.not. allocated(ParameterMap)) then
129 <          allocate(ParameterMap(nAtypes))
130 <       endif
131 <      
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 (myATID .gt. size(ParameterMap)) then
140 <       status = -1
136 <       return
137 <    endif
138 <    
139 <    ! set the values for ParameterMap for this atom type:
139 >    LJMap%currentLJtype = LJMap%currentLJtype + 1
140 >    current = LJMap%currentLJtype
141  
142 <    ParameterMap(myATID)%c_ident = c_ident
143 <    ParameterMap(myATID)%atid = myATID
144 <    ParameterMap(myATID)%epsilon = epsilon
145 <    ParameterMap(myATID)%sigma = sigma
146 <    if (soft_pot == 1) then
147 <      ParameterMap(myATID)%soft_pot = .true.
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 <      ParameterMap(myATID)%soft_pot = .false.
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 +    call createMixingMap()
161 +  end subroutine setLJDefaultCutoff
162 +
163 +  subroutine setLJUniformCutoff(thisRcut, shiftedPot)
164 +    real(kind=dp), intent(in) :: thisRcut
165 +    logical, intent(in) :: shiftedPot
166 +    integer :: nLJtypes, i, j
167 +
168 +    if (LJMap%currentLJtype == 0) then
169 +       call handleError("LJ", "No members in LJMap")
170 +       return
171 +    end if
172 +
173 +    nLJtypes = LJMap%nLJtypes
174 +    if (.not. allocated(MixingMap)) then
175 +       allocate(MixingMap(nLJtypes, nLJtypes))
176 +    endif
177 +
178 +    do i = 1, nLJtypes
179 +       do j = 1, nLJtypes
180 +          MixingMap(i,j)%rCut = thisRcut
181 +          MixingMap(i,j)%shiftedPot = shiftedPot
182 +          MixingMap(i,j)%rCutWasSet = .true.
183 +       enddo
184 +    enddo
185 +    call createMixingMap()
186 +  end subroutine setLJUniformCutoff
187 +
188 +  subroutine setLJCutoffByTypes(atid1, atid2, thisRcut, shiftedPot)
189 +    integer, intent(in) :: atid1, atid2
190 +    real(kind=dp), intent(in) :: thisRcut
191 +    logical, intent(in) :: shiftedPot
192 +    integer :: nLJtypes, ljt1, ljt2
193 +
194 +    if (LJMap%currentLJtype == 0) then
195 +       call handleError("LJ", "No members in LJMap")
196 +       return
197 +    end if
198 +
199 +    nLJtypes = LJMap%nLJtypes
200 +    if (.not. allocated(MixingMap)) then
201 +       allocate(MixingMap(nLJtypes, nLJtypes))
202 +    endif
203 +
204 +    ljt1 = LJMap%atidToLJtype(atid1)
205 +    ljt2 = LJMap%atidToLJtype(atid2)
206 +
207 +    MixingMap(ljt1,ljt2)%rCut = thisRcut
208 +    MixingMap(ljt1,ljt2)%shiftedPot = shiftedPot
209 +    MixingMap(ljt1,ljt2)%rCutWasSet = .true.
210 +    MixingMap(ljt2,ljt1)%rCut = thisRcut
211 +    MixingMap(ljt2,ljt1)%shiftedPot = shiftedPot
212 +    MixingMap(ljt2,ljt1)%rCutWasSet = .true.
213 +
214 +    call createMixingMap()
215 +  end subroutine setLJCutoffByTypes
216 +
217    function getSigma(atid) result (s)
218      integer, intent(in) :: atid
219 <    integer :: localError
219 >    integer :: ljt1
220      real(kind=dp) :: s
221 <    
222 <    if (.not.allocated(ParameterMap)) then
223 <       call handleError("LJ", "no ParameterMap was present before first call of getSigma!")
221 >
222 >    if (LJMap%currentLJtype == 0) then
223 >       call handleError("LJ", "No members in LJMap")
224         return
225      end if
226 <    
227 <    s = ParameterMap(atid)%sigma
226 >
227 >    ljt1 = LJMap%atidToLJtype(atid)
228 >    s = LJMap%LJtypes(ljt1)%sigma
229 >
230    end function getSigma
231  
232    function getEpsilon(atid) result (e)
233      integer, intent(in) :: atid
234 <    integer :: localError
234 >    integer :: ljt1
235      real(kind=dp) :: e
236 <    
237 <    if (.not.allocated(ParameterMap)) then
238 <       call handleError("LJ", "no ParameterMap was present before first call of getEpsilon!")
236 >
237 >    if (LJMap%currentLJtype == 0) then
238 >       call handleError("LJ", "No members in LJMap")
239         return
240      end if
174    
175    e = ParameterMap(atid)%epsilon
176  end function getEpsilon
241  
242 +    ljt1 = LJMap%atidToLJtype(atid)
243 +    e = LJMap%LJtypes(ljt1)%epsilon
244  
245 <  subroutine setCutoffLJ(rcut, do_shift, status)
180 <    logical, intent(in):: do_shift
181 <    integer :: status, myStatus
182 <    real(kind=dp) :: rcut
245 >  end function getEpsilon
246  
184 #define __FORTRAN90
185 #include "UseTheForce/fSwitchingFunction.h"
186
187    status = 0
188
189    LJ_rcut = rcut
190    LJ_do_shift = do_shift
191    call set_switch(LJ_SWITCH, rcut, rcut)
192    have_rcut = .true.
193    
194    return
195  end subroutine setCutoffLJ
196
247    subroutine useGeometricMixing()
248      useGeometricDistanceMixing = .true.
249      haveMixingMap = .false.
250      return
251    end subroutine useGeometricMixing
202  
203  subroutine createMixingMap(status)
204    integer :: nATIDs
205    integer :: status
206    integer :: i
207    integer :: j
208    real ( kind = dp ) :: Sigma_i, Sigma_j
209    real ( kind = dp ) :: Epsilon_i, Epsilon_j
210    real ( kind = dp ) :: rcut6
211    logical :: i_is_LJ, j_is_LJ
252  
253 <    status = 0
253 >  subroutine createMixingMap()
254 >    integer :: nLJtypes, i, j
255 >    real ( kind = dp ) :: s1, s2, e1, e2
256 >    real ( kind = dp ) :: rcut6, tp6, tp12
257 >    logical :: isSoftCore1, isSoftCore2, doShift
258  
259 <    if (.not. allocated(ParameterMap)) then
260 <       call handleError("LJ", "no ParameterMap was present before call of createMixingMap!")
217 <       status = -1
218 <       return
219 <    endif
220 <    
221 <    nATIDs = size(ParameterMap)
222 <    
223 <    if (nATIDs == 0) then
224 <       status = -1
259 >    if (LJMap%currentLJtype == 0) then
260 >       call handleError("LJ", "No members in LJMap")
261         return
262      end if
263  
264 +    nLJtypes = LJMap%nLJtypes
265 +
266      if (.not. allocated(MixingMap)) then
267 <       allocate(MixingMap(nATIDs, nATIDs))
267 >       allocate(MixingMap(nLJtypes, nLJtypes))
268      endif
269  
270 <    if (.not.have_rcut) then
271 <       status = -1
272 <       return
273 <    endif
274 <        
275 <    rcut6 = LJ_rcut**6
276 <    
239 <    ! This loops through all atypes, even those that don't support LJ forces.
240 <    do i = 1, nATIDs
241 <       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
242 <       if (i_is_LJ) then
243 <          Epsilon_i = ParameterMap(i)%epsilon
244 <          Sigma_i = ParameterMap(i)%sigma
270 >    do i = 1, nLJtypes
271 >
272 >       s1 = LJMap%LJtypes(i)%sigma
273 >       e1 = LJMap%LJtypes(i)%epsilon
274 >       isSoftCore1 = LJMap%LJtypes(i)%isSoftCore
275 >
276 >       do j = i, nLJtypes
277            
278 <          ! do self mixing rule
279 <          MixingMap(i,i)%sigma   = Sigma_i          
280 <          MixingMap(i,i)%sigma6  = Sigma_i ** 6          
249 <          MixingMap(i,i)%tp6     = (MixingMap(i,i)%sigma6)/rcut6          
250 <          MixingMap(i,i)%tp12    = (MixingMap(i,i)%tp6) ** 2
251 <          MixingMap(i,i)%epsilon = Epsilon_i          
252 <          MixingMap(i,i)%delta   = -4.0_DP * MixingMap(i,i)%epsilon * &
253 <               (MixingMap(i,i)%tp12 - MixingMap(i,i)%tp6)
254 <          MixingMap(i,i)%soft_pot = ParameterMap(i)%soft_pot
278 >          s2 = LJMap%LJtypes(j)%sigma
279 >          e2 = LJMap%LJtypes(j)%epsilon
280 >          isSoftCore2 = LJMap%LJtypes(j)%isSoftCore
281            
282 <          do j = i + 1, nATIDs
283 <             call getElementProperty(atypes, j, "is_LennardJones", j_is_LJ)
282 >          MixingMap(i,j)%isSoftCore = isSoftCore1 .or. isSoftCore2
283 >
284 >          ! only the distance parameter uses different mixing policies
285 >          if (useGeometricDistanceMixing) then
286 >             MixingMap(i,j)%sigma = dsqrt(s1 * s2)
287 >          else
288 >             MixingMap(i,j)%sigma = 0.5_dp * (s1 + s2)
289 >          endif
290            
291 <             if (j_is_LJ) then
292 <                Epsilon_j = ParameterMap(j)%epsilon
293 <                Sigma_j = ParameterMap(j)%sigma
294 <                
295 <                ! only the distance parameter uses different mixing policies
296 <                if (useGeometricDistanceMixing) then
297 <                   ! only for OPLS as far as we can tell
298 <                   MixingMap(i,j)%sigma = dsqrt(Sigma_i * Sigma_j)
299 <                else
300 <                   ! everyone else
301 <                   MixingMap(i,j)%sigma = 0.5_dp * (Sigma_i + Sigma_j)
302 <                endif
271 <                
272 <                ! energy parameter is always geometric mean:
273 <                MixingMap(i,j)%epsilon = dsqrt(Epsilon_i * Epsilon_j)
274 <                
275 <                MixingMap(i,j)%sigma6 = (MixingMap(i,j)%sigma)**6
276 <                MixingMap(i,j)%tp6    = MixingMap(i,j)%sigma6/rcut6
277 <                MixingMap(i,j)%tp12    = (MixingMap(i,j)%tp6) ** 2
278 <                
279 <                MixingMap(i,j)%delta = -4.0_DP * MixingMap(i,j)%epsilon * &
280 <                     (MixingMap(i,j)%tp12 - MixingMap(i,j)%tp6)
281 <                
282 <                MixingMap(i,j)%soft_pot = ParameterMap(i)%soft_pot .or. ParameterMap(j)%soft_pot
283 <                
284 <                
285 <                MixingMap(j,i)%sigma   = MixingMap(i,j)%sigma
286 <                MixingMap(j,i)%sigma6  = MixingMap(i,j)%sigma6
287 <                MixingMap(j,i)%tp6     = MixingMap(i,j)%tp6
288 <                MixingMap(j,i)%tp12    = MixingMap(i,j)%tp12
289 <                MixingMap(j,i)%epsilon = MixingMap(i,j)%epsilon
290 <                MixingMap(j,i)%delta   = MixingMap(i,j)%delta
291 <                MixingMap(j,i)%soft_pot   = MixingMap(i,j)%soft_pot
291 >          MixingMap(i,j)%epsilon = dsqrt(e1 * e2)
292 >
293 >          MixingMap(i,j)%sigma6 = (MixingMap(i,j)%sigma)**6
294 >
295 >          if (MixingMap(i,j)%rCutWasSet) then
296 >             rcut6 = (MixingMap(i,j)%rcut)**6
297 >          else
298 >             if (haveDefaultCutoff) then
299 >                rcut6 = defaultCutoff**6
300 >                doShift = defaultShift
301 >             else
302 >                call handleError("LJ", "No specified or default cutoff value!")
303               endif
304 <          end do
305 <       endif
306 <    end do
304 >          endif
305 >          
306 >          tp6    = MixingMap(i,j)%sigma6/rcut6
307 >          tp12    = tp6**2          
308 >          MixingMap(i,j)%delta =-4.0_DP*MixingMap(i,j)%epsilon*(tp12 - tp6)
309 >          MixingMap(i,j)%shiftedPot = doShift
310 >
311 >          if (i.ne.j) then
312 >             MixingMap(j,i)%sigma      = MixingMap(i,j)%sigma
313 >             MixingMap(j,i)%epsilon    = MixingMap(i,j)%epsilon
314 >             MixingMap(j,i)%sigma6     = MixingMap(i,j)%sigma6
315 >             MixingMap(j,i)%rCut       = MixingMap(i,j)%rCut
316 >             MixingMap(j,i)%delta      = MixingMap(i,j)%delta
317 >             MixingMap(j,i)%rCutWasSet = MixingMap(i,j)%rCutWasSet
318 >             MixingMap(j,i)%shiftedPot = MixingMap(i,j)%shiftedPot
319 >             MixingMap(j,i)%isSoftCore = MixingMap(i,j)%isSoftCore
320 >          endif
321 >
322 >       enddo
323 >    enddo
324      
325      haveMixingMap = .true.
326 <
326 >    
327    end subroutine createMixingMap
328 <        
328 >  
329    subroutine do_lj_pair(atom1, atom2, d, rij, r2, sw, vpair, fpair, &
330         pot, f, do_pot)
331  
332      integer, intent(in) ::  atom1, atom2
333 +    integer :: atid1, atid2, ljt1, ljt2
334      real( kind = dp ), intent(in) :: rij, r2
335      real( kind = dp ) :: pot, sw, vpair
336      real( kind = dp ), dimension(3,nLocal) :: f    
# Line 319 | Line 348 | contains
348      real( kind = dp ) :: t6
349      real( kind = dp ) :: t12
350      real( kind = dp ) :: delta
351 <    logical :: soft_pot
351 >    logical :: isSoftCore, shiftedPot
352      integer :: id1, id2, localError
353  
354      if (.not.haveMixingMap) then
355 <       localError = 0
327 <       call createMixingMap(localError)
328 <       if ( localError .ne. 0 ) then
329 <          call handleError("LJ", "MixingMap creation failed!")
330 <          return
331 <       end if
355 >       call createMixingMap()
356      endif
357  
358      ! Look up the correct parameters in the mixing matrix
359   #ifdef IS_MPI
360 <    sigma6   = MixingMap(atid_Row(atom1),atid_Col(atom2))%sigma6
361 <    epsilon  = MixingMap(atid_Row(atom1),atid_Col(atom2))%epsilon
338 <    delta    = MixingMap(atid_Row(atom1),atid_Col(atom2))%delta
339 <    soft_pot =  MixingMap(atid_Row(atom1),atid_Col(atom2))%soft_pot
360 >    atid1 = atid_Row(atom1)
361 >    atid2 = atid_Col(atom2)
362   #else
363 <    sigma6   = MixingMap(atid(atom1),atid(atom2))%sigma6
364 <    epsilon  = MixingMap(atid(atom1),atid(atom2))%epsilon
343 <    delta    = MixingMap(atid(atom1),atid(atom2))%delta
344 <    soft_pot    = MixingMap(atid(atom1),atid(atom2))%soft_pot
363 >    atid1 = atid(atom1)
364 >    atid2 = atid(atom2)
365   #endif
366  
367 +    ljt1 = LJMap%atidToLJtype(atid1)
368 +    ljt2 = LJMap%atidToLJtype(atid2)
369 +
370 +    sigma6     = MixingMap(ljt1,ljt2)%sigma6
371 +    epsilon    = MixingMap(ljt1,ljt2)%epsilon
372 +    delta      = MixingMap(ljt1,ljt2)%delta
373 +    isSoftCore = MixingMap(ljt1,ljt2)%isSoftCore
374 +    shiftedPot = MixingMap(ljt1,ljt2)%shiftedPot
375 +
376      r6 = r2 * r2 * r2
377 <    
377 >
378      t6  = sigma6/ r6
379      t12 = t6 * t6    
380  
381 <    if (soft_pot) then
382 <      pot_temp = 4.0E0_DP * epsilon * t12
383 <      if (LJ_do_shift) then
384 <         pot_temp = pot_temp + delta
385 <      endif
386 <  
387 <      vpair = vpair + pot_temp
388 <        
389 <      dudr = sw * 24.0E0_DP * epsilon * (-2.0E0_DP)*t12 / rij
390 <
381 >    if (isSoftCore) then
382 >      
383 >       pot_temp = 4.0E0_DP * epsilon * t6
384 >       if (shiftedPot) then
385 >          pot_temp = pot_temp + delta
386 >       endif
387 >      
388 >       vpair = vpair + pot_temp
389 >      
390 >       dudr = -sw * 24.0E0_DP * epsilon * t6 / rij
391 >      
392      else
393 <      pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
394 <      if (LJ_do_shift) then
395 <         pot_temp = pot_temp + delta
396 <      endif
367 <  
368 <      vpair = vpair + pot_temp
369 <        
370 <      dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
371 <    endif
393 >       pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
394 >       if (shiftedPot) then
395 >          pot_temp = pot_temp + delta
396 >       endif
397        
398 +       vpair = vpair + pot_temp
399 +      
400 +       dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
401 +    endif
402 +
403      drdx = d(1) / rij
404      drdy = d(2) / rij
405      drdz = d(3) / rij
406 <      
406 >
407      fx = dudr * drdx
408      fy = dudr * drdy
409      fz = dudr * drdz
410 <    
381 <      
410 >
411   #ifdef IS_MPI
412      if (do_pot) then
413         pot_Row(atom1) = pot_Row(atom1) + sw*pot_temp*0.5
414         pot_Col(atom2) = pot_Col(atom2) + sw*pot_temp*0.5
415      endif
416 <    
416 >
417      f_Row(1,atom1) = f_Row(1,atom1) + fx
418      f_Row(2,atom1) = f_Row(2,atom1) + fy
419      f_Row(3,atom1) = f_Row(3,atom1) + fz
420 <    
420 >
421      f_Col(1,atom2) = f_Col(1,atom2) - fx
422      f_Col(2,atom2) = f_Col(2,atom2) - fy
423      f_Col(3,atom2) = f_Col(3,atom2) - fz      
424 <    
424 >
425   #else
426      if (do_pot) pot = pot + sw*pot_temp
427  
428      f(1,atom1) = f(1,atom1) + fx
429      f(2,atom1) = f(2,atom1) + fy
430      f(3,atom1) = f(3,atom1) + fz
431 <    
431 >
432      f(1,atom2) = f(1,atom2) - fx
433      f(2,atom2) = f(2,atom2) - fy
434      f(3,atom2) = f(3,atom2) - fz
435   #endif
436 <        
436 >
437   #ifdef IS_MPI
438      id1 = AtomRowToGlobal(atom1)
439      id2 = AtomColToGlobal(atom2)
# Line 414 | Line 443 | contains
443   #endif
444  
445      if (molMembershipList(id1) .ne. molMembershipList(id2)) then
446 <      
446 >
447         fpair(1) = fpair(1) + fx
448         fpair(2) = fpair(2) + fy
449         fpair(3) = fpair(3) + fz
# Line 422 | Line 451 | contains
451      endif
452  
453      return    
454 <    
454 >
455    end subroutine do_lj_pair
456 <  
457 <  
458 <  !! Calculates the mixing for sigma or epslon
456 >
457 >  subroutine destroyLJTypes()
458 >
459 >    LJMap%nLJtypes = 0
460 >    LJMap%currentLJtype = 0
461      
462 +    if (associated(LJMap%LJtypes)) then
463 +       deallocate(LJMap%LJtypes)
464 +       LJMap%LJtypes => null()
465 +    end if
466 +    
467 +    if (associated(LJMap%atidToLJtype)) then
468 +       deallocate(LJMap%atidToLJtype)
469 +       LJMap%atidToLJtype => null()
470 +    end if
471 +    
472 +    haveMixingMap = .false.
473 +  end subroutine destroyLJTypes
474 +
475   end module lj

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines