ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/notifyCutoffs.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/notifyCutoffs.F90 (file contents):
Revision 945 by gezelter, Thu Jan 15 01:14:55 2004 UTC vs.
Revision 1150 by gezelter, Fri May 7 21:35:05 2004 UTC

# Line 7 | Line 7 | module notifyCutoffs
7    use reaction_field, only: setCutoffsRF
8    use lj, only:             setCutoffLJ
9    use eam, only:            setCutoffEAM
10 +  use switcheroo, only:     set_switch
11    implicit none
12  
13    PRIVATE
14 +
15 + #define __FORTRAN90
16 + #include "fSwitchingFunction.h"
17    
18    public::cutoffNotify
19  
# Line 36 | Line 40 | module notifyCutoffs
40        call setCutoffsDipole( ecr, rtaper )
41        call setCutoffsRF( ecr, rtaper )
42        call setCutoffLJ( rcut, localError )
43 <      call setCutoffEAM(rcut,localError)
43 >      call setCutoffEAM(rcut, localError)
44  
45 +      if (ecr.gt.rcut) then
46 +         call set_switch(GROUP_SWITCH, rtaper, ecr)
47 +      else
48 +         call set_switch(GROUP_SWITCH, rcut, rcut)
49 +      endif
50 +
51      end subroutine cutoffNotify
52  
53    end module notifyCutoffs

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines