ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/DarkSide/gb.F90
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/gb.F90 (file contents):
Revision 1608 by gezelter, Wed Oct 20 04:02:48 2004 UTC vs.
Revision 2357 by chuckv, Wed Oct 12 20:18:17 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   module gb_pair
44    use force_globals
45    use definitions
# Line 9 | Line 51 | module gb_pair
51    implicit none
52  
53    PRIVATE
54 + #define __FORTRAN90
55 + #include "UseTheForce/DarkSide/fInteractionMap.h"
56  
57    logical, save :: gb_pair_initialized = .false.
58    real(kind=dp), save :: gb_sigma
# Line 21 | Line 65 | module gb_pair
65    public :: check_gb_pair_FF
66    public :: set_gb_pair_params
67    public :: do_gb_pair
68 +  public :: getGayBerneCut
69  
70   contains
71  
# Line 46 | Line 91 | contains
91      return
92    end subroutine set_gb_pair_params
93  
94 +  !! gay berne cutoff should be a parameter in globals, this is a temporary
95 +  !! work around - this should be fixed when gay berne is up and running
96 +  function getGayBerneCut(atomID) result(cutValue)
97 +    integer, intent(in) :: atomID !! nah... we don't need to use this...
98 +    real(kind=dp) :: cutValue
99  
100 +    cutValue = gb_l2b_ratio*gb_sigma*2.5_dp
101 +  end function getGayBerneCut
102 +
103    subroutine do_gb_pair(atom1, atom2, d, r, r2, sw, vpair, fpair, &
104 <       pot, u_l, f, t, do_pot)
104 >       pot, A, f, t, do_pot)
105      
106      integer, intent(in) :: atom1, atom2
107      integer :: id1, id2
# Line 56 | Line 109 | contains
109      real (kind=dp), dimension(3), intent(in) :: d
110      real (kind=dp), dimension(3), intent(inout) :: fpair
111      real (kind=dp) :: pot, sw, vpair
112 <    real (kind=dp), dimension(3,nLocal) :: u_l
112 >    real (kind=dp), dimension(9,nLocal) :: A
113      real (kind=dp), dimension(3,nLocal) :: f
114      real (kind=dp), dimension(3,nLocal) :: t
115      logical, intent(in) :: do_pot
# Line 100 | Line 153 | contains
153      r4 = r2*r2
154  
155   #ifdef IS_MPI
156 <    ul1(1) = u_l_Row(1,atom1)
157 <    ul1(2) = u_l_Row(2,atom1)
158 <    ul1(3) = u_l_Row(3,atom1)
159 <
160 <    ul2(1) = u_l_Col(1,atom2)
161 <    ul2(2) = u_l_Col(2,atom2)
162 <    ul2(3) = u_l_Col(3,atom2)
156 >    ul1(1) = A_Row(3,atom1)
157 >    ul1(2) = A_Row(6,atom1)
158 >    ul1(3) = A_Row(9,atom1)
159 >
160 >    ul2(1) = A_Col(3,atom2)
161 >    ul2(2) = A_Col(6,atom2)
162 >    ul2(3) = A_Col(9,atom2)
163   #else
164 <    ul1(1) = u_l(1,atom1)
165 <    ul1(2) = u_l(2,atom1)
166 <    ul1(3) = u_l(3,atom1)
164 >    ul1(1) = A(3,atom1)
165 >    ul1(2) = A(6,atom1)
166 >    ul1(3) = A(9,atom1)
167  
168 <    ul2(1) = u_l(1,atom2)
169 <    ul2(2) = u_l(2,atom2)
170 <    ul2(3) = u_l(3,atom2)
168 >    ul2(1) = A(3,atom2)
169 >    ul2(2) = A(6,atom2)
170 >    ul2(3) = A(9,atom2)
171   #endif
172      
173      dru1dx = ul1(1)
# Line 178 | Line 231 | contains
231      dgdy = term1y + line3y
232      dgdz = term1z + line3z
233  
234 <    term1u1x = 2.0d0*(line1a+line2a)*d(1)
235 <    term1u1y = 2.0d0*(line1a+line2a)*d(2)
236 <    term1u1z = 2.0d0*(line1a+line2a)*d(3)
237 <    term1u2x = 2.0d0*(line1a-line2a)*d(1)
238 <    term1u2y = 2.0d0*(line1a-line2a)*d(2)
239 <    term1u2z = 2.0d0*(line1a-line2a)*d(3)
234 >    term1u1x = (line1a+line2a)*dru1dx
235 >    term1u1y = (line1a+line2a)*dru1dy
236 >    term1u1z = (line1a+line2a)*dru1dz
237 >    term1u2x = (line1a-line2a)*dru2dx
238 >    term1u2y = (line1a-line2a)*dru2dy
239 >    term1u2z = (line1a-line2a)*dru2dz
240      
241      term2a = -line3a/opXdot
242      term2b =  line3b/omXdot
# Line 219 | Line 272 | contains
272      dBigRdx = drdx/gb_sigma + dgdx*gfact
273      dBigRdy = drdy/gb_sigma + dgdy*gfact
274      dBigRdz = drdz/gb_sigma + dgdz*gfact
275 +
276      dBigRdu1x = dgdu1x*gfact
277      dBigRdu1y = dgdu1y*gfact
278      dBigRdu1z = dgdu1z*gfact
279      dBigRdu2x = dgdu2x*gfact
280      dBigRdu2y = dgdu2y*gfact
281      dBigRdu2z = dgdu2z*gfact
282 <  
282 >
283      ! Now, we must do it again for g(ChiPrime) and dgpdx
284  
285      line1a = dotsum/opXpdot
# Line 244 | Line 298 | contains
298      dgpdy = term1y + line3y
299      dgpdz = term1z + line3z
300      
301 <    term1u1x = 2.0d0*(line1a+line2a)*d(1)
302 <    term1u1y = 2.0d0*(line1a+line2a)*d(2)
303 <    term1u1z = 2.0d0*(line1a+line2a)*d(3)
304 <    term1u2x = 2.0d0*(line1a-line2a)*d(1)
305 <    term1u2y = 2.0d0*(line1a-line2a)*d(2)
306 <    term1u2z = 2.0d0*(line1a-line2a)*d(3)
307 <    
301 >    term1u1x = (line1a+line2a)*dru1dx
302 >    term1u1y = (line1a+line2a)*dru1dy
303 >    term1u1z = (line1a+line2a)*dru1dz
304 >    term1u2x = (line1a-line2a)*dru2dx
305 >    term1u2y = (line1a-line2a)*dru2dy
306 >    term1u2z = (line1a-line2a)*dru2dz
307 >
308      term2a = -line3a/opXpdot
309      term2b =  line3b/omXpdot
310      
# Line 274 | Line 328 | contains
328      gmu = gp**gb_mu
329      gpi = 1.0d0 / gp
330      gmum = gmu*gpi
331 <  
278 <    ! write(*,*) atom1, atom2, Chi, u1dotu2
331 >
332      curlyE = 1.0d0/dsqrt(1.0d0 - Chi*Chi*u1dotu2*u1dotu2)
333  
334      dcE = (curlyE**3)*Chi*Chi*u1dotu2
# Line 355 | Line 408 | contains
408              
409      if (do_pot) then
410   #ifdef IS_MPI
411 <       pot_row(atom1) = pot_row(atom1) + 2.0d0*eps*R126*sw
412 <       pot_col(atom2) = pot_col(atom2) + 2.0d0*eps*R126*sw
411 >       pot_row(GAYBERNE_POT,atom1) = pot_row(GAYBERNE_POT,atom1) + 2.0d0*eps*R126*sw
412 >       pot_col(GAYBERNE_POT,atom2) = pot_col(GAYBERNE_POT,atom2) + 2.0d0*eps*R126*sw
413   #else
414         pot = pot + 4.0*eps*R126*sw
415   #endif
# Line 383 | Line 436 | end module gb_pair
436    end subroutine do_gb_pair
437  
438   end module gb_pair
386
387
388  subroutine set_gb_pair_params(sigma, l2b_ratio, eps, eps_ratio, mu, nu)
389    use definitions, ONLY : dp
390    use gb_pair, ONLY : module_set_gb_pair_params => set_gb_pair_params
391    real( kind = dp ), intent(inout) :: sigma, l2b_ratio, eps, eps_ratio
392    real( kind = dp ), intent(inout) :: mu, nu
393    call module_set_gb_pair_params(sigma, l2b_ratio, eps, eps_ratio, mu, nu)
394 end subroutine set_gb_pair_params

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines