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

Comparing trunk/mdtools/md_code/lj_FF.F90 (file contents):
Revision 246 by chuckv, Fri Jan 24 21:36:52 2003 UTC vs.
Revision 254 by chuckv, Thu Jan 30 20:03:37 2003 UTC

# Line 2 | Line 2
2   !! Corresponds to the force field defined in lj_FF.cpp
3   !! @author Charles F. Vardeman II
4   !! @author Matthew Meineke
5 < !! @version $Id: lj_FF.F90,v 1.10 2003-01-24 21:36:52 chuckv Exp $, $Date: 2003-01-24 21:36:52 $, $Name: not supported by cvs2svn $, $Revision: 1.10 $
5 > !! @version $Id: lj_FF.F90,v 1.14 2003-01-30 20:03:36 chuckv Exp $, $Date: 2003-01-30 20:03:36 $, $Name: not supported by cvs2svn $, $Revision: 1.14 $
6  
7  
8  
9   module lj_ff
10    use simulation
11    use definitions
12 +  use generic_atypes
13   #ifdef IS_MPI
14    use mpiSimulation
15   #endif
# Line 18 | Line 19 | module lj_ff
19   !! Number of lj_atypes in lj_atype_list
20    integer, save :: n_lj_atypes = 0
21  
22 < !! Starting Size for ljMixed Array
23 <  integer, parameter :: ljMixed_blocksize = 10
22 > !! Global list of lj atypes in simulation
23 >  type (lj_atype), pointer :: ljListHead => null()
24 >  type (lj_atype), pointer :: ljListTail => null()
25  
24 !! Basic atom type for a Lennard-Jones Atom.
25  type, public :: lj_atype
26     private
27     sequence
28 !! Unique number for place in linked list
29     integer :: atype_number = 0
30 !! Unique indentifier number (ie atomic no, etc)
31     integer :: atype_ident = 0
32 !! Mass of Particle
33     real ( kind = dp )  :: mass = 0.0_dp
34 !! Lennard-Jones epslon
35     real ( kind = dp )  :: epsilon = 0.0_dp
36 !! Lennard-Jones Sigma
37     real ( kind = dp )  :: sigma = 0.0_dp
38 !! Lennard-Jones Sigma Squared
39     real ( kind = dp )  :: sigma2 = 0.0_dp
40 !! Lennard-Jones Sigma to sixth
41     real ( kind = dp )  :: sigma6 = 0.0_dp
42 !! Pointer for linked list creation
43     type (lj_atype), pointer :: next => null()
44  end type lj_atype
26  
46 !! Pointer type for atype ident array
47  type, public :: lj_atypePtr
48     type (lj_atype), pointer :: this => null()
49  end type lj_atypePtr
50
51 !! Global list of lj atypes in simulation
52  type (lj_atype), pointer :: lj_atype_list => null()
27   !! LJ mixing array  
28    type (lj_atype), dimension(:,:), pointer :: ljMixed => null()
55 !! identity pointer list for force loop.
56  type (lj_atypePtr), dimension(:), pointer :: identPtrList => null()
29  
30  
31   !! Neighbor list and commom arrays
# Line 64 | Line 36 | module lj_ff
36    integer :: nListAllocs = 0
37    integer, parameter :: maxListAllocs = 5
38  
39 < #ifdef IS_MPI
68 < ! Universal routines: All types of force calculations will need these arrays
69 < ! Arrays specific to a type of force calculation should be declared in that module.
70 < !! Row position array.
71 <  real( kind = dp ), allocatable, dimension(:,:) :: qRow
72 < !! Column position array.
73 <  real( kind = dp ), allocatable, dimension(:,:) :: qColumn
39 >  logical, save :: firstTime = .True.
40  
41 < !! Row Force array.
42 <  real( kind = dp ), allocatable, dimension(:,:) :: fRow
77 < !! Column Force Array.
78 <  real( kind = dp ), allocatable, dimension(:,:) :: fColumn
79 <
80 < !! Row potential energy array
81 <  real( kind = dp ), allocatable, dimension(:) :: eRow
82 < !! Column potential energy array
83 <  real( kind = dp ), allocatable, dimension(:) :: eColumn
84 <
85 <
41 > !! Atype identity pointer lists
42 > #ifdef IS_MPI
43   !! Row lj_atype pointer list
44 <  type (lj_atypePtr), dimension(:), pointer :: identPtrListRow => null()
44 >  type (lj_identPtrList), dimension(:), pointer :: identPtrListRow => null()
45   !! Column lj_atype pointer list
46 <  type (lj_atypePtr), dimension(:), pointer :: identPtrListColumn => null()
46 >  type (lj_identPtrList), dimension(:), pointer :: identPtrListColumn => null()
47 > #else
48 >  type( lj_identPtrList ), dimension(:), pointer :: identPtrList => null()
49   #endif
50  
51  
# Line 105 | Line 64 | contains
64  
65   contains
66  
67 + !! Adds a new lj_atype to the list.
68    subroutine new_lj_atype(ident,mass,epsilon,sigma,status)
69      real( kind = dp ), intent(in) :: mass
70      real( kind = dp ), intent(in) :: epsilon
# Line 112 | Line 72 | contains
72      integer, intent(in) :: ident
73      integer, intent(out) :: status
74  
75 <    type (lj_atype), pointer :: this_lj_atype
116 <    type (lj_atype), pointer :: lj_atype_ptr
117 <
118 <    type (lj_atype), dimension(:,:), pointer :: thisMix
119 <    type (lj_atype), dimension(:,:), pointer :: oldMix
75 >    type (lj_atype), pointer :: newLJ_atype
76      integer :: alloc_error
77      integer :: atype_counter = 0
78      integer :: alloc_size
79 <
79 >    integer :: err_stat
80      status = 0
81  
82  
83  
84   ! allocate a new atype    
85 <    allocate(this_lj_atype,stat=alloc_error)
85 >    allocate(newLJ_atype,stat=alloc_error)
86      if (alloc_error /= 0 ) then
87         status = -1
88         return
89      end if
90  
91   ! assign our new lj_atype information
92 <    this_lj_atype%mass        = mass
93 <    this_lj_atype%epsilon     = epsilon
94 <    this_lj_atype%sigma       = sigma
95 <    this_lj_atype%sigma2      = sigma * sigma
96 <    this_lj_atype%sigma6      = this_lj_atype%sigma2 * this_lj_atype%sigma2 &
97 <         * this_lj_atype%sigma2
92 >    newLJ_atype%mass        = mass
93 >    newLJ_atype%epsilon     = epsilon
94 >    newLJ_atype%sigma       = sigma
95 >    newLJ_atype%sigma2      = sigma * sigma
96 >    newLJ_atype%sigma6      = newLJ_atype%sigma2 * newLJ_atype%sigma2 &
97 >         * newLJ_atype%sigma2
98   ! assume that this atype will be successfully added
99 <    this_lj_atype%atype_ident = ident
100 <    this_lj_atype%atype_number = n_lj_atypes + 1
99 >    newLJ_atype%atype_ident = ident
100 >    newLJ_atype%atype_number = n_lj_atypes + 1
101  
102 <
103 < ! First time through allocate a array of size ljMixed_blocksize
104 <    if(.not. associated(ljMixed)) then
105 <       allocate(thisMix(ljMixed_blocksize,ljMixed_blocksize))
150 <       if (alloc_error /= 0 ) then
151 <          status = -1
152 <          return
153 <       end if
154 <       ljMixed => thisMix
155 < ! If we have outgrown ljMixed_blocksize, allocate a new matrix twice the size and
156 < ! point ljMix at the new matrix.
157 <    else if( (n_lj_atypes + 1) > size(ljMixed)) then
158 <       alloc_size = 2*size(ljMixed)
159 <       allocate(thisMix(alloc_size,alloc_size))
160 <       if (alloc_error /= 0 ) then
161 <          status = -1
162 <          return
163 <       end if
164 < ! point oldMix at old ljMixed array
165 <       oldMix => ljMixed
166 < ! Copy oldMix into new Mixed array      
167 <       thisMix = oldMix
168 < ! Point ljMixed at new array
169 <       ljMixed => thisMix
170 < ! Free old array so we don't have a memory leak
171 <       deallocate(oldMix)
102 >    call add_atype(newLJ_atype,ljListHead,ljListTail,err_stat)
103 >    if (err_stat /= 0 ) then
104 >       status = -1
105 >       return
106      endif
107  
174
175
176
177
178 ! Find bottom of atype master list
179 ! if lj_atype_list is null then we are at the top of the list.
180    if (.not. associated(lj_atype_list)) then
181
182       write(*,*) "Associating lists for first time"
183      
184
185       this_lj_atype%atype_number = 1
186      
187       ljMixed(n_lj_atypes,n_lj_atypes)%sigma  = this_lj_atype%sigma
188      
189       ljMixed(n_lj_atypes,n_lj_atypes)%sigma2  = ljMixed(n_lj_atypes,n_lj_atypes)%sigma &
190            * ljMixed(n_lj_atypes,n_lj_atypes)%sigma
191      
192       ljMixed(n_lj_atypes,n_lj_atypes)%sigma6 = ljMixed(n_lj_atypes,n_lj_atypes)%sigma2 &
193            * ljMixed(n_lj_atypes,n_lj_atypes)%sigma2 &
194            * ljMixed(n_lj_atypes,n_lj_atypes)%sigma2
195      
196       ljMixed(n_lj_atypes,n_lj_atypes)%epsilon = this_lj_atype%epsilon
197      
198       lj_atype_list => this_lj_atype
199      
200       write(*,*) "lj_atype_list first time through -- ident", lj_atype_list%atype_ident
201    else ! we need to find the bottom of the list to insert new atype
202       write(*,*) "Second time through"
203       lj_atype_ptr => lj_atype_list
204       write(*,*) "lj_atype_ptr to next"
205       atype_counter = 1
206       find_end: do
207          if (.not. associated(lj_atype_ptr)) exit find_end
208
209          write(*,*) "Inside find_end-this ident", lj_atype_ptr%atype_ident
210 ! Set up mixing for new atype and current atype in list
211       ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma  =  &
212            calcLJMix("sigma",this_lj_atype%sigma, &
213            lj_atype_ptr%sigma)
214
215       ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma2  = &
216            ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma &
217            * ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma
218
219       ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma6 = &
220            ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma2 &
221            * ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma2 &
222            * ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%sigma2
223
224       ljMixed(this_lj_atype%atype_number,lj_atype_ptr%atype_number)%epsilon = &
225            calcLJMix("epsilon",this_lj_atype%epsilon, &
226            lj_atype_ptr%epsilon)
227
228 ! Advance to next pointer
229       lj_atype_ptr => lj_atype_ptr%next          
230       atype_counter = atype_counter + 1          
231       end do find_end
232
233       lj_atype_ptr => this_lj_atype
234       write(*,*) "just added: ", lj_atype_ptr%atype_ident
235    end if
236
237    write(*,*) "lj_atype_list now contains.."
238    
239    lj_atype_ptr => lj_atype_list
240    do while (associated(lj_atype_ptr))
241       write(*,*) "lj_atype_list contains ident", lj_atype_ptr%atype_ident
242       lj_atype_ptr => lj_atype_ptr%next
243    end do
244    
245 ! Insert new atype at end of list
246
247 ! Increment number of atypes
248
108      n_lj_atypes = n_lj_atypes + 1
109  
251 ! Set up self mixing
110  
111    end subroutine new_lj_atype
112  
# Line 271 | Line 129 | contains
129      integer, allocatable, dimension(:) :: identCol
130      integer :: nrow
131      integer :: ncol
274    integer :: alloc_stat
132   #endif
133      status = 0
134 +  
135  
136 <    write(*,*) "Initializing ljFF"
136 >
137 >
138   !! if were're not in MPI, we just update ljatypePtrList
139   #ifndef IS_MPI
140 <    call new_ljatypePtrList(nComponents,ident,identPtrList,thisStat)
140 >    call create_IdentPtrlst(ident,ljListHead,identPtrList,thisStat)
141      if ( thisStat /= 0 ) then
142         status = -1
143         return
144      endif
145 <    write(*,*) "component pointer list initialized"
145 >
146   !! Allocate pointer lists
147      allocate(point(nComponents),stat=alloc_stat)
148      if (alloc_stat /=0) then
# Line 299 | Line 158 | contains
158      
159   ! if were're in MPI, we also have to worry about row and col lists    
160   #else
161 +  
162   ! We can only set up forces if mpiSimulation has been setup.
163      if (.not. isMPISimSet()) then
164 +       write(default_error,*) "MPI is not set"
165         status = -1
166         return
167      endif
168 <    nrow = getNrow()
169 <    ncol = getNcol()
168 >    nrow = getNrow(plan_row)
169 >    ncol = getNcol(plan_col)
170   !! Allocate temperary arrays to hold gather information
171      allocate(identRow(nrow),stat=alloc_stat)
172      if (alloc_stat /= 0 ) then
# Line 318 | Line 179 | contains
179         status = -1
180         return
181      endif
182 +
183   !! Gather idents into row and column idents
184 +
185      call gather(ident,identRow,plan_row)
186      call gather(ident,identCol,plan_col)
187 +
188  
189   !! Create row and col pointer lists
190 <    call new_ljatypePtrList(nrow,identRow,identPtrListRow,thisStat)
190 >
191 >    call create_IdentPtrlst(identRow,ljListHead,identPtrListRow,thisStat)
192      if (thisStat /= 0 ) then
193         status = -1
194         return
195      endif
196  
197 <    call new_ljatypePtrList(ncol,identCol,identPtrListCol,thisStat)
197 >    call create_IdentPtrlst(identCol,ljListHead,identPtrListColumn,thisStat)
198      if (thisStat /= 0 ) then
199         status = -1
200         return
# Line 339 | Line 204 | contains
204      deallocate(identCol)
205      deallocate(identRow)
206  
342 !! Allocate Simulation arrays
343 !! NOTE: This bit of code should be fixed, it can cause large
344 !! memory fragmentation if call repeatedly
207  
346    if (.not.allocated(qRow)) then
347       allocate(qRow(3,nrow),stat=alloc_stat)
348       if (alloc_stat /= 0 ) then
349          status = -1
350          return
351       endif
352    else
353       deallocate(qrow)
354       allocate(qRow(3,nrow),stat=alloc_stat)
355       if (alloc_stat /= 0 ) then
356          status = -1
357          return
358       endif
359    endif
360
361    if (.not.allocated(3,qCol)) then
362       allocate(qCol(ncol),stat=alloc_stat)
363       if (alloc_stat /= 0 ) then
364          status = -1
365          return
366       endif
367    else
368       deallocate(qCol)
369       allocate(qCol(3,ncol),stat=alloc_stat)
370       if (alloc_stat /= 0 ) then
371          status = -1
372          return
373       endif
374    endif
375
376    if (.not.allocated(fRow)) then
377       allocate(fRow(3,nrow),stat=alloc_stat)
378       if (alloc_stat /= 0 ) then
379          status = -1
380          return
381       endif
382    else
383       deallocate(fRow)
384       allocate(fRow(3,nrow),stat=alloc_stat)
385       if (alloc_stat /= 0 ) then
386          status = -1
387          return
388       endif
389    endif
390
391    if (.not.allocated(fCol)) then
392       allocate(fCol(3,ncol),stat=alloc_stat)
393       if (alloc_stat /= 0 ) then
394          status = -1
395          return
396       endif
397    else
398       deallocate(fCol)
399       allocate(fCol(3,ncol),stat=alloc_stat)
400       if (alloc_stat /= 0 ) then
401          status = -1
402          return
403       endif
404    endif
405
406    if (.not.allocated(eRow)) then
407       allocate(eRow(nrow),stat=alloc_stat)
408       if (alloc_stat /= 0 ) then
409          status = -1
410          return
411       endif
412    else
413       deallocate(eRow)
414       allocate(eRow(nrow),stat=alloc_stat)
415       if (alloc_stat /= 0 ) then
416          status = -1
417          return
418       endif
419    endif
420
421    if (.not.allocated(eCol)) then
422       allocate(eCol(ncol),stat=alloc_stat)
423       if (alloc_stat /= 0 ) then
424          status = -1
425          return
426       endif
427    else
428       deallocate(eCol)
429       allocate(eCol(ncol),stat=alloc_stat)
430       if (alloc_stat /= 0 ) then
431          status = -1
432          return
433       endif
434    endif
435
436    if (.not.allocated(eTemp)) then
437       allocate(eTemp(nComponents),stat=alloc_stat)
438       if (alloc_stat /= 0 ) then
439          status = -1
440          return
441       endif
442    else
443       deallocate(eTemp)
444       allocate(eTemp(nComponets),stat=alloc_stat)
445       if (alloc_stat /= 0 ) then
446          status = -1
447          return
448       endif
449    endif
450
451
208   !! Allocate neighbor lists for mpi simulations.
209      if (.not. allocated(point)) then
210         allocate(point(nrow),stat=alloc_stat)
# Line 480 | Line 236 | contains
236  
237   #endif
238      
239 <    
240 <    do i = 1, nComponents
241 <       write(*,*) "Ident pointer list ident: ", identPtrList(i)%this%atype_ident
242 <    end do
243 <
239 >    call createMixingList(thisStat)
240 >    if (thisStat /= 0) then
241 >       status = -1
242 >       return
243 >    endif
244      isljFFinit = .true.
245  
246    end subroutine init_ljFF
# Line 493 | Line 249 | contains
249  
250  
251  
496 !! Takes an ident array and creates an atype pointer list
497 !! based on those identities
498  subroutine new_ljatypePtrList(mysize,ident,PtrList,status)
499    integer, intent(in) :: mysize
500    integer,dimension(:), intent(in) :: ident
501    integer, optional :: status
502    type(lj_atypePtr), dimension(:), pointer :: PtrList
252  
253 <    integer :: thisIdent
253 >  subroutine createMixingList(status)
254 >    integer :: listSize
255 >    integer :: status
256      integer :: i
257 <    integer :: alloc_error
507 <    type (lj_atype), pointer :: tmpPtr
257 >    integer :: j
258  
259 <    if (present(status)) status = 0
259 >    integer :: outerCounter = 0
260 >    integer :: innerCounter = 0
261 >    type (lj_atype), pointer :: tmpPtrOuter => null()
262 >    type (lj_atype), pointer :: tmpPtrInner => null()
263 >    status = 0
264  
265 <    write(*,*) "Creating new ljatypePtrList...."
266 < ! First time through, allocate list
267 <    if (.not.associated(PtrList)) then
268 <       write(*,*) "allocating pointer list...."
269 <       allocate(PtrList(mysize))
265 >    listSize = getListLen(ljListHead)
266 >    if (listSize == 0) then
267 >       status = -1
268 >       return
269 >    end if
270 >  
271 >
272 >    if (.not. associated(ljMixed)) then
273 >       allocate(ljMixed(listSize,listSize))
274      else
275 < ! We want to creat a new ident list so free old list
276 <       deallocate(PtrList)
277 <       allocate(PtrList(mysize))
520 <    endif
275 >       status = -1
276 >       return
277 >    end if
278  
279 < ! Match pointer list
280 <    write(*,*) "Doing ident search"
281 <    do i = 1, mysize
282 <       thisIdent = ident(i)
283 <       write(*,*) "Calling getLJatype for ident ", thisIdent
284 <       call getLJatype(thisIdent,tmpPtr)
285 <
286 <      if (.not. associated(tmpPtr)) then
287 <         write(*,*) "tmpptr was not associated"
288 <          status = -1
289 <          return
279 >    
280 >
281 >    tmpPtrOuter => ljListHead
282 >    tmpPtrInner => tmpPtrOuter%next
283 >    do while (associated(tmpPtrOuter))
284 >       outerCounter = outerCounter + 1
285 > ! do self mixing rule
286 >       ljMixed(outerCounter,outerCounter)%sigma  = tmpPtrOuter%sigma
287 >                                                                                                  
288 >       ljMixed(outerCounter,outerCounter)%sigma2  = ljMixed(outerCounter,outerCounter)%sigma &
289 >            * ljMixed(outerCounter,outerCounter)%sigma
290 >                                                                                                  
291 >       ljMixed(outerCounter,outerCounter)%sigma6 = ljMixed(outerCounter,outerCounter)%sigma2 &
292 >            * ljMixed(outerCounter,outerCounter)%sigma2 &
293 >            * ljMixed(outerCounter,outerCounter)%sigma2
294 >                                                                                                  
295 >       ljMixed(outerCounter,outerCounter)%epsilon = tmpPtrOuter%epsilon
296 >
297 >       innerCounter = outerCounter + 1
298 >       do while (associated(tmpPtrInner))
299 >          
300 >          ljMixed(outerCounter,innerCounter)%sigma  =  &
301 >               calcLJMix("sigma",tmpPtrOuter%sigma, &
302 >               tmpPtrInner%sigma)
303 >          
304 >          ljMixed(outerCounter,innerCounter)%sigma2  = &
305 >               ljMixed(outerCounter,innerCounter)%sigma &
306 >               * ljMixed(outerCounter,innerCounter)%sigma
307 >          
308 >          ljMixed(outerCounter,innerCounter)%sigma6 = &
309 >               ljMixed(outerCounter,innerCounter)%sigma2 &
310 >               * ljMixed(outerCounter,innerCounter)%sigma2 &
311 >               * ljMixed(outerCounter,innerCounter)%sigma2
312 >          
313 >          ljMixed(outerCounter,innerCounter)%epsilon = &
314 >               calcLJMix("epsilon",tmpPtrOuter%epsilon, &
315 >               tmpPtrInner%epsilon)
316 >          ljMixed(innerCounter,outerCounter)%sigma = ljMixed(outerCounter,innerCounter)%sigma
317 >          ljMixed(innerCounter,outerCounter)%sigma2 = ljMixed(outerCounter,innerCounter)%sigma2
318 >          ljMixed(innerCounter,outerCounter)%sigma6 = ljMixed(outerCounter,innerCounter)%sigma6
319 >          ljMixed(innerCounter,outerCounter)%epsilon = ljMixed(outerCounter,innerCounter)%epsilon
320 >
321 >
322 >          tmpPtrInner => tmpPtrInner%next
323 >          innerCounter = innerCounter + 1
324 >       end do
325 > ! advance pointers
326 >       tmpPtrOuter => tmpPtrOuter%next
327 >       if (associated(tmpPtrOuter)) then
328 >          tmpPtrInner => tmpPtrOuter%next
329         endif
330        
535       PtrList(i)%this => tmpPtr
331      end do
332  
333 <  end subroutine new_ljatypePtrList
333 >  end subroutine createMixingList
334  
540 !! Finds a lj_atype based upon numerical ident
541 !! returns a null pointer if error
542  subroutine getLJatype(ident,ljAtypePtr)
543    integer, intent(in) :: ident
544    type (lj_atype), pointer :: ljAtypePtr    
545    type (lj_atype), pointer :: tmplj_atype_ptr => null()
335  
547    write(*,*) "Finding ljAtype for ident ", ident
548    ljAtypePtr => null()
336  
550    if(.not. associated(lj_atype_list)) return
337  
552 ! Point at head of list.
553    write(*,*) "Searching at head of list"
554    tmplj_atype_ptr => lj_atype_list
555    find_ident: do
556       if (.not.associated(tmplj_atype_ptr)) then
557          write(*,*) "Find_ident, pointer not associated"
558          exit find_ident
559       else if( tmplj_atype_ptr%atype_ident == ident) then
560          ljAtypePtr => tmplj_atype_ptr
561          exit find_ident
562       endif
563       tmplj_atype_ptr => tmplj_atype_ptr%next
564    end do find_ident
338  
339  
340  
341  
569  end subroutine getLJatype
570
571
342   !! FORCE routine Calculates Lennard Jones forces.
343   !------------------------------------------------------------->
344    subroutine do_lj_ff(q,f,potE,do_pot)
# Line 582 | Line 352 | contains
352      type(lj_atype), pointer :: ljAtype_i
353      type(lj_atype), pointer :: ljAtype_j
354  
355 < #ifdef MPI
356 <  real( kind = DP ), dimension(3,getNcol()) :: efr
355 > #ifdef IS_MPI
356 >  real( kind = DP ), dimension(3,getNcol(plan_col)) :: efr
357    real( kind = DP ) :: pot_local
358   #else
359    real( kind = DP ), dimension(3,getNlocal()) :: efr
360   #endif
361    
362 + !! Local arrays needed for MPI
363 + #ifdef IS_MPI
364 +  real(kind = dp), dimension(3,getNrow(plan_row)) :: qRow
365 +  real(kind = dp), dimension(3,getNcol(plan_col)) :: qCol
366 +
367 +  real(kind = dp), dimension(3,getNrow(plan_row)) :: fRow
368 +  real(kind = dp), dimension(3,getNcol(plan_col)) :: fCol
369 +  real(kind = dp), dimension(3,getNlocal()) :: fMPITemp
370 +
371 +  real(kind = dp), dimension(getNrow(plan_row)) :: eRow
372 +  real(kind = dp), dimension(getNcol(plan_col)) :: eCol
373 +
374 +  real(kind = dp), dimension(getNlocal()) :: eTemp
375 + #endif
376 +
377 +
378 +
379    real( kind = DP )   :: pe
380    logical             :: update_nlist
381  
# Line 611 | Line 398 | contains
398    integer :: ncol
399    integer :: natoms
400  
401 +
402 +
403 +
404   ! Make sure we are properly initialized.
405    if (.not. isljFFInit) then
406       write(default_error,*) "ERROR: lj_FF has not been properly initialized"
# Line 627 | Line 417 | contains
417    natoms = getNlocal()
418    call getRcut(rcut,rcut2=rcutsq)
419    call getRlist(rlist,rlistsq)
420 +
421   #ifndef IS_MPI
422    nrow = natoms - 1
423    ncol = natoms
# Line 640 | Line 431 | contains
431    
432   !! See if we need to update neighbor lists
433    call check(q,update_nlist)
434 +  if (firstTime) then
435 +     update_nlist = .true.
436 +     firstTime = .false.
437 +  endif
438  
439   !--------------WARNING...........................
440   ! Zero variables, NOTE:::: Forces are zeroed in C
# Line 651 | Line 446 | contains
446    pe = 0.0E0_DP
447  
448   #else
449 <    f_row = 0.0E0_DP
450 <    f_col = 0.0E0_DP
449 >    fRow = 0.0E0_DP
450 >    fCol = 0.0E0_DP
451  
452      pe_local = 0.0E0_DP
453  
# Line 663 | Line 458 | contains
458      efr = 0.0E0_DP
459  
460   ! communicate MPI positions
461 < #ifdef MPI    
462 <    call gather(q,qRow,plan_row3)
463 <    call gather(q,qCol,plan_col3)
461 > #ifdef IS_MPI    
462 >    call gather(q,qRow,plan_row3d)
463 >    call gather(q,qCol,plan_col3d)
464   #endif
465  
466  
# Line 677 | Line 472 | contains
472      
473       nlist = 0
474      
475 <    
475 >    
476  
477       do i = 1, nrow
478          point(i) = nlist + 1
479 < #ifdef MPI
479 > #ifdef IS_MPI
480          ljAtype_i => identPtrListRow(i)%this
481          tag_i = tagRow(i)
482          rxi = qRow(1,i)
# Line 696 | Line 491 | contains
491   #endif
492  
493          inner: do j = j_start, ncol
494 < #ifdef MPI
494 > #ifdef IS_MPI
495   ! Assign identity pointers and tags
496             ljAtype_j => identPtrListColumn(j)%this
497 <           tag_j = tagCol(j)
497 >           tag_j = tagColumn(j)
498             if (newtons_thrd) then
499                if (tag_i <= tag_j) then
500                   if (mod(tag_i + tag_j,2) == 0) cycle inner
# Line 720 | Line 515 | contains
515   #endif          
516             rijsq = rxij*rxij + ryij*ryij + rzij*rzij
517  
518 < #ifdef MPI
518 > #ifdef IS_MPI
519               if (rijsq <=  rlistsq .AND. &
520                    tag_j /= tag_i) then
521   #else
522 +          
523               if (rijsq <  rlistsq) then
524   #endif
525              
# Line 734 | Line 530 | contains
530                endif
531                list(nlist) = j
532  
533 <              
533 >    
534                if (rijsq <  rcutsq) then
535                  
536                   r = dsqrt(rijsq)
537        
538                   call getLJPot(r,pot,dudr,ljAtype_i,ljAtype_j)
539        
540 < #ifdef MPI
540 > #ifdef IS_MPI
541                  eRow(i) = eRow(i) + pot*0.5
542                  eCol(i) = eCol(i) + pot*0.5
543   #else
544 <                pe = pe + pot
544 >                    pe = pe + pot
545   #endif                
546              
547                   efr(1,j) = -rxij
# Line 759 | Line 555 | contains
555                      ftmp = dudr * drdx1
556  
557  
558 < #ifdef MPI
558 > #ifdef IS_MPI
559                      fCol(dim,j) = fCol(dim,j) - ftmp
560                      fRow(dim,i) = fRow(dim,i) + ftmp
561   #else                    
# Line 774 | Line 570 | contains
570          enddo inner
571       enddo
572  
573 < #ifdef MPI
573 > #ifdef IS_MPI
574       point(nrow + 1) = nlist + 1
575   #else
576       point(natoms) = nlist + 1
# Line 788 | Line 584 | contains
584          JEND = POINT(i+1) - 1
585          ! check thiat molecule i has neighbors
586          if (jbeg .le. jend) then
587 < #ifdef MPI
587 > #ifdef IS_MPI
588             ljAtype_i => identPtrListRow(i)%this
589             rxi = qRow(1,i)
590             ryi = qRow(2,i)
# Line 801 | Line 597 | contains
597   #endif
598             do jnab = jbeg, jend
599                j = list(jnab)
600 < #ifdef MPI
600 > #ifdef IS_MPI
601                ljAtype_j = identPtrListColumn(j)%this
602 <              rxij = wrap(rxi - q_col(1,j), 1)
603 <              ryij = wrap(ryi - q_col(2,j), 2)
604 <              rzij = wrap(rzi - q_col(3,j), 3)
602 >              rxij = wrap(rxi - qCol(1,j), 1)
603 >              ryij = wrap(ryi - qCol(2,j), 2)
604 >              rzij = wrap(rzi - qCol(3,j), 3)
605   #else
606                ljAtype_j = identPtrList(j)%this
607                rxij = wrap(rxi - q(1,j), 1)
# Line 819 | Line 615 | contains
615                   r = dsqrt(rijsq)
616                  
617                   call getLJPot(r,pot,dudr,ljAtype_i,ljAtype_j)
618 < #ifdef MPI
618 > #ifdef IS_MPI
619                  eRow(i) = eRow(i) + pot*0.5
620                  eCol(i) = eCol(i) + pot*0.5
621   #else
# Line 835 | Line 631 | contains
631                      
632                      drdx1 = efr(dim,j) / r
633                      ftmp = dudr * drdx1
634 < #ifdef MPI
634 > #ifdef IS_MPI
635                      fCol(dim,j) = fCol(dim,j) - ftmp
636                      fRow(dim,i) = fRow(dim,i) + ftmp
637   #else                    
# Line 851 | Line 647 | contains
647  
648  
649  
650 < #ifdef MPI
650 > #ifdef IS_MPI
651      !!distribute forces
652 <    call scatter(fRow,f,plan_row3)
652 >    call scatter(fRow,f,plan_row3d)
653  
654 <    call scatter(fCol,f_tmp,plan_col3)
654 >    call scatter(fCol,fMPITemp,plan_col3d)
655  
656      do i = 1,nlocal
657 <       f(1:3,i) = f(1:3,i) + f_tmp(1:3,i)
657 >       f(1:3,i) = f(1:3,i) + fMPITemp(1:3,i)
658      end do
659  
660  
661      
662      if (do_pot) then
663   ! scatter/gather pot_row into the members of my column
664 <       call scatter(e_row,e_tmp,plan_row)
664 >       call scatter(eRow,eTemp,plan_row)
665        
666         ! scatter/gather pot_local into all other procs
667         ! add resultant to get total pot
668         do i = 1, nlocal
669 <          pe_local = pe_local + e_tmp(i)
669 >          pe_local = pe_local + eTemp(i)
670         enddo
671         if (newtons_thrd) then
672 <          e_tmp = 0.0E0_DP
673 <          call scatter(e_col,e_tmp,plan_col)
672 >          eTemp = 0.0E0_DP
673 >          call scatter(eCol,eTemp,plan_col)
674            do i = 1, nlocal
675 <             pe_local = pe_local + e_tmp(i)
675 >             pe_local = pe_local + eTemp(i)
676            enddo
677         endif
678      endif
# Line 885 | Line 681 | contains
681  
682      potE = pe
683  
684 +  
685  
686 +
687    end subroutine do_lj_ff
688  
689   !! Calculates the potential between two lj particles based on two lj_atype pointers, optionally returns second
# Line 941 | Line 739 | contains
739      epsilon  = ljMixed(atype1%atype_ident,atype2%atype_ident)%epsilon
740  
741  
742 <
742 >    
743 >
744      call getRcut(rcut,rcut2=rcut2,rcut6=rcut6,status=errorStat)
745      
746      r2 = r * r

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines