ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/mdtools/md_code/simulation_module.F90
(Generate patch)

Comparing trunk/mdtools/md_code/simulation_module.F90 (file contents):
Revision 249 by chuckv, Mon Jan 27 21:28:19 2003 UTC vs.
Revision 252 by chuckv, Tue Jan 28 22:16:55 2003 UTC

# Line 82 | Line 82 | contains
82      real(kind = dp ), intent(in), dimension(3) :: box
83      real(kind = dp ), intent(in) :: rlist
84      real(kind = dp ), intent(in) :: rcut
85 <
85 >    integer :: alloc_stat
86      if( setsim ) return  ! simulation is already initialized
87      setSim = .true.
88  
# Line 92 | Line 92 | contains
92      thisSim%rcut         = rcut
93      thisSim%rcutsq       = rcut * rcut
94      thisSim%rcut6        = thisSim%rcutsq * thisSim%rcutsq * thisSim%rcutsq
95 <
95 >    
96 >    if (.not. allocated(q0)) then
97 >       allocate(q0(3,nLRParticles),stat=alloc_stat)
98 >    endif
99    end subroutine setSimulation
100  
101    function getNparticles() result(nparticles)
# Line 137 | Line 140 | contains
140      
141   #ifdef MPI
142      dispmx_tmp = 0.0E0_DP
143 <    do i = 1, nlocal
143 >    do i = 1, thisSim%nLRparticles
144         dispmx_tmp = max( abs ( q(1,i) - q0(1,i) ), dispmx )
145         dispmx_tmp = max( abs ( q(2,i) - q0(2,i) ), dispmx )
146         dispmx_tmp = max( abs ( q(3,i) - q0(3,i) ), dispmx )
# Line 145 | Line 148 | contains
148      call mpi_allreduce(dispmx_tmp,dispmx,1,mpi_double_precision, &
149         mpi_max,mpi_comm_world,mpi_err)
150   #else
151 <    do i = 1, natoms
151 >
152 >    do i = 1, thisSim%nLRparticles
153         dispmx = max( abs ( q(1,i) - q0(1,i) ), dispmx )
154         dispmx = max( abs ( q(2,i) - q0(2,i) ), dispmx )
155         dispmx = max( abs ( q(3,i) - q0(3,i) ), dispmx )
# Line 225 | Line 229 | contains
229      
230      thisrcut = thisSim%rcut
231      if(present(rcut2)) rcut2 = thisSim%rcutsq
232 <    if(present(rcut2)) rcut6 = thisSim%rcut6
232 >    if(present(rcut6)) rcut6 = thisSim%rcut6
233  
234    end subroutine getRcut
235    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines