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 1628 by gezelter, Thu Oct 21 20:15:31 2004 UTC vs.
Revision 2727 by chrisfen, Fri Apr 21 19:32:07 2006 UTC

# Line 1 | Line 1
1 + !!
2 + !! Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 + !!
4 + !! The University of Notre Dame grants you ("Licensee") a
5 + !! non-exclusive, royalty free, license to use, modify and
6 + !! redistribute this software in source and binary code form, provided
7 + !! that the following conditions are met:
8 + !!
9 + !! 1. Acknowledgement of the program authors must be made in any
10 + !!    publication of scientific results based in part on use of the
11 + !!    program.  An acceptable form of acknowledgement is citation of
12 + !!    the article in which the program was described (Matthew
13 + !!    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 + !!    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 + !!    Parallel Simulation Engine for Molecular Dynamics,"
16 + !!    J. Comput. Chem. 26, pp. 252-271 (2005))
17 + !!
18 + !! 2. Redistributions of source code must retain the above copyright
19 + !!    notice, this list of conditions and the following disclaimer.
20 + !!
21 + !! 3. Redistributions in binary form must reproduce the above copyright
22 + !!    notice, this list of conditions and the following disclaimer in the
23 + !!    documentation and/or other materials provided with the
24 + !!    distribution.
25 + !!
26 + !! This software is provided "AS IS," without a warranty of any
27 + !! kind. All express or implied conditions, representations and
28 + !! warranties, including any implied warranty of merchantability,
29 + !! fitness for a particular purpose or non-infringement, are hereby
30 + !! excluded.  The University of Notre Dame and its licensors shall not
31 + !! be liable for any damages suffered by licensee as a result of
32 + !! using, modifying or distributing the software or its
33 + !! derivatives. In no event will the University of Notre Dame or its
34 + !! licensors be liable for any lost revenue, profit or data, or for
35 + !! direct, indirect, special, consequential, incidental or punitive
36 + !! damages, however caused and regardless of the theory of liability,
37 + !! arising out of the use of or inability to use software, even if the
38 + !! University of Notre Dame has been advised of the possibility of
39 + !! such damages.
40 + !!
41 +
42 +
43   !! Calculates Long Range forces Lennard-Jones interactions.
44   !! @author Charles F. Vardeman II
45   !! @author Matthew Meineke
46 < !! @version $Id: LJ.F90,v 1.3 2004-10-21 20:15:25 gezelter Exp $, $Date: 2004-10-21 20:15:25 $, $Name: not supported by cvs2svn $, $Revision: 1.3 $
46 > !! @version $Id: LJ.F90,v 1.23 2006-04-21 19:32:07 chrisfen Exp $, $Date: 2006-04-21 19:32:07 $, $Name: not supported by cvs2svn $, $Revision: 1.23 $
47  
48 +
49   module lj
50    use atype_module
8  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 <  type, private :: LjType
68 <     integer :: ident
66 >
67 >  logical, save :: useGeometricDistanceMixing = .false.
68 >  logical, save :: haveMixingMap = .false.
69 >
70 >  real(kind=DP), save :: defaultCutoff = 0.0_DP
71 >  logical, save :: defaultShift = .false.
72 >  logical, save :: haveDefaultCutoff = .false.
73 >
74 >  type, private :: LJtype
75 >     integer       :: atid
76       real(kind=dp) :: sigma
77       real(kind=dp) :: epsilon
78 <  end type LjType
79 <  
80 <  type(LjType), dimension(:), allocatable :: ParameterMap
81 <  
82 <  logical, save :: haveMixingMap = .false.
83 <  
78 >     logical       :: isSoftCore = .false.
79 >  end type LJtype
80 >
81 >  type, private :: LJList
82 >     integer               :: Nljtypes = 0
83 >     integer               :: currentLJtype = 0
84 >     type(LJtype), pointer :: LJtypes(:)      => null()
85 >     integer, pointer      :: atidToLJtype(:) => null()
86 >  end type LJList
87 >
88 >  type(LJList), save :: LJMap
89 >
90    type :: MixParameters
91       real(kind=DP) :: sigma
92       real(kind=DP) :: epsilon
93 <     real(kind=dp)  :: sigma6
94 <     real(kind=dp)  :: tp6
95 <     real(kind=dp)  :: tp12
96 <     real(kind=dp)  :: delta
93 >     real(kind=dp) :: sigmai
94 >     real(kind=dp) :: rCut
95 >     logical       :: rCutWasSet = .false.
96 >     logical       :: shiftedPot
97 >     logical       :: isSoftCore = .false.
98    end type MixParameters
99 <  
99 >
100    type(MixParameters), dimension(:,:), allocatable :: MixingMap
101 <  
102 <  real(kind=DP), save :: LJ_rcut
103 <  logical, save :: have_rcut = .false.
104 <  logical, save :: LJ_do_shift = .false.
105 <  logical, save :: useGeometricDistanceMixing = .false.
47 <  
48 <  !! Public methods and data
49 <  
50 <  public :: setCutoffLJ
51 <  public :: useGeometricMixing
101 >
102 >  public :: newLJtype
103 >  public :: setLJDefaultCutoff
104 >  public :: getSigma
105 >  public :: getEpsilon
106    public :: do_lj_pair
107 <  public :: newLJtype  
108 <  
107 >  public :: destroyLJtypes
108 >
109   contains
110  
111 <  subroutine newLJtype(ident, sigma, epsilon, status)
112 <    integer,intent(in) :: ident
111 >  subroutine newLJtype(c_ident, sigma, epsilon, isSoftCore, status)
112 >    integer,intent(in) :: c_ident
113      real(kind=dp),intent(in) :: sigma
114      real(kind=dp),intent(in) :: epsilon
115 +    integer, intent(in) :: isSoftCore
116      integer,intent(out) :: status
117 <    integer :: nAtypes
117 >    integer :: nLJTypes, ntypes, myATID
118 >    integer, pointer :: MatchList(:) => null()
119 >    integer :: current
120  
121      status = 0
122 <    
123 <    !! Be simple-minded and assume that we need a ParameterMap that
67 <    !! is the same size as the total number of atom types
122 >    ! check to see if this is the first time into this routine...
123 >    if (.not.associated(LJMap%LJtypes)) then
124  
125 <    if (.not.allocated(ParameterMap)) then
125 >       call getMatchingElementList(atypes, "is_LennardJones", .true., &
126 >            nLJTypes, MatchList)
127        
128 <       nAtypes = getSize(atypes)
129 <    
130 <       if (nAtypes == 0) then
131 <          status = -1
132 <          return
133 <       end if
134 <      
78 <       if (.not. allocated(ParameterMap)) then
79 <          allocate(ParameterMap(nAtypes))
80 <       endif
81 <      
128 >       LJMap%nLJtypes =  nLJTypes
129 >
130 >       allocate(LJMap%LJtypes(nLJTypes))
131 >
132 >       ntypes = getSize(atypes)
133 >
134 >       allocate(LJMap%atidToLJtype(ntypes))
135      end if
136  
137 <    if (ident .gt. size(ParameterMap)) then
138 <       status = -1
86 <       return
87 <    endif
88 <    
89 <    ! set the values for ParameterMap for this atom type:
137 >    LJMap%currentLJtype = LJMap%currentLJtype + 1
138 >    current = LJMap%currentLJtype
139  
140 <    ParameterMap(ident)%ident = ident
141 <    ParameterMap(ident)%epsilon = epsilon
142 <    ParameterMap(ident)%sigma = sigma
143 <    
140 >    myATID = getFirstMatchingElement(atypes, "c_ident", c_ident)
141 >    LJMap%atidToLJtype(myATID)        = current
142 >    LJMap%LJtypes(current)%atid       = myATID
143 >    LJMap%LJtypes(current)%sigma      = sigma
144 >    LJMap%LJtypes(current)%epsilon    = epsilon
145 >    if (isSoftCore .eq. 1) then
146 >       LJMap%LJtypes(current)%isSoftCore = .true.
147 >    else
148 >       LJMap%LJtypes(current)%isSoftCore = .false.
149 >    endif
150    end subroutine newLJtype
96    
97  subroutine setCutoffLJ(rcut, do_shift, status)
98    logical, intent(in):: do_shift
99    integer :: status, myStatus
100    real(kind=dp) :: rcut
151  
152 < #define __FORTRAN90
153 < #include "UseTheForce/fSwitchingFunction.h"
152 >  subroutine setLJDefaultCutoff(thisRcut, shiftedPot)
153 >    real(kind=dp), intent(in) :: thisRcut
154 >    logical, intent(in) :: shiftedPot
155 >    defaultCutoff = thisRcut
156 >    defaultShift = shiftedPot
157 >    haveDefaultCutoff = .true.
158 >    !we only want to build LJ Mixing map if LJ is being used.
159 >    if(LJMap%nLJTypes /= 0) then
160 >       call createMixingMap()
161 >    end if
162  
163 <    status = 0
163 >  end subroutine setLJDefaultCutoff
164  
165 <    LJ_rcut = rcut
166 <    LJ_do_shift = do_shift
167 <    call set_switch(LJ_SWITCH, rcut, rcut)
168 <    have_rcut = .true.
111 <    
112 <    return
113 <  end subroutine setCutoffLJ
165 >  function getSigma(atid) result (s)
166 >    integer, intent(in) :: atid
167 >    integer :: ljt1
168 >    real(kind=dp) :: s
169  
170 <  subroutine useGeometricMixing()
171 <    useGeometricDistanceMixing = .true.
117 <    haveMixingMap = .false.
118 <    return
119 <  end subroutine useGeometricMixing
120 <  
121 <  subroutine createMixingMap(status)
122 <    integer :: nAtypes
123 <    integer :: status
124 <    integer :: i
125 <    integer :: j
126 <    real ( kind = dp ) :: Sigma_i, Sigma_j
127 <    real ( kind = dp ) :: Epsilon_i, Epsilon_j
128 <    real ( kind = dp ) :: rcut6
129 <
130 <    status = 0
131 <    
132 <    nAtypes = size(ParameterMap)
133 <    
134 <    if (nAtypes == 0) then
135 <       status = -1
170 >    if (LJMap%currentLJtype == 0) then
171 >       call handleError("LJ", "No members in LJMap")
172         return
173      end if
174  
175 <    if (.not.have_rcut) then
176 <       status = -1
175 >    ljt1 = LJMap%atidToLJtype(atid)
176 >    s = LJMap%LJtypes(ljt1)%sigma
177 >
178 >  end function getSigma
179 >
180 >  function getEpsilon(atid) result (e)
181 >    integer, intent(in) :: atid
182 >    integer :: ljt1
183 >    real(kind=dp) :: e
184 >
185 >    if (LJMap%currentLJtype == 0) then
186 >       call handleError("LJ", "No members in LJMap")
187         return
188 <    endif
189 <    
190 <    if (.not. allocated(MixingMap)) then
191 <       allocate(MixingMap(nAtypes, nAtypes))
192 <    endif
193 <    
194 <    rcut6 = LJ_rcut**6
195 <    
196 <    ! This loops through all atypes, even those that don't support LJ forces.
197 <    do i = 1, nAtypes
198 <      
199 <       Epsilon_i = ParameterMap(i)%epsilon
200 <       Sigma_i = ParameterMap(i)%sigma
201 <      
202 <       ! do self mixing rule
203 <       MixingMap(i,i)%sigma   = Sigma_i          
204 <       MixingMap(i,i)%sigma6  = Sigma_i ** 6          
205 <       MixingMap(i,i)%tp6     = (MixingMap(i,i)%sigma6)/rcut6          
206 <       MixingMap(i,i)%tp12    = (MixingMap(i,i)%tp6) ** 2
207 <       MixingMap(i,i)%epsilon = Epsilon_i          
208 <       MixingMap(i,i)%delta   = -4.0_DP * MixingMap(i,i)%epsilon * &
209 <            (MixingMap(i,i)%tp12 - MixingMap(i,i)%tp6)
210 <      
211 <       do j = i + 1, nAtypes
212 <          
213 <          Epsilon_j = ParameterMap(j)%epsilon
214 <          Sigma_j = ParameterMap(j)%sigma
188 >    end if
189 >
190 >    ljt1 = LJMap%atidToLJtype(atid)
191 >    e = LJMap%LJtypes(ljt1)%epsilon
192 >
193 >  end function getEpsilon
194 >
195 >  subroutine createMixingMap()
196 >    integer :: nLJtypes, i, j
197 >    real ( kind = dp ) :: s1, s2, e1, e2
198 >    real ( kind = dp ) :: rcut6, tp6, tp12
199 >    logical :: isSoftCore1, isSoftCore2, doShift
200 >
201 >    if (LJMap%currentLJtype == 0) then
202 >       call handleError("LJ", "No members in LJMap")
203 >       return
204 >    end if
205 >
206 >    nLJtypes = LJMap%nLJtypes
207 >
208 >    if (.not. allocated(MixingMap)) then
209 >       allocate(MixingMap(nLJtypes, nLJtypes))
210 >    endif
211 >
212 >    useGeometricDistanceMixing = usesGeometricDistanceMixing()
213 >    do i = 1, nLJtypes
214 >
215 >       s1 = LJMap%LJtypes(i)%sigma
216 >       e1 = LJMap%LJtypes(i)%epsilon
217 >       isSoftCore1 = LJMap%LJtypes(i)%isSoftCore
218 >
219 >       do j = i, nLJtypes
220            
221 +          s2 = LJMap%LJtypes(j)%sigma
222 +          e2 = LJMap%LJtypes(j)%epsilon
223 +          isSoftCore2 = LJMap%LJtypes(j)%isSoftCore
224 +          
225 +          MixingMap(i,j)%isSoftCore = isSoftCore1 .or. isSoftCore2
226 +
227            ! only the distance parameter uses different mixing policies
228            if (useGeometricDistanceMixing) then
229 <             ! only for OPLS as far as we can tell
173 <             MixingMap(i,j)%sigma = dsqrt(Sigma_i * Sigma_j)
229 >             MixingMap(i,j)%sigma = dsqrt(s1 * s2)
230            else
231 <             ! everyone else
176 <             MixingMap(i,j)%sigma = 0.5_dp * (Sigma_i + Sigma_j)
231 >             MixingMap(i,j)%sigma = 0.5_dp * (s1 + s2)
232            endif
233            
234 <          ! energy parameter is always geometric mean:
235 <          MixingMap(i,j)%epsilon = dsqrt(Epsilon_i * Epsilon_j)
236 <                    
237 <          MixingMap(i,j)%sigma6 = (MixingMap(i,j)%sigma)**6
238 <          MixingMap(i,j)%tp6    = MixingMap(i,j)%sigma6/rcut6
239 <          MixingMap(i,j)%tp12    = (MixingMap(i,j)%tp6) ** 2
240 <          
241 <          MixingMap(i,j)%delta = -4.0_DP * MixingMap(i,j)%epsilon * &
242 <               (MixingMap(i,j)%tp12 - MixingMap(i,j)%tp6)
243 <          
244 <          MixingMap(j,i)%sigma   = MixingMap(i,j)%sigma
245 <          MixingMap(j,i)%sigma6  = MixingMap(i,j)%sigma6
246 <          MixingMap(j,i)%tp6     = MixingMap(i,j)%tp6
247 <          MixingMap(j,i)%tp12    = MixingMap(i,j)%tp12
248 <          MixingMap(j,i)%epsilon = MixingMap(i,j)%epsilon
249 <          MixingMap(j,i)%delta   = MixingMap(i,j)%delta
250 <          
251 <       end do
252 <    end do
234 >          MixingMap(i,j)%epsilon = dsqrt(e1 * e2)
235 >
236 >          MixingMap(i,j)%sigmai = 1.0_DP  / (MixingMap(i,j)%sigma)
237 >
238 >          if (haveDefaultCutoff) then
239 >             MixingMap(i,j)%shiftedPot = defaultShift
240 >          else
241 >             MixingMap(i,j)%shiftedPot = defaultShift
242 >          endif          
243 >
244 >          if (i.ne.j) then
245 >             MixingMap(j,i)%sigma      = MixingMap(i,j)%sigma
246 >             MixingMap(j,i)%epsilon    = MixingMap(i,j)%epsilon
247 >             MixingMap(j,i)%sigmai     = MixingMap(i,j)%sigmai
248 >             MixingMap(j,i)%rCut       = MixingMap(i,j)%rCut
249 >             MixingMap(j,i)%rCutWasSet = MixingMap(i,j)%rCutWasSet
250 >             MixingMap(j,i)%shiftedPot = MixingMap(i,j)%shiftedPot
251 >             MixingMap(j,i)%isSoftCore = MixingMap(i,j)%isSoftCore
252 >          endif
253 >
254 >       enddo
255 >    enddo
256      
257 +    haveMixingMap = .true.
258 +    
259    end subroutine createMixingMap
260 <        
261 <  subroutine do_lj_pair(atom1, atom2, d, rij, r2, sw, vpair, fpair, &
260 >          
261 >  subroutine do_lj_pair(atom1, atom2, d, rij, r2, rcut, sw, vpair, fpair, &
262         pot, f, do_pot)
263 <
263 >    
264      integer, intent(in) ::  atom1, atom2
265 <    real( kind = dp ), intent(in) :: rij, r2
265 >    integer :: atid1, atid2, ljt1, ljt2
266 >    real( kind = dp ), intent(in) :: rij, r2, rcut
267      real( kind = dp ) :: pot, sw, vpair
268      real( kind = dp ), dimension(3,nLocal) :: f    
269      real( kind = dp ), intent(in), dimension(3) :: d
# Line 212 | Line 273 | contains
273      ! local Variables
274      real( kind = dp ) :: drdx, drdy, drdz
275      real( kind = dp ) :: fx, fy, fz
276 +    real( kind = dp ) :: myPot, myPotC, myDeriv, myDerivC, ros, rcos
277      real( kind = dp ) :: pot_temp, dudr
278 <    real( kind = dp ) :: sigma6
278 >    real( kind = dp ) :: sigmai
279      real( kind = dp ) :: epsilon
280 <    real( kind = dp ) :: r6
219 <    real( kind = dp ) :: t6
220 <    real( kind = dp ) :: t12
221 <    real( kind = dp ) :: delta
280 >    logical :: isSoftCore, shiftedPot
281      integer :: id1, id2, localError
282  
283      if (.not.haveMixingMap) then
284 <       localError = 0
226 <       call createMixingMap(localError)
227 <       if ( localError .ne. 0 ) then
228 <          call handleError("LJ", "MixingMap creation failed!")
229 <          return
230 <       end if
284 >       call createMixingMap()
285      endif
286  
287      ! Look up the correct parameters in the mixing matrix
288   #ifdef IS_MPI
289 <    sigma6   = MixingMap(atid_Row(atom1),atid_Col(atom2))%sigma6
290 <    epsilon  = MixingMap(atid_Row(atom1),atid_Col(atom2))%epsilon
237 <    delta    = MixingMap(atid_Row(atom1),atid_Col(atom2))%delta
289 >    atid1 = atid_Row(atom1)
290 >    atid2 = atid_Col(atom2)
291   #else
292 <    sigma6   = MixingMap(atid(atom1),atid(atom2))%sigma6
293 <    epsilon  = MixingMap(atid(atom1),atid(atom2))%epsilon
241 <    delta    = MixingMap(atid(atom1),atid(atom2))%delta
292 >    atid1 = atid(atom1)
293 >    atid2 = atid(atom2)
294   #endif
295  
296 <    r6 = r2 * r2 * r2
297 <    
298 <    t6  = sigma6/ r6
299 <    t12 = t6 * t6    
300 <  
301 <    pot_temp = 4.0E0_DP * epsilon * (t12 - t6)
302 <    if (LJ_do_shift) then
303 <       pot_temp = pot_temp + delta
296 >    ljt1 = LJMap%atidToLJtype(atid1)
297 >    ljt2 = LJMap%atidToLJtype(atid2)
298 >
299 >    sigmai     = MixingMap(ljt1,ljt2)%sigmai
300 >    epsilon    = MixingMap(ljt1,ljt2)%epsilon
301 >    isSoftCore = MixingMap(ljt1,ljt2)%isSoftCore
302 >    shiftedPot = MixingMap(ljt1,ljt2)%shiftedPot
303 >
304 >    ros = rij * sigmai
305 >    myPotC = 0.0_DP
306 >
307 >    if (isSoftCore) then
308 >
309 >       call getSoftFunc(ros, myPot, myDeriv)
310 >
311 >       if (shiftedPot) then
312 >          rcos = rcut * sigmai
313 >          call getSoftFunc(rcos, myPotC, myDerivC)
314 >       endif
315 >              
316 >    else
317 >
318 >       call getLJfunc(ros, myPot, myDeriv)
319 >
320 >       if (shiftedPot) then
321 >          rcos = rcut * sigmai
322 >          call getLJfunc(rcos, myPotC, myDerivC)
323 >       endif
324 >      
325      endif
326  
327 +    !write(*,*) rij, ros, rcos, myPot, myDeriv, myPotC
328 +
329 +    pot_temp = epsilon * (myPot - myPotC)
330      vpair = vpair + pot_temp
331 <      
332 <    dudr = sw * 24.0E0_DP * epsilon * (t6 - 2.0E0_DP*t12) / rij
257 <      
331 >    dudr = sw * epsilon * myDeriv * sigmai
332 >
333      drdx = d(1) / rij
334      drdy = d(2) / rij
335      drdz = d(3) / rij
336 <      
336 >
337      fx = dudr * drdx
338      fy = dudr * drdy
339      fz = dudr * drdz
340 <    
266 <      
340 >
341   #ifdef IS_MPI
342      if (do_pot) then
343 <       pot_Row(atom1) = pot_Row(atom1) + sw*pot_temp*0.5
344 <       pot_Col(atom2) = pot_Col(atom2) + sw*pot_temp*0.5
343 >       pot_Row(VDW_POT,atom1) = pot_Row(VDW_POT,atom1) + sw*pot_temp*0.5
344 >       pot_Col(VDW_POT,atom2) = pot_Col(VDW_POT,atom2) + sw*pot_temp*0.5
345      endif
346 <    
346 >
347      f_Row(1,atom1) = f_Row(1,atom1) + fx
348      f_Row(2,atom1) = f_Row(2,atom1) + fy
349      f_Row(3,atom1) = f_Row(3,atom1) + fz
350 <    
350 >
351      f_Col(1,atom2) = f_Col(1,atom2) - fx
352      f_Col(2,atom2) = f_Col(2,atom2) - fy
353      f_Col(3,atom2) = f_Col(3,atom2) - fz      
354 <    
354 >
355   #else
356      if (do_pot) pot = pot + sw*pot_temp
357  
358      f(1,atom1) = f(1,atom1) + fx
359      f(2,atom1) = f(2,atom1) + fy
360      f(3,atom1) = f(3,atom1) + fz
361 <    
361 >
362      f(1,atom2) = f(1,atom2) - fx
363      f(2,atom2) = f(2,atom2) - fy
364      f(3,atom2) = f(3,atom2) - fz
365   #endif
366 <        
366 >
367   #ifdef IS_MPI
368      id1 = AtomRowToGlobal(atom1)
369      id2 = AtomColToGlobal(atom2)
# Line 299 | Line 373 | contains
373   #endif
374  
375      if (molMembershipList(id1) .ne. molMembershipList(id2)) then
376 <      
376 >
377         fpair(1) = fpair(1) + fx
378         fpair(2) = fpair(2) + fy
379         fpair(3) = fpair(3) + fz
# Line 307 | Line 381 | contains
381      endif
382  
383      return    
384 <    
384 >
385    end subroutine do_lj_pair
386 <  
387 <  
388 <  !! Calculates the mixing for sigma or epslon
386 >
387 >  subroutine destroyLJTypes()
388 >
389 >    LJMap%nLJtypes = 0
390 >    LJMap%currentLJtype = 0
391      
392 < end module lj
392 >    if (associated(LJMap%LJtypes)) then
393 >       deallocate(LJMap%LJtypes)
394 >       LJMap%LJtypes => null()
395 >    end if
396 >    
397 >    if (associated(LJMap%atidToLJtype)) then
398 >       deallocate(LJMap%atidToLJtype)
399 >       LJMap%atidToLJtype => null()
400 >    end if
401 >    
402 >    haveMixingMap = .false.
403  
404 < subroutine newLJtype(ident, sigma, epsilon, status)
319 <  use lj, ONLY : module_newLJtype => newLJtype
320 <  integer, parameter :: DP = selected_real_kind(15)
321 <  integer,intent(inout) :: ident
322 <  real(kind=dp),intent(inout) :: sigma
323 <  real(kind=dp),intent(inout) :: epsilon
324 <  integer,intent(inout) :: status
325 <  
326 <  call module_newLJtype(ident, sigma, epsilon, status)
327 <  
328 < end subroutine newLJtype
404 >  end subroutine destroyLJTypes
405  
406 < subroutine useGeometricMixing()
407 <  use lj, ONLY: module_useGeometricMixing => useGeometricMixing
408 <  
409 <  call module_useGeometricMixing()
410 <  return
411 < end subroutine useGeometricMixing
406 >  subroutine getLJfunc(r, myPot, myDeriv)
407 >
408 >    real(kind=dp), intent(in) :: r
409 >    real(kind=dp), intent(inout) :: myPot, myDeriv
410 >    real(kind=dp) :: ri, ri2, ri6, ri7, ri12, ri13
411 >    real(kind=dp) :: a, b, c, d, dx
412 >    integer :: j
413 >
414 >    ri = 1.0_DP / r
415 >    ri2 = ri*ri
416 >    ri6 = ri2*ri2*ri2
417 >    ri7 = ri6*ri
418 >    ri12 = ri6*ri6
419 >    ri13 = ri12*ri
420 >    
421 >    myPot = 4.0_DP * (ri12 - ri6)
422 >    myDeriv = 24.0_DP * (ri7 - 2.0_DP * ri13)
423 >    
424 >    return
425 >  end subroutine getLJfunc
426 >
427 >  subroutine getSoftFunc(r, myPot, myDeriv)
428 >    
429 >    real(kind=dp), intent(in) :: r
430 >    real(kind=dp), intent(inout) :: myPot, myDeriv
431 >    real(kind=dp) :: ri, ri2, ri6, ri7
432 >    real(kind=dp) :: a, b, c, d, dx
433 >    integer :: j
434 >    
435 >    ri = 1.0_DP / r    
436 >    ri2 = ri*ri
437 >    ri6 = ri2*ri2*ri2
438 >    ri7 = ri6*ri
439 >    myPot = 4.0_DP * (ri6)
440 >    myDeriv = - 24.0_DP * ri7
441 >    
442 >    return
443 >  end subroutine getSoftFunc
444 >
445 > end module lj

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines