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

Comparing trunk/OOPSE/libmdtools/do_Forces.F90 (file contents):
Revision 597 by mmeineke, Mon Jul 14 21:28:54 2003 UTC vs.
Revision 619 by mmeineke, Tue Jul 15 22:22:41 2003 UTC

# Line 4 | Line 4
4  
5   !! @author Charles F. Vardeman II
6   !! @author Matthew Meineke
7 < !! @version $Id: do_Forces.F90,v 1.18 2003-07-14 21:28:54 mmeineke Exp $, $Date: 2003-07-14 21:28:54 $, $Name: not supported by cvs2svn $, $Revision: 1.18 $
7 > !! @version $Id: do_Forces.F90,v 1.20 2003-07-15 22:22:41 mmeineke Exp $, $Date: 2003-07-15 22:22:41 $, $Name: not supported by cvs2svn $, $Revision: 1.20 $
8  
9   module do_Forces
10    use force_globals
# Line 185 | Line 185 | contains
185      logical :: update_nlist  
186      integer :: i, j, jbeg, jend, jnab
187      integer :: nlist
188 <    real( kind = DP ) ::  rijsq, rlistsq, rcutsq, rlist, rcut
188 >    real( kind = DP ) ::  rijsq, rlistsq, rcutsq, rlist, rcut, rrf, rt, dielect
189      real(kind=dp),dimension(3) :: d
190      real(kind=dp) :: rfpot, mu_i, virial
191      integer :: me_i
# Line 193 | Line 193 | contains
193      integer :: neighborListSize
194      integer :: listerror, error
195      integer :: localError
196 +    
197  
198      !! initialize local variables  
199  
# Line 208 | Line 209 | contains
209    
210      call getRcut(rcut,rc2=rcutsq)
211      call getRlist(rlist,rlistsq)
212 +    rt = getRt()
213 +    rrf = getRrf()
214 +    dielect = getDielect()
215      
216 +    if( FF_uses_LJ) then      
217 +       call lj_new_rcut( rcut, localError )
218 +       if ( localError .ne. 0 ) then
219 +          error = -1
220 +          return
221 +       end if
222 +    end if
223 +    
224 +    
225 +    if( FF_uses_dipoles ) then
226 +      
227 +       if( rcut .lt. rrf ) then
228 +          rcut = rrf
229 +          rlist = rcut + 1.0_dp
230 +          rcutsq = rcut * rcut
231 +          rlistsq = rlist * rlist
232 +       end if
233 +      
234 +       call initialize_dipole( rrf, rt )
235 +    end if
236 +    
237 +    if( FF_uses_RF )call initialize_rf( rrf, rt, dielect )
238 +    
239 +    
240      call check_initialization(localError)
241      if ( localError .ne. 0 ) then
242         error = -1
# Line 502 | Line 530 | contains
530  
531   #endif
532      
505    write(*,*) 'T(1) = '
506    write(*,'(3es12.3)') t(1,1), t(1,2), t(1,3)
507    write(*,*)
508
509    write(*,*) 'T(2) = '
510    write(*,'(3es12.3)') t(2,1), t(2,2), t(2,3)
511    write(*,*)
512
533    end subroutine do_force_loop
534  
535    subroutine do_pair(i, j, rijsq, d, do_pot, do_stress, u_l, A, f, t, pot)
# Line 532 | Line 552 | contains
552      integer :: me_i, me_j
553  
554      r = sqrt(rijsq)
535
536    write(*,*) 'ul(1) = '
537    write(*,'(3es12.3)') u_l(1,1), u_l(1,2), u_l(1,3)
538    write(*,*)
539
540    write(*,*) 'ul(2) = '
541    write(*,'(3es12.3)') u_l(2,1), u_l(2,2), u_l(2,3)
542    write(*,*)
543
544
545    write(*,*) 'A(1) = '
546    write(*,'(3es12.3)') A(1,1), A(2,1), A(3,1)
547    write(*,'(3es12.3)') A(4,1), A(5,1), A(6,1)
548    write(*,'(3es12.3)') A(7,1), A(8,1), A(9,1)
549    write(*,*)
550    write(*,*) 'A(2) = '
551    write(*,'(3es12.3)') A(1,2), A(2,2), A(3,2)
552    write(*,'(3es12.3)') A(4,2), A(5,2), A(6,2)
553    write(*,'(3es12.3)') A(7,2), A(8,2), A(9,2)
554    write(*,*)
555
555  
556   #ifdef IS_MPI
557      if (tagRow(i) .eq. tagColumn(j)) then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines