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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines