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

Comparing trunk/OOPSE-2.0/src/UseTheForce/notifyCutoffs.F90 (file contents):
Revision 2266 by chuckv, Thu Jul 28 22:12:45 2005 UTC vs.
Revision 2295 by chrisfen, Thu Sep 15 00:13:15 2005 UTC

# Line 42 | Line 42 | module notifyCutoffs
42   module notifyCutoffs
43  
44    use definitions
45 <  use doForces, only:       createRCuts
46 <  use reaction_field, only: setCutoffsRF
47 <  use lj, only:             setCutoffLJ
45 >  use doForces, only:       setDefaultCutoffs
46 >  use reaction_field_module, only: setCutoffsRF
47 >  use lj, only:             setLJDefaultCutoff
48    use eam, only:            setCutoffEAM
49    use switcheroo, only:     set_switch
50    use status
# Line 56 | Line 56 | module notifyCutoffs
56  
57   #define __FORTRAN90
58   #include "UseTheForce/fSwitchingFunction.h"
59 + #include "UseTheForce/fCutoffPolicy.h"
60  
61    public::cutoffNotify
62  
63   contains
64  
65 <  subroutine cutoffNotify( this_rcut, this_rsw, this_rlist )
65 >  subroutine cutoffNotify( this_rcut, this_rsw, this_rlist, cutPolicy)
66  
67      real(kind=dp), intent(in) :: this_rcut, this_rsw, this_rlist
68 <
68 >    integer, intent(in) :: cutPolicy
69      real(kind=dp) :: rsw, rcut, rlist
70      integer :: localError
71      logical :: do_shift
# Line 107 | Line 108 | contains
108  
109      endif
110  
111 <    call createRCuts( defaultRlist=rlist,stat=localError )
111 >    call setDefaultCutoffs(rcut, rsw, rlist, cutPolicy)
112      call setCutoffsRF( rcut, rsw )
113 <    call setCutoffLJ( rcut, do_shift, localError )
113 >    call setLJDefaultCutoff( rcut, do_shift )
114      call setCutoffEAM( rcut, localError)
115      call set_switch(GROUP_SWITCH, rsw, rcut)
116  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines