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 2226 by kdaily, Tue May 17 02:09:25 2005 UTC vs.
Revision 2357 by chuckv, Wed Oct 12 20:18:17 2005 UTC

# Line 51 | 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 63 | 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 88 | 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, A, f, t, do_pot)
105      
# Line 397 | 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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines