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 240 by chuckv, Wed Jan 22 21:45:20 2003 UTC vs.
Revision 252 by chuckv, Tue Jan 28 22:16:55 2003 UTC

# Line 11 | Line 11 | module simulation
11  
12    type, public :: simtype
13       PRIVATE
14 <     SEQUENCE
14 > !     SEQUENCE
15   !! Number of particles on this processor
16       integer :: nLRparticles
17   !! Periodic Box    
# Line 38 | Line 38 | module simulation
38    integer, allocatable, dimension(:) :: tag_column
39   #endif
40  
41 <
41 > !! WARNING: use_pbc hardcoded, fixme
42 >  logical :: use_pbc = .true.
43    logical :: setSim = .false.
43  
44  real( kind = dp ), allocatable(:,:),save :: q0
44  
45 + !! array for saving previous positions for neighbor lists.  
46 +  real( kind = dp ), allocatable,dimension(:,:),save :: q0
47 +
48 +
49    public :: check
50    public :: save_nlist
51    public :: wrap
52    public :: getBox
53    public :: getRcut
54 <  public :: setRcut
54 >  public :: getRlist
55 >  public :: getNlocal
56 >  public :: setSimulation
57 > !  public :: setRcut
58  
59    interface wrap
60       module procedure wrap_1d
# Line 73 | Line 79 | contains
79  
80    subroutine setSimulation(nLRParticles,box,rlist,rcut)
81      integer, intent(in) :: nLRParticles
82 <    real(kind = dp ), intent(in) :: box
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 85 | Line 91 | contains
91      thisSim%rlist        = rlist
92      thisSim%rcut         = rcut
93      thisSim%rcutsq       = rcut * rcut
94 <    thisSim%rcut6        = rcutsq * rcutsq * rcutsq
95 <
94 >    thisSim%rcut6        = thisSim%rcutsq * thisSim%rcutsq * thisSim%rcutsq
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 103 | Line 112 | contains
112    end subroutine change_box_size
113  
114  
115 <  elemental function getBox_3d() result(thisBox)
115 >  function getBox_3d() result(thisBox)
116      real( kind = dp ), dimension(3) :: thisBox
117      thisBox = thisSim%box
118    end function getBox_3d
# Line 115 | Line 124 | contains
124      thisBox = thisSim%box(dim)
125    end function getBox_dim
126      
127 <  subroutine check(update_nlist)
128 <  
127 >  subroutine check(q,update_nlist)
128 >    real( kind = dp ), dimension(:,:)  :: q
129      integer :: i
130      real( kind = DP ) :: dispmx
131      logical, intent(out) :: update_nlist
132      real( kind = DP ) :: dispmx_tmp
133 <    
133 >    real( kind = dp ) :: skin_thickness
134 >    integer :: natoms
135 >
136 >    natoms = thisSim%nLRparticles
137 >    skin_thickness = thisSim%rlist
138      dispmx = 0.0E0_DP
126    
139      !! calculate the largest displacement of any atom in any direction
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 136 | 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 159 | Line 172 | contains
172  
173      if (.not. allocated(q0)) then
174         allocate(q0(3,list_size))
175 <    else if( list_size > size(q0))
175 >    else if( list_size > size(q0)) then
176         deallocate(q0)
177         allocate(q0(3,list_size))
178      endif
# Line 186 | Line 199 | contains
199      return
200    end function wrap_1d
201  
202 <  elemental function wrap_3d(r) result(this_wrap)
202 >  function wrap_3d(r) result(this_wrap)
203      real( kind = dp ), dimension(3), intent(in) :: r
204      real( kind = dp ), dimension(3) :: this_wrap
205  
206      
207      if (use_pbc) then
208         !     this_wrap = r - box(dim)*dsign(1.0E0_DP,r)*int(abs(r/box(dim)) + 0.5E0_DP)
209 <       this_wrap(1:3) = r(1:3) - box(1:3)*nint(r(1:3)/box(1:3))
209 >       this_wrap = r - thisSim%box*nint(r/thisSim%box)
210      else
211         this_wrap = r
212      endif
213    end function wrap_3d
214  
215 <
216 <
215 >  
216 >
217    subroutine getRcut(thisrcut,rcut2,rcut6,status)
218      real( kind = dp ), intent(out) :: thisrcut
219      real( kind = dp ), intent(out), optional :: rcut2
220 <    real( kind = dp ), intent(out), optional :: thisrcut6
220 >    real( kind = dp ), intent(out), optional :: rcut6
221      integer, optional :: status
222  
223      if (present(status)) status = 0
# Line 214 | Line 227 | contains
227         return
228      end if
229      
230 <    thisrcut = rcut
231 <    if(present(rcut2)) rcut2 = rcutsq
232 <    if(present(rcut2)) rcut6 = rcut_6
230 >    thisrcut = thisSim%rcut
231 >    if(present(rcut2)) rcut2 = thisSim%rcutsq
232 >    if(present(rcut6)) rcut6 = thisSim%rcut6
233  
234    end subroutine getRcut
235    
236 +  
237 +  
238 +
239 +  subroutine getRlist(thisrlist,rlist2,status)
240 +    real( kind = dp ), intent(out) :: thisrlist
241 +    real( kind = dp ), intent(out), optional :: rlist2
242  
243 +    integer, optional :: status
244  
245 +    if (present(status)) status = 0
246  
247 +    if (.not.setSim ) then
248 +       if (present(status)) status = -1
249 +       return
250 +    end if
251 +    
252 +    thisrlist = thisSim%rlist
253 +    if(present(rlist2)) rlist2 = thisSim%rlistsq
254 +
255 +  end subroutine getRlist
256 +  
257 +  
258 +
259 + pure function getNlocal() result(nlocal)
260 +    integer :: nlocal
261 +    nlocal = thisSim%nLRparticles
262 +  end function getNlocal
263 +
264 +
265 +
266   end module simulation

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines