ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/UseTheForce/doForces.F90
(Generate patch)

Comparing trunk/OOPSE-2.0/src/UseTheForce/doForces.F90 (file contents):
Revision 2273 by gezelter, Thu Aug 11 21:04:03 2005 UTC vs.
Revision 2274 by gezelter, Wed Aug 17 15:26:42 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.29 2005-08-11 21:04:03 gezelter Exp $, $Date: 2005-08-11 21:04:03 $, $Name: not supported by cvs2svn $, $Revision: 1.29 $
48 > !! @version $Id: doForces.F90,v 1.30 2005-08-17 15:26:37 gezelter Exp $, $Date: 2005-08-17 15:26:37 $, $Name: not supported by cvs2svn $, $Revision: 1.30 $
49  
50  
51   module doForces
# Line 248 | Line 248 | contains
248      logical :: i_is_Shape
249  
250      integer :: myStatus, nAtypes
251 +    real(kind=dp):: thisSigma, bigSigma
252  
253      stat = 0
254      if (.not. haveInteractionHash) then
# Line 260 | Line 261 | contains
261      endif
262  
263      nAtypes = getSize(atypes)
264 <
264 >    
265      do i = 1, nAtypes
266 <       call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
267 <       call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
268 <       call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
269 <       call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
270 <       call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
271 <       call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
272 <       call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
273 <      
274 <       if (i_is_LJ) then
275 <          thisCut = getSigma(i) * DEFAULT_SIGMA_MULTIPLIER
276 <          if (thisCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisCut
266 >       if (SimHasAtype(i)) then          
267 >          call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
268 >          call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
269 >          call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
270 >          call getElementProperty(atypes, i, "is_StickyPower", i_is_StickyP)
271 >          call getElementProperty(atypes, i, "is_GayBerne", i_is_GB)
272 >          call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
273 >          call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
274 >          
275 >          if (i_is_LJ) then
276 >             thisRcut = getSigma(i) * 2.5_dp
277 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
278 >          endif
279 >          if (i_is_Elect) then
280 >             thisRcut = defaultRcut
281 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
282 >          endif
283 >          if (i_is_Sticky) then
284 >             thisRcut = getStickyCut(i)
285 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
286 >          endif
287 >          if (i_is_StickyPower) then
288 >             thisRcut = getStickyPowerCut(i)
289 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
290 >          endif
291 >          if (i_is_GayBerne) then
292 >             thisRcut = getGayBerneCut(i)
293 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
294 >          endif
295 >          if (i_is_EAM) then
296 >             thisRcut = getEAMCut(i)
297 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
298 >          endif
299 >          if (i_is_Shape) then
300 >             thisRcut = getShapeCut(i)
301 >             if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
302 >          endif
303 >          
304 >          if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then
305 >             biggestAtypeCutoff = atypeMaxCutoff(i)
306 >          endif
307         endif
308 <       if (i_is_Elect) then
309 <          thisCut =
310 <    
308 >    enddo
309 >
310 >    istart = 1
311 > #ifdef IS_MPI
312 >    iend = nGroupsInRow
313 > #else
314 >    iend = nGroups
315 > #endif
316 >    outer: do i = istart, iend
317  
318 +       n_in_i = groupStartRow(i+1) - groupStartRow(i)
319  
320 + #ifdef IS_MPI
321 +             jstart = 1
322 +             jend = nGroupsInCol
323 + #else
324 +             jstart = i+1
325 +             jend = nGroups
326 + #endif
327  
328 +
329 +
330 +            
331 +
332 +
333 +
334       haveGtypeCutoffMap = .true.
335     end subroutine createGtypeCutoffMap
336  
# Line 608 | Line 659 | contains
659         iend = nGroups - 1
660   #endif
661         outer: do i = istart, iend
611
612 #ifdef IS_MPI
613             me_i = atid_row(i)
614 #else
615             me_i = atid(i)
616 #endif
662  
663            if (update_nlist) point(i) = nlist + 1
664  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines