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 2355 by chuckv, Wed Oct 12 18:59:16 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.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
9  use switcheroo
51    use vector_class
52    use simulation
53 +  use status
54   #ifdef IS_MPI
55    use mpiSimulation
56   #endif
# 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 < #define __FORTRAN90
67 < #include "UseTheForce/fForceField.h"
66 >  logical, save :: useGeometricDistanceMixing = .false.
67 >  logical, save :: haveMixingMap = .false.
68  
69 <  integer, save :: LJ_Mixing_Policy
70 <  real(kind=DP), save :: LJ_rcut
71 <  logical, save :: havePolicy = .false.
72 <  logical, save :: haveCut = .false.
73 <  logical, save :: LJ_do_shift = .false.
74 <  
75 <  !! Logical has lj force field module been initialized?
76 <  
77 <  logical, save :: LJ_FF_initialized = .false.
78 <  
79 <  !! Public methods and data
80 <  public :: init_LJ_FF
81 <  public :: setCutoffLJ
82 <  public :: do_lj_pair
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       :: 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) :: rCut
95 >     real(kind=dp) :: delta
96 >     logical       :: rCutWasSet = .false.
97 >     logical       :: shiftedPot
98 >     logical       :: isSoftCore = .false.
99 >  end type MixParameters
100 >
101 >  type(MixParameters), dimension(:,:), allocatable :: MixingMap
102 >
103    public :: newLJtype
104 <  
105 <  !! structure for lj type parameters
106 <  type, private :: ljType
107 <    integer :: lj_ident
108 <    real(kind=dp) :: lj_sigma
109 <    real(kind=dp) :: lj_epsilon
110 <  end type ljType
111 <  
112 <  !! 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 <  
104 >  public :: setLJDefaultCutoff
105 >  public :: setLJUniformCutoff
106 >  public :: setLJCutoffByTypes
107 >  public :: getSigma
108 >  public :: getEpsilon
109 >  public :: useGeometricMixing
110 >  public :: do_lj_pair
111 >  public :: destroyLJtypes
112 >
113   contains
114  
115 <  subroutine newLJtype(ident,lj_sigma,lj_epsilon,status)
116 <    integer,intent(in) :: ident
117 <    real(kind=dp),intent(in) :: lj_sigma
118 <    real(kind=dp),intent(in) :: lj_epsilon
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) :: isSoftCore
120      integer,intent(out) :: status
121 <    
122 <    integer,pointer                        :: Matchlist(:) => null()
121 >    integer :: nLJTypes, ntypes, myATID
122 >    integer, pointer :: MatchList(:) => null()
123      integer :: current
124 <    integer :: nAtypes
124 >
125      status = 0
126 <    
127 <        !! Assume that atypes has already been set and get the total number of types in atypes
90 <  
91 <  
126 >    ! check to see if this is the first time into this routine...
127 >    if (.not.associated(LJMap%LJtypes)) then
128  
129 <    ! check to see if this is the first time into
130 <    if (.not.associated(ljParameterList%ljParams)) then
131 <       call getMatchingElementList(atypes, "is_lj", .true., nAtypes, MatchList)
132 <       ljParameterList%n_lj_types = nAtypes
133 <       if (nAtypes == 0) then
134 <         status = -1
135 <         return
136 <       end if
137 <       allocate(ljParameterList%ljParams(nAtypes))
129 >       call getMatchingElementList(atypes, "is_LennardJones", .true., &
130 >            nLJTypes, MatchList)
131 >      
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 <    ljParameterList%currentAddition = ljParameterList%currentAddition + 1
142 <    current = ljParameterList%currentAddition
143 <    
144 <    ! set the values for ljParameterList
145 <    ljParameterList%ljParams(current)%lj_ident = ident
146 <    ljParameterList%ljParams(current)%lj_epsilon = lj_epsilon
147 <    ljParameterList%ljParams(current)%lj_sigma = lj_sigma
148 <    
149 <  end subroutine newLJtype
150 <  
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
141 >    LJMap%currentLJtype = LJMap%currentLJtype + 1
142 >    current = LJMap%currentLJtype
143 >
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 <       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
152 >       LJMap%LJtypes(current)%isSoftCore = .false.
153      endif
154 +  end subroutine newLJtype
155  
156 <    havePolicy = .true.
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 <    if (haveCut) then
169 <       status = 0
170 <       call createMixingList(myStatus)
171 <       if (myStatus /= 0) then
172 <          status = -1
173 <          return
174 <       end if
175 <      
141 <       LJ_FF_initialized = .true.
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
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
177  
178 < #define __FORTRAN90
179 < #include "UseTheForce/fSwitchingFunction.h"
178 >    nLJtypes = LJMap%nLJtypes
179 >    if (.not. allocated(MixingMap)) then
180 >       allocate(MixingMap(nLJtypes, nLJtypes))
181 >    endif
182  
183 <    status = 0
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 <    LJ_rcut = rcut
194 <    LJ_do_shift = do_shift
195 <    call set_switch(LJ_SWITCH, rcut, rcut)
196 <    haveCut = .true.
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 (havePolicy) then
200 <       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
199 >    if (LJMap%currentLJtype == 0) then
200 >       call handleError("LJ", "No members in LJMap")
201         return
202      end if
203 <        
204 <    if (.not. associated(ljMixed)) then
205 <       allocate(ljMixed(nAtypes, nAtypes))
203 >
204 >    nLJtypes = LJMap%nLJtypes
205 >    if (.not. allocated(MixingMap)) then
206 >       allocate(MixingMap(nLJtypes, nLJtypes))
207      endif
208  
209 <    rcut6 = LJ_rcut**6
209 >    ljt1 = LJMap%atidToLJtype(atid1)
210 >    ljt2 = LJMap%atidToLJtype(atid2)
211  
212 < ! This loops through all atypes, even those that don't support LJ forces.
213 <    do i = 1, nAtypes
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 <          myEpsilon_i = ljParameterList%ljParams(i)%lj_epsilon
220 <          mySigma_i = ljParameterList%ljParams(i)%lj_sigma
219 >    call createMixingMap()
220 >  end subroutine setLJCutoffByTypes
221 >
222 >  function getSigma(atid) result (s)
223 >    integer, intent(in) :: atid
224 >    integer :: ljt1
225 >    real(kind=dp) :: s
226 >
227 >    if (LJMap%currentLJtype == 0) then
228 >       call handleError("LJ", "No members in LJMap")
229 >       return
230 >    end if
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 :: ljt1
240 >    real(kind=dp) :: e
241 >
242 >    if (LJMap%currentLJtype == 0) then
243 >       call handleError("LJ", "No members in LJMap")
244 >       return
245 >    end if
246 >
247 >    ljt1 = LJMap%atidToLJtype(atid)
248 >    e = LJMap%LJtypes(ljt1)%epsilon
249 >
250 >  end function getEpsilon
251 >
252 >  subroutine useGeometricMixing()
253 >    useGeometricDistanceMixing = .true.
254 >    haveMixingMap = .false.
255 >    return
256 >  end subroutine useGeometricMixing
257 >
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 (LJMap%currentLJtype == 0) then
265 >       call handleError("LJ", "No members in LJMap")
266 >       return
267 >    end if
268 >
269 >    nLJtypes = LJMap%nLJtypes
270 >
271 >    if (.not. allocated(MixingMap)) then
272 >       allocate(MixingMap(nLJtypes, nLJtypes))
273 >    endif
274 >
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 <          ljMixed(i,i)%sigma   = mySigma_i
283 >          s2 = LJMap%LJtypes(j)%sigma
284 >          e2 = LJMap%LJtypes(j)%epsilon
285 >          isSoftCore2 = LJMap%LJtypes(j)%isSoftCore
286            
287 <          ljMixed(i,i)%sigma6  = (ljMixed(i,i)%sigma) ** 6
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 <          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
296 >          MixingMap(i,j)%epsilon = dsqrt(e1 * e2)
297  
298 <                myEpsilon_j = ljParameterList%ljParams(j)%lj_epsilon
223 <                mySigma_j = ljParameterList%ljParams(j)%lj_sigma
298 >          MixingMap(i,j)%sigma6 = (MixingMap(i,j)%sigma)**6
299  
300 <                          
301 <                ljMixed(i,j)%sigma  =  &
302 <                     calcLJMix("sigma",mySigma_i, &
303 <                     mySigma_j)
304 <                
305 <                ljMixed(i,j)%sigma6 = &
306 <                     (ljMixed(i,j)%sigma)**6
307 <                
308 <                
309 <                ljMixed(i,j)%tp6     = ljMixed(i,j)%sigma6/rcut6
235 <                
236 <                ljMixed(i,j)%tp12    = (ljMixed(i,j)%tp6) ** 2
237 <                
238 <                
239 <                ljMixed(i,j)%epsilon = &
240 <                     calcLJMix("epsilon",myEpsilon_i, &
241 <                     myEpsilon_j)
242 <                
243 <                ljMixed(i,j)%delta = -4.0_DP * ljMixed(i,j)%epsilon * &
244 <                     (ljMixed(i,j)%tp12 - ljMixed(i,j)%tp6)
245 <                
246 <                
247 <                ljMixed(j,i)%sigma   = ljMixed(i,j)%sigma
248 <                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
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 >          endif
310            
311 <          end do
312 <    end do
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 <  end subroutine createMixingList
330 >    haveMixingMap = .true.
331 >    
332 >  end subroutine createMixingMap
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 277 | Line 353 | contains
353      real( kind = dp ) :: t6
354      real( kind = dp ) :: t12
355      real( kind = dp ) :: delta
356 <    integer :: id1, id2
356 >    logical :: isSoftCore, shiftedPot
357 >    integer :: id1, id2, localError
358  
359 +    if (.not.haveMixingMap) then
360 +       call createMixingMap()
361 +    endif
362 +
363      ! Look up the correct parameters in the mixing matrix
364   #ifdef IS_MPI
365 <    sigma6   = ljMixed(atid_Row(atom1),atid_Col(atom2))%sigma6
366 <    epsilon  = ljMixed(atid_Row(atom1),atid_Col(atom2))%epsilon
286 <    delta    = ljMixed(atid_Row(atom1),atid_Col(atom2))%delta
365 >    atid1 = atid_Row(atom1)
366 >    atid2 = atid_Col(atom2)
367   #else
368 <    sigma6   = ljMixed(atid(atom1),atid(atom2))%sigma6
369 <    epsilon  = ljMixed(atid(atom1),atid(atom2))%epsilon
290 <    delta    = ljMixed(atid(atom1),atid(atom2))%delta
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    
297  
298    pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
299    if (LJ_do_shift) then
300       pot_temp = pot_temp + delta
301    endif
385  
386 <    vpair = vpair + pot_temp
386 >    if (isSoftCore) then
387        
388 <    dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
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 (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 <    
315 <      
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 348 | 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 356 | Line 456 | contains
456      endif
457  
458      return    
459 <    
459 >
460    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
461  
462 <    integer, optional :: status  
462 >  subroutine destroyLJTypes()
463  
464 <    myMixParam = 0.0_dp
464 >    LJMap%nLJtypes = 0
465 >    LJMap%currentLJtype = 0
466      
467 <    if (present(status)) status = 0
468 <    select case (LJ_Mixing_Policy)
469 <    case (1)
470 <       select case (thisParam)
471 <       case ("sigma")
472 <          myMixParam = 0.5_dp * (param1 + param2)
473 <       case ("epsilon")
474 <          myMixParam = sqrt(param1 * param2)
475 <       case default
476 <          status = -1
477 <       end select
478 <    case default
387 <       status = -1
388 <    end select
389 <  end function calcLJMix
390 <  
391 < end module lj
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  
480 < 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 <
480 > end module lj

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines