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 895 by chuckv, Mon Jan 5 22:12:11 2004 UTC vs.
Revision 898 by chuckv, Mon Jan 5 22:49:14 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.42 2004-01-05 22:12:11 chuckv Exp $, $Date: 2004-01-05 22:12:11 $, $Name: not supported by cvs2svn $, $Revision: 1.42 $
7 > !! @version $Id: do_Forces.F90,v 1.44 2004-01-05 22:49:14 chuckv Exp $, $Date: 2004-01-05 22:49:14 $, $Name: not supported by cvs2svn $, $Revision: 1.44 $
8  
9   module do_Forces
10    use force_globals
# Line 178 | Line 178 | contains
178      endif
179      if (.not. do_forces_initialized) then
180         !! Create neighbor lists
181 <       call expandNeighborList(getNlocal(), my_status)
181 >       call expandNeighborList(nLocal, my_status)
182         if (my_Status /= 0) then
183            write(default_error,*) "SimSetup: ExpandNeighborList returned error."
184            thisStat = -1
# Line 198 | Line 198 | contains
198    subroutine do_force_loop(q, A, u_l, f, t, tau, pot, do_pot_c, do_stress_c, &
199         error)
200      !! Position array provided by C, dimensioned by getNlocal
201 <    real ( kind = dp ), dimension(3,getNlocal()) :: q
201 >    real ( kind = dp ), dimension(3,nLocal) :: q
202      !! Rotation Matrix for each long range particle in simulation.
203 <    real( kind = dp), dimension(9,getNlocal()) :: A    
203 >    real( kind = dp), dimension(9,nLocal) :: A    
204      !! Unit vectors for dipoles (lab frame)
205 <    real( kind = dp ), dimension(3,getNlocal()) :: u_l
205 >    real( kind = dp ), dimension(3,nLocal) :: u_l
206      !! Force array provided by C, dimensioned by getNlocal
207 <    real ( kind = dp ), dimension(3,getNlocal()) :: f
207 >    real ( kind = dp ), dimension(3,nLocal) :: f
208      !! Torsion array provided by C, dimensioned by getNlocal
209 <    real( kind = dp ), dimension(3,getNlocal()) :: t    
209 >    real( kind = dp ), dimension(3,nLocal) :: t    
210  
211      !! Stress Tensor
212      real( kind = dp), dimension(9) :: tau  
# Line 220 | Line 220 | contains
220      integer :: ncol
221      integer :: nprocs
222   #endif
223    integer :: nlocal
223      integer :: natoms    
224      logical :: update_nlist  
225      integer :: i, j, jbeg, jend, jnab
# Line 228 | Line 227 | contains
227      real( kind = DP ) ::  rijsq
228      real(kind=dp),dimension(3) :: d
229      real(kind=dp) :: rfpot, mu_i, virial
230 <    integer :: me_i
230 >    integer :: me_i, me_j
231      logical :: is_dp_i
232      integer :: neighborListSize
233      integer :: listerror, error
234      integer :: localError
235 +    integer :: propPack_i, propPack_j
236  
237      real(kind=dp) :: listSkin = 1.0  
238  
# Line 240 | Line 240 | contains
240  
241   #ifdef IS_MPI
242      pot_local = 0.0_dp
243    nlocal = getNlocal()
243      nrow   = getNrow(plan_row)
244      ncol   = getNcol(plan_col)
245   #else
247    nlocal = getNlocal()
246      natoms = nlocal
247   #endif
248  
# Line 262 | Line 260 | contains
260  
261   #ifdef IS_MPI
262      if (.not.allocated(propertyMapI)) then
263 <       allocate(propertyMapI(5,getNrow())
263 >       allocate(propertyMapI(5,nrow))
264      endif
265  
266      do i = 1, nrow
267         me_i = atid_row(i)
268   #else
269      if (.not.allocated(propertyMapI)) then
270 <       allocate(propertyMapI(5,getNlocal())
270 >       allocate(propertyMapI(5,nlocal))
271      endif
272  
273      do i = 1, natoms
# Line 297 | Line 295 | contains
295  
296   #ifdef IS_MPI
297      if (.not.allocated(propertyMapJ)) then
298 <       allocate(propertyMapJ(5,getNcol())
298 >       allocate(propertyMapJ(5,ncol))
299      endif
300  
301      do j = 1, ncol
302         me_j = atid_col(j)
303   #else
304      if (.not.allocated(propertyMapJ)) then
305 <       allocate(propertyMapJ(5,getNlocal())
305 >       allocate(propertyMapJ(5,nlocal))
306      endif
307  
308      do j = 1, natoms
# Line 720 | Line 718 | contains
718            end do
719   #endif
720            
721 <          do i = 1, getNlocal()
721 >          do i = 1, nLocal
722  
723               rfpot = 0.0_DP
724   #ifdef IS_MPI
# Line 780 | Line 778 | contains
778    subroutine do_pair(i, j, rijsq, d, do_pot, do_stress, u_l, A, f, t, pot)
779  
780      real( kind = dp ) :: pot
781 <    real( kind = dp ), dimension(3,getNlocal()) :: u_l
782 <    real (kind=dp), dimension(9,getNlocal()) :: A
783 <    real (kind=dp), dimension(3,getNlocal()) :: f
784 <    real (kind=dp), dimension(3,getNlocal()) :: t
781 >    real( kind = dp ), dimension(3,nLocal) :: u_l
782 >    real (kind=dp), dimension(9,nLocal) :: A
783 >    real (kind=dp), dimension(3,nLocal) :: f
784 >    real (kind=dp), dimension(3,nLocal) :: t
785  
786      logical, intent(inout) :: do_pot, do_stress
787      integer, intent(in) :: i, j
# Line 869 | Line 867 | contains
867  
868    subroutine do_prepair(i, j, rijsq, d, do_pot, do_stress, u_l, A, f, t, pot)
869     real( kind = dp ) :: pot
870 <   real( kind = dp ), dimension(3,getNlocal()) :: u_l
871 <   real (kind=dp), dimension(9,getNlocal()) :: A
872 <   real (kind=dp), dimension(3,getNlocal()) :: f
873 <   real (kind=dp), dimension(3,getNlocal()) :: t
870 >   real( kind = dp ), dimension(3,nLocal) :: u_l
871 >   real (kind=dp), dimension(9,nLocal) :: A
872 >   real (kind=dp), dimension(3,nLocal) :: f
873 >   real (kind=dp), dimension(3,nLocal) :: t
874    
875     logical, intent(inout) :: do_pot, do_stress
876     integer, intent(in) :: i, j

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines