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 1216 by gezelter, Tue Jun 1 18:42:58 2004 UTC vs.
Revision 1217 by gezelter, Tue Jun 1 21:45:22 2004 UTC

# Line 4 | Line 4
4  
5   !! @author Charles F. Vardeman II
6   !! @author Matthew Meineke
7 < !! @version $Id: do_Forces.F90,v 1.67 2004-06-01 18:42:58 gezelter Exp $, $Date: 2004-06-01 18:42:58 $, $Name: not supported by cvs2svn $, $Revision: 1.67 $
7 > !! @version $Id: do_Forces.F90,v 1.68 2004-06-01 21:45:22 gezelter Exp $, $Date: 2004-06-01 21:45:22 $, $Name: not supported by cvs2svn $, $Revision: 1.68 $
8  
9   module do_Forces
10    use force_globals
# Line 428 | Line 428 | contains
428      nAtomsInCol   = getNatomsInCol(plan_atom_col)
429      nGroupsInRow  = getNgroupsInRow(plan_group_row)
430      nGroupsInCol  = getNgroupsInCol(plan_group_col)
431    write(*,*) nAtomsInRow, nAtomsInCol, nGroupsInRow, nGroupsInCol
432    write(*,*) pot_local
431   #else
432      natoms = nlocal
433   #endif
# Line 598 | Line 596 | contains
596                                q(:,atom2), d_atm, ratmsq)
597   #endif
598                        endif
601 #ifdef IS_MPI
602                      write(*,'(a20,2i8,es12.3,2i8)') 'atom1, atom2, pot = ', atom1, atom2, ratmsq, AtomRowToGlobal(atom1), AtomColToGlobal(atom2)
603 #endif
599  
600                        if (loop .eq. PREPAIR_LOOP) then
601   #ifdef IS_MPI                      
# Line 617 | Line 612 | contains
612                           call do_pair(atom1, atom2, ratmsq, d_atm, sw, &
613                                do_pot, &
614                                u_l, A, f, t, pot_local, vpair, fpair)
620                         write(*,'(a20,2i11,2es12.3)') 'atom1, atom2, pot = ', atom1, atom2, pot_local, vpair
615   #else
616                           call do_pair(atom1, atom2, ratmsq, d_atm, sw, &
617                                do_pot,  &
# Line 839 | Line 833 | contains
833      fpair(1:3) = 0.0d0
834  
835   #ifdef IS_MPI
842    if (AtomRowToGlobal(i) .eq. AtomColToGlobal(j)) then
843       write(0,*) 'do_pair is doing', i , j, AtomRowToGlobal(i), AtomColToGlobal(j)
844    endif
836      me_i = atid_row(i)
837      me_j = atid_col(j)
838   #else
# Line 852 | Line 843 | contains
843      if (FF_uses_LJ .and. SIM_uses_LJ) then
844        
845         if ( PropertyMap(me_i)%is_LJ .and. PropertyMap(me_j)%is_LJ ) then
855          !write(*,*) 'calling lj with'
856          !write(*,*) i, j, r, rijsq
857          !write(*,'(3es12.3)') d(1), d(2), d(3)
858          !write(*,'(3es12.3)') sw, vpair, pot
859          !write(*,*)
860
846            call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, pot, f, do_pot)
847         endif
848        
# Line 942 | Line 927 | contains
927      endif
928    
929  
930 < #ifdef IS_MPI
931 <   if (AtomRowToGlobal(i) .eq. AtomColToGlobal(j)) then
932 <      write(0,*) 'do_prepair is doing', i , j, AtomRowToGlobal(i), AtomColToGlobal(j)
933 <   endif
949 <  
950 <   me_i = atid_row(i)
951 <   me_j = atid_col(j)
952 <  
953 < #else
954 <  
930 > #ifdef IS_MPI  
931 >   me_i = atid_row(i)
932 >   me_j = atid_col(j)  
933 > #else  
934     me_i = atid(i)
935 <   me_j = atid(j)
957 <  
935 >   me_j = atid(j)  
936   #endif
937    
938     if (FF_uses_EAM .and. SIM_uses_EAM) then
# Line 1198 | Line 1176 | contains
1176     tau_Temp(8) = tau_Temp(8) - dpair(3) * fpair(2)
1177     tau_Temp(9) = tau_Temp(9) - dpair(3) * fpair(3)
1178    
1201   !write(*,'(6es12.3)')  fpair(1:3), tau_Temp(1), tau_Temp(5), tau_temp(9)
1179     virial_Temp = virial_Temp + &
1180          (tau_Temp(1) + tau_Temp(5) + tau_Temp(9))
1181    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines