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 1624 by chuckv, Thu Oct 21 15:25:30 2004 UTC vs.
Revision 2497 by chuckv, Wed Dec 7 19:58:18 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.
2 !! Corresponds to the force field defined in lj_FF.cpp
44   !! @author Charles F. Vardeman II
45   !! @author Matthew Meineke
46 < !! @version $Id: LJ.F90,v 1.2 2004-10-21 15:25:30 chuckv Exp $, $Date: 2004-10-21 15:25:30 $, $Name: not supported by cvs2svn $, $Revision: 1.2 $
46 > !! @version $Id: LJ.F90,v 1.20 2005-12-07 19:58:18 chuckv Exp $, $Date: 2005-12-07 19:58:18 $, $Name: not supported by cvs2svn $, $Revision: 1.20 $
47  
48 +
49   module lj
50    use atype_module
9  use switcheroo
51    use vector_class
52    use simulation
53 +  use status
54 +  use fForceOptions
55   #ifdef IS_MPI
56    use mpiSimulation
57   #endif
# Line 16 | Line 59 | module lj
59  
60    implicit none
61    PRIVATE
62 <  
62 > #define __FORTRAN90
63 > #include "UseTheForce/DarkSide/fInteractionMap.h"
64 >
65    integer, parameter :: DP = selected_real_kind(15)
66  
67 < #define __FORTRAN90
68 < #include "UseTheForce/fForceField.h"
67 >  logical, save :: useGeometricDistanceMixing = .false.
68 >  logical, save :: haveMixingMap = .false.
69  
70 <  integer, save :: LJ_Mixing_Policy
71 <  real(kind=DP), save :: LJ_rcut
72 <  logical, save :: havePolicy = .false.
73 <  logical, save :: haveCut = .false.
74 <  logical, save :: LJ_do_shift = .false.
75 <  
76 <  !! Logical has lj force field module been initialized?
77 <  
78 <  logical, save :: LJ_FF_initialized = .false.
79 <  
80 <  !! Public methods and data
81 <  public :: init_LJ_FF
82 <  public :: setCutoffLJ
83 <  public :: do_lj_pair
70 >  real(kind=DP), save :: defaultCutoff = 0.0_DP
71 >  logical, save :: defaultShift = .false.
72 >  logical, save :: haveDefaultCutoff = .false.
73 >
74 >
75 >  type, private :: LJtype
76 >     integer       :: atid
77 >     real(kind=dp) :: sigma
78 >     real(kind=dp) :: epsilon
79 >     logical       :: isSoftCore = .false.
80 >  end type LJtype
81 >
82 >  type, private :: LJList
83 >     integer               :: Nljtypes = 0
84 >     integer               :: currentLJtype = 0
85 >     type(LJtype), pointer :: LJtypes(:)      => null()
86 >     integer, pointer      :: atidToLJtype(:) => null()
87 >  end type LJList
88 >
89 >  type(LJList), save :: LJMap
90 >
91 >  type :: MixParameters
92 >     real(kind=DP) :: sigma
93 >     real(kind=DP) :: epsilon
94 >     real(kind=dp) :: sigma6
95 >     real(kind=dp) :: rCut
96 >     real(kind=dp) :: delta
97 >     logical       :: rCutWasSet = .false.
98 >     logical       :: shiftedPot
99 >     logical       :: isSoftCore = .false.
100 >  end type MixParameters
101 >
102 >  type(MixParameters), dimension(:,:), allocatable :: MixingMap
103 >
104    public :: newLJtype
105 <  
106 <  !! structure for lj type parameters
107 <  type, private :: ljType
108 <    integer :: lj_ident
109 <    real(kind=dp) :: lj_sigma
110 <    real(kind=dp) :: lj_epsilon
46 <  end type ljType
47 <  
48 <  !! List of lj type parameters
49 <  type, private :: ljTypeList
50 <    integer  :: n_lj_types = 0
51 <    integer  :: currentAddition = 0
52 <    type(ljType), pointer :: ljParams(:) => null()
53 <  end type ljTypeList
54 <  
55 <  !! The list of lj Parameters
56 <  type (ljTypeList), save :: ljParameterList
57 <  
58 <  
59 <  type :: lj_mixed_params
60 <     !! Lennard-Jones epsilon
61 <     real ( kind = dp )  :: epsilon = 0.0_dp
62 <     !! Lennard-Jones Sigma
63 <     real ( kind = dp )  :: sigma = 0.0_dp
64 <     !! Lennard-Jones Sigma to sixth
65 <     real ( kind = dp )  :: sigma6 = 0.0_dp
66 <     !!
67 <     real ( kind = dp )  :: tp6
68 <     real ( kind = dp )  :: tp12
69 <     real ( kind = dp )  :: delta  = 0.0_dp
70 <  end type lj_mixed_params
71 <  
72 <  type (lj_mixed_params), dimension(:,:), pointer :: ljMixed
73 <  
74 <  
75 <  
105 >  public :: setLJDefaultCutoff
106 >  public :: getSigma
107 >  public :: getEpsilon
108 >  public :: do_lj_pair
109 >  public :: destroyLJtypes
110 >
111   contains
112  
113 <  subroutine newLJtype(ident,lj_sigma,lj_epsilon,status)
114 <    integer,intent(in) :: ident
115 <    real(kind=dp),intent(in) :: lj_sigma
116 <    real(kind=dp),intent(in) :: lj_epsilon
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 <    
120 <    integer,pointer                        :: Matchlist(:) => null()
119 >    integer :: nLJTypes, ntypes, myATID
120 >    integer, pointer :: MatchList(:) => null()
121      integer :: current
122 <    integer :: nAtypes
122 >
123      status = 0
124 <    
125 <        !! Assume that atypes has already been set and get the total number of types in atypes
90 <  
91 <  
124 >    ! check to see if this is the first time into this routine...
125 >    if (.not.associated(LJMap%LJtypes)) then
126  
127 <    ! check to see if this is the first time into
128 <    if (.not.associated(ljParameterList%ljParams)) then
129 <       call getMatchingElementList(atypes, "is_lj", .true., nAtypes, MatchList)
130 <       ljParameterList%n_lj_types = nAtypes
131 <       if (nAtypes == 0) then
132 <         status = -1
133 <         return
134 <       end if
135 <       allocate(ljParameterList%ljParams(nAtypes))
127 >       call getMatchingElementList(atypes, "is_LennardJones", .true., &
128 >            nLJTypes, MatchList)
129 >      
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 <    ljParameterList%currentAddition = ljParameterList%currentAddition + 1
140 <    current = ljParameterList%currentAddition
141 <    
142 <    ! set the values for ljParameterList
143 <    ljParameterList%ljParams(current)%lj_ident = ident
144 <    ljParameterList%ljParams(current)%lj_epsilon = lj_epsilon
145 <    ljParameterList%ljParams(current)%lj_sigma = lj_sigma
146 <    
147 <  end subroutine newLJtype
148 <  
114 <  subroutine init_LJ_FF(mix_Policy, status)
115 <    integer, intent(in) :: mix_Policy
116 <    integer, intent(out) :: status
117 <    integer :: myStatus
118 <    
119 <    if (mix_Policy == LB_MIXING_RULE) then
120 <       LJ_Mixing_Policy = LB_MIXING_RULE
139 >    LJMap%currentLJtype = LJMap%currentLJtype + 1
140 >    current = LJMap%currentLJtype
141 >
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 <       if (mix_Policy == EXPLICIT_MIXING_RULE) then
123 <          LJ_Mixing_Policy = EXPLICIT_MIXING_RULE
124 <       else
125 <          write(*,*) 'Unknown Mixing Policy!'
126 <          status = -1
127 <          return
128 <       endif
150 >       LJMap%LJtypes(current)%isSoftCore = .false.
151      endif
152 +  end subroutine newLJtype
153  
154 <    havePolicy = .true.
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 <    if (haveCut) then
167 <       status = 0
168 <       call createMixingList(myStatus)
169 <       if (myStatus /= 0) then
170 <          status = -1
171 <          return
172 <       end if
173 <      
141 <       LJ_FF_initialized = .true.
166 >  function getSigma(atid) result (s)
167 >    integer, intent(in) :: atid
168 >    integer :: ljt1
169 >    real(kind=dp) :: s
170 >
171 >    if (LJMap%currentLJtype == 0) then
172 >       call handleError("LJ", "No members in LJMap")
173 >       return
174      end if
143  
144  end subroutine init_LJ_FF
145  
146  subroutine setCutoffLJ(rcut, do_shift, status)
147    logical, intent(in):: do_shift
148    integer :: status, myStatus
149    real(kind=dp) :: rcut
175  
176 < #define __FORTRAN90
177 < #include "UseTheForce/fSwitchingFunction.h"
176 >    ljt1 = LJMap%atidToLJtype(atid)
177 >    s = LJMap%LJtypes(ljt1)%sigma
178  
179 <    status = 0
179 >  end function getSigma
180  
181 <    LJ_rcut = rcut
182 <    LJ_do_shift = do_shift
183 <    call set_switch(LJ_SWITCH, rcut, rcut)
184 <    haveCut = .true.
181 >  function getEpsilon(atid) result (e)
182 >    integer, intent(in) :: atid
183 >    integer :: ljt1
184 >    real(kind=dp) :: e
185  
186 <    if (havePolicy) then
187 <       status = 0
163 <       call createMixingList(myStatus)
164 <       if (myStatus /= 0) then
165 <          status = -1
166 <          return
167 <       end if
168 <      
169 <       LJ_FF_initialized = .true.
170 <    end if    
171 <    
172 <    return
173 <  end subroutine setCutoffLJ
174 <  
175 <  subroutine createMixingList(status)
176 <    integer :: nAtypes
177 <    integer :: status
178 <    integer :: i
179 <    integer :: j
180 <    real ( kind = dp ) :: mySigma_i,mySigma_j
181 <    real ( kind = dp ) :: myEpsilon_i,myEpsilon_j
182 <    real ( kind = dp ) :: rcut6
183 <    logical :: I_isLJ, J_isLJ
184 <    status = 0
185 <    
186 <    ! we only allocate this array to the number of lj_atypes
187 <    nAtypes = size(ljParameterList%ljParams)
188 <    if (nAtypes == 0) then
189 <       status = -1
186 >    if (LJMap%currentLJtype == 0) then
187 >       call handleError("LJ", "No members in LJMap")
188         return
189      end if
190 <        
191 <    if (.not. associated(ljMixed)) then
192 <       allocate(ljMixed(nAtypes, nAtypes))
190 >
191 >    ljt1 = LJMap%atidToLJtype(atid)
192 >    e = LJMap%LJtypes(ljt1)%epsilon
193 >
194 >  end function getEpsilon
195 >
196 >  subroutine createMixingMap()
197 >    integer :: nLJtypes, i, j
198 >    real ( kind = dp ) :: s1, s2, e1, e2
199 >    real ( kind = dp ) :: rcut6, tp6, tp12
200 >    logical :: isSoftCore1, isSoftCore2, doShift
201 >
202 >    if (LJMap%currentLJtype == 0) then
203 >       call handleError("LJ", "No members in LJMap")
204 >       return
205 >    end if
206 >
207 >    nLJtypes = LJMap%nLJtypes
208 >
209 >    if (.not. allocated(MixingMap)) then
210 >       allocate(MixingMap(nLJtypes, nLJtypes))
211      endif
212  
213 <    rcut6 = LJ_rcut**6
213 >    useGeometricDistanceMixing = usesGeometricDistanceMixing()
214 >    do i = 1, nLJtypes
215  
216 < ! This loops through all atypes, even those that don't support LJ forces.
217 <    do i = 1, nAtypes
216 >       s1 = LJMap%LJtypes(i)%sigma
217 >       e1 = LJMap%LJtypes(i)%epsilon
218 >       isSoftCore1 = LJMap%LJtypes(i)%isSoftCore
219  
220 <          myEpsilon_i = ljParameterList%ljParams(i)%lj_epsilon
203 <          mySigma_i = ljParameterList%ljParams(i)%lj_sigma
220 >       do j = i, nLJtypes
221            
222 <          ! do self mixing rule
223 <          ljMixed(i,i)%sigma   = mySigma_i
222 >          s2 = LJMap%LJtypes(j)%sigma
223 >          e2 = LJMap%LJtypes(j)%epsilon
224 >          isSoftCore2 = LJMap%LJtypes(j)%isSoftCore
225            
226 <          ljMixed(i,i)%sigma6  = (ljMixed(i,i)%sigma) ** 6
226 >          MixingMap(i,j)%isSoftCore = isSoftCore1 .or. isSoftCore2
227 >
228 >          ! only the distance parameter uses different mixing policies
229 >          if (useGeometricDistanceMixing) then
230 >             MixingMap(i,j)%sigma = dsqrt(s1 * s2)
231 >          else
232 >             MixingMap(i,j)%sigma = 0.5_dp * (s1 + s2)
233 >          endif
234            
235 <          ljMixed(i,i)%tp6     = (ljMixed(i,i)%sigma6)/rcut6
211 <          
212 <          ljMixed(i,i)%tp12    = (ljMixed(i,i)%tp6) ** 2
213 <          
214 <          
215 <          ljMixed(i,i)%epsilon = myEpsilon_i
216 <          
217 <          ljMixed(i,i)%delta = -4.0_DP * ljMixed(i,i)%epsilon * &
218 <            (ljMixed(i,i)%tp12 - ljMixed(i,i)%tp6)
219 <          
220 <          do j = i + 1, nAtypes
235 >          MixingMap(i,j)%epsilon = dsqrt(e1 * e2)
236  
237 <                myEpsilon_j = ljParameterList%ljParams(j)%lj_epsilon
223 <                mySigma_j = ljParameterList%ljParams(j)%lj_sigma
237 >          MixingMap(i,j)%sigma6 = (MixingMap(i,j)%sigma)**6
238  
239 <                          
240 <                ljMixed(i,j)%sigma  =  &
241 <                     calcLJMix("sigma",mySigma_i, &
242 <                     mySigma_j)
243 <                
244 <                ljMixed(i,j)%sigma6 = &
245 <                     (ljMixed(i,j)%sigma)**6
246 <                
247 <                
248 <                ljMixed(i,j)%tp6     = ljMixed(i,j)%sigma6/rcut6
249 <                
250 <                ljMixed(i,j)%tp12    = (ljMixed(i,j)%tp6) ** 2
251 <                
252 <                
253 <                ljMixed(i,j)%epsilon = &
254 <                     calcLJMix("epsilon",myEpsilon_i, &
255 <                     myEpsilon_j)
256 <                
257 <                ljMixed(i,j)%delta = -4.0_DP * ljMixed(i,j)%epsilon * &
258 <                     (ljMixed(i,j)%tp12 - ljMixed(i,j)%tp6)
259 <                
260 <                
261 <                ljMixed(j,i)%sigma   = ljMixed(i,j)%sigma
262 <                ljMixed(j,i)%sigma6  = ljMixed(i,j)%sigma6
249 <                ljMixed(j,i)%tp6     = ljMixed(i,j)%tp6
250 <                ljMixed(j,i)%tp12    = ljMixed(i,j)%tp12
251 <                ljMixed(j,i)%epsilon = ljMixed(i,j)%epsilon
252 <                ljMixed(j,i)%delta   = ljMixed(i,j)%delta
253 <          
254 <          end do
255 <    end do
239 >          if (haveDefaultCutoff) then
240 >             rcut6 = defaultCutoff**6
241 >             tp6    = MixingMap(i,j)%sigma6/rcut6
242 >             tp12    = tp6**2          
243 >             MixingMap(i,j)%delta =-4.0_DP*MixingMap(i,j)%epsilon*(tp12 - tp6)
244 >             MixingMap(i,j)%shiftedPot = defaultShift
245 >          else
246 >             MixingMap(i,j)%delta = 0.0_DP
247 >             MixingMap(i,j)%shiftedPot = defaultShift
248 >          endif          
249 >
250 >          if (i.ne.j) then
251 >             MixingMap(j,i)%sigma      = MixingMap(i,j)%sigma
252 >             MixingMap(j,i)%epsilon    = MixingMap(i,j)%epsilon
253 >             MixingMap(j,i)%sigma6     = MixingMap(i,j)%sigma6
254 >             MixingMap(j,i)%rCut       = MixingMap(i,j)%rCut
255 >             MixingMap(j,i)%delta      = MixingMap(i,j)%delta
256 >             MixingMap(j,i)%rCutWasSet = MixingMap(i,j)%rCutWasSet
257 >             MixingMap(j,i)%shiftedPot = MixingMap(i,j)%shiftedPot
258 >             MixingMap(j,i)%isSoftCore = MixingMap(i,j)%isSoftCore
259 >          endif
260 >
261 >       enddo
262 >    enddo
263      
264 <  end subroutine createMixingList
264 >    haveMixingMap = .true.
265 >    
266 >  end subroutine createMixingMap
267    
268 <  subroutine do_lj_pair(atom1, atom2, d, rij, r2, sw, vpair, fpair, &
268 >  subroutine do_lj_pair(atom1, atom2, d, rij, r2, rcut, sw, vpair, fpair, &
269         pot, f, do_pot)
270 <
270 >    
271      integer, intent(in) ::  atom1, atom2
272 <    real( kind = dp ), intent(in) :: rij, r2
272 >    integer :: atid1, atid2, ljt1, ljt2
273 >    real( kind = dp ), intent(in) :: rij, r2, rcut
274      real( kind = dp ) :: pot, sw, vpair
275      real( kind = dp ), dimension(3,nLocal) :: f    
276      real( kind = dp ), intent(in), dimension(3) :: d
# Line 273 | Line 283 | contains
283      real( kind = dp ) :: pot_temp, dudr
284      real( kind = dp ) :: sigma6
285      real( kind = dp ) :: epsilon
286 <    real( kind = dp ) :: r6
287 <    real( kind = dp ) :: t6
288 <    real( kind = dp ) :: t12
286 >    real( kind = dp ) :: r6, rc6
287 >    real( kind = dp ) :: t6, tp6
288 >    real( kind = dp ) :: t12, tp12
289      real( kind = dp ) :: delta
290 <    integer :: id1, id2
290 >    logical :: isSoftCore, shiftedPot
291 >    integer :: id1, id2, localError
292  
293 +    if (.not.haveMixingMap) then
294 +       call createMixingMap()
295 +    endif
296 +
297      ! Look up the correct parameters in the mixing matrix
298   #ifdef IS_MPI
299 <    sigma6   = ljMixed(atid_Row(atom1),atid_Col(atom2))%sigma6
300 <    epsilon  = ljMixed(atid_Row(atom1),atid_Col(atom2))%epsilon
286 <    delta    = ljMixed(atid_Row(atom1),atid_Col(atom2))%delta
299 >    atid1 = atid_Row(atom1)
300 >    atid2 = atid_Col(atom2)
301   #else
302 <    sigma6   = ljMixed(atid(atom1),atid(atom2))%sigma6
303 <    epsilon  = ljMixed(atid(atom1),atid(atom2))%epsilon
290 <    delta    = ljMixed(atid(atom1),atid(atom2))%delta
302 >    atid1 = atid(atom1)
303 >    atid2 = atid(atom2)
304   #endif
305  
306 +    ljt1 = LJMap%atidToLJtype(atid1)
307 +    ljt2 = LJMap%atidToLJtype(atid2)
308 +
309 +    sigma6     = MixingMap(ljt1,ljt2)%sigma6
310 +    epsilon    = MixingMap(ljt1,ljt2)%epsilon
311 +    delta      = MixingMap(ljt1,ljt2)%delta
312 +    isSoftCore = MixingMap(ljt1,ljt2)%isSoftCore
313 +    shiftedPot = MixingMap(ljt1,ljt2)%shiftedPot
314 +
315      r6 = r2 * r2 * r2
316 <    
316 >
317      t6  = sigma6/ r6
318      t12 = t6 * t6    
297  
298    pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
299    if (LJ_do_shift) then
300       pot_temp = pot_temp + delta
301    endif
319  
320 <    vpair = vpair + pot_temp
320 >    if (isSoftCore) then
321        
322 <    dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
322 >       pot_temp = 4.0E0_DP * epsilon * t6
323 >       if (shiftedPot) then
324 >          rc6 = rcut**6
325 >          tp6 = sigma6 / rc6
326 >          delta =-4.0_DP*epsilon*(tp6)
327 >          pot_temp = pot_temp + delta
328 >       endif
329        
330 +       vpair = vpair + pot_temp
331 +      
332 +       dudr = -sw * 24.0E0_DP * epsilon * t6 / rij
333 +      
334 +    else
335 +       pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
336 +       if (shiftedPot) then
337 +          rc6 = rcut**6
338 +          tp6 = sigma6 / rc6
339 +          tp12 = tp6*tp6
340 +          delta =-4.0_DP*epsilon*(tp12 - tp6)
341 +          pot_temp = pot_temp + delta
342 +       endif
343 +      
344 +       vpair = vpair + pot_temp
345 +      
346 +       dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
347 +    endif
348 +
349      drdx = d(1) / rij
350      drdy = d(2) / rij
351      drdz = d(3) / rij
352 <      
352 >
353      fx = dudr * drdx
354      fy = dudr * drdy
355      fz = dudr * drdz
356 <    
315 <      
356 >
357   #ifdef IS_MPI
358      if (do_pot) then
359 <       pot_Row(atom1) = pot_Row(atom1) + sw*pot_temp*0.5
360 <       pot_Col(atom2) = pot_Col(atom2) + sw*pot_temp*0.5
359 >       pot_Row(VDW_POT,atom1) = pot_Row(VDW_POT,atom1) + sw*pot_temp*0.5
360 >       pot_Col(VDW_POT,atom2) = pot_Col(VDW_POT,atom2) + sw*pot_temp*0.5
361      endif
362 <    
362 >
363      f_Row(1,atom1) = f_Row(1,atom1) + fx
364      f_Row(2,atom1) = f_Row(2,atom1) + fy
365      f_Row(3,atom1) = f_Row(3,atom1) + fz
366 <    
366 >
367      f_Col(1,atom2) = f_Col(1,atom2) - fx
368      f_Col(2,atom2) = f_Col(2,atom2) - fy
369      f_Col(3,atom2) = f_Col(3,atom2) - fz      
370 <    
370 >
371   #else
372      if (do_pot) pot = pot + sw*pot_temp
373  
374      f(1,atom1) = f(1,atom1) + fx
375      f(2,atom1) = f(2,atom1) + fy
376      f(3,atom1) = f(3,atom1) + fz
377 <    
377 >
378      f(1,atom2) = f(1,atom2) - fx
379      f(2,atom2) = f(2,atom2) - fy
380      f(3,atom2) = f(3,atom2) - fz
381   #endif
382 <        
382 >
383   #ifdef IS_MPI
384      id1 = AtomRowToGlobal(atom1)
385      id2 = AtomColToGlobal(atom2)
# Line 348 | Line 389 | contains
389   #endif
390  
391      if (molMembershipList(id1) .ne. molMembershipList(id2)) then
392 <      
392 >
393         fpair(1) = fpair(1) + fx
394         fpair(2) = fpair(2) + fy
395         fpair(3) = fpair(3) + fz
# Line 356 | Line 397 | contains
397      endif
398  
399      return    
400 <    
400 >
401    end subroutine do_lj_pair
361  
362  
363  !! Calculates the mixing for sigma or epslon
364  
365  function calcLJMix(thisParam,param1,param2,status) result(myMixParam)
366    character(len=*) :: thisParam
367    real(kind = dp)  :: param1
368    real(kind = dp)  :: param2
369    real(kind = dp ) :: myMixParam
402  
403 <    integer, optional :: status  
403 >  subroutine destroyLJTypes()
404  
405 <    myMixParam = 0.0_dp
405 >    LJMap%nLJtypes = 0
406 >    LJMap%currentLJtype = 0
407      
408 <    if (present(status)) status = 0
409 <    select case (LJ_Mixing_Policy)
410 <    case (1)
411 <       select case (thisParam)
412 <       case ("sigma")
413 <          myMixParam = 0.5_dp * (param1 + param2)
414 <       case ("epsilon")
415 <          myMixParam = sqrt(param1 * param2)
416 <       case default
417 <          status = -1
418 <       end select
419 <    case default
387 <       status = -1
388 <    end select
389 <  end function calcLJMix
390 <  
391 < end module lj
408 >    if (associated(LJMap%LJtypes)) then
409 >       deallocate(LJMap%LJtypes)
410 >       LJMap%LJtypes => null()
411 >    end if
412 >    
413 >    if (associated(LJMap%atidToLJtype)) then
414 >       deallocate(LJMap%atidToLJtype)
415 >       LJMap%atidToLJtype => null()
416 >    end if
417 >    
418 >    haveMixingMap = .false.
419 >  end subroutine destroyLJTypes
420  
421 < subroutine newLJtype(ident,lj_sigma,lj_epsilon,status)
394 <    use lj, ONLY : module_newLJtype => newLJtype
395 <    integer, parameter :: DP = selected_real_kind(15)
396 <    integer,intent(inout) :: ident
397 <    real(kind=dp),intent(inout) :: lj_sigma
398 <    real(kind=dp),intent(inout) :: lj_epsilon
399 <    integer,intent(inout) :: status
400 <
401 <    call module_newLJtype(ident,lj_sigma,lj_epsilon,status)
402 <
403 < end subroutine newLJtype
404 <
421 > end module lj

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines