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

Comparing trunk/OOPSE-4/src/UseTheForce/doForces.F90 (file contents):
Revision 2280 by gezelter, Thu Sep 1 20:17:55 2005 UTC vs.
Revision 2285 by gezelter, Wed Sep 7 20:46:46 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.34 2005-09-01 20:17:55 gezelter Exp $, $Date: 2005-09-01 20:17:55 $, $Name: not supported by cvs2svn $, $Revision: 1.34 $
48 > !! @version $Id: doForces.F90,v 1.38 2005-09-07 20:46:39 gezelter Exp $, $Date: 2005-09-07 20:46:39 $, $Name: not supported by cvs2svn $, $Revision: 1.38 $
49  
50  
51   module doForces
# Line 275 | Line 275 | contains
275      nAtypes = getSize(atypes)
276      
277      do i = 1, nAtypes
278 <       if (SimHasAtype(i)) then          
278 >       if (SimHasAtype(i)) then    
279            call getElementProperty(atypes, i, "is_LennardJones", i_is_LJ)
280            call getElementProperty(atypes, i, "is_Electrostatic", i_is_Elect)
281            call getElementProperty(atypes, i, "is_Sticky", i_is_Sticky)
# Line 284 | Line 284 | contains
284            call getElementProperty(atypes, i, "is_EAM", i_is_EAM)
285            call getElementProperty(atypes, i, "is_Shape", i_is_Shape)
286            
287 +          atypeMaxCutoff(i) = 0.0_dp
288            if (i_is_LJ) then
289               thisRcut = getSigma(i) * 2.5_dp
290               if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut
# Line 327 | Line 328 | contains
328   #else
329      iend = nGroups
330   #endif
331 <
331 >    
332      !! allocate the groupToGtype and gtypeMaxCutoff here.
333 +    if(.not.allocated(groupToGtype)) then
334 +       allocate(groupToGtype(iend))
335 +       allocate(groupMaxCutoff(iend))
336 +       allocate(gtypeMaxCutoff(iend))
337 +    endif
338 +    !! first we do a single loop over the cutoff groups to find the
339 +    !! largest cutoff for any atypes present in this group.  We also
340 +    !! create gtypes at this point.
341      
333    !! first we do a single loop over the cutoff groups to find the largest cutoff for any atypes
334    !! present in this group.   We also create gtypes at this point.
342      tol = 1.0d-6
343      
344      do i = istart, iend      
# Line 366 | Line 373 | contains
373      enddo
374      
375      !! allocate the gtypeCutoffMap here.
376 <
376 >    allocate(gtypeCutoffMap(nGroupTypes,nGroupTypes))
377      !! then we do a double loop over all the group TYPES to find the cutoff
378      !! map between groups of two types
379      
380      do i = 1, nGroupTypes
381         do j = 1, nGroupTypes
382        
383 +          write(*,*) 'cutoffPolicy = ', cutoffPolicy
384            select case(cutoffPolicy)
385 <             case(TRADITIONAL_CUTOFF_POLICY)
386 <                thisRcut = maxval(gtypeMaxCutoff)
387 <             case(MIX_CUTOFF_POLICY)
388 <                thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
389 <             case(MAX_CUTOFF_POLICY)
390 <                thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
391 <             case default
392 <                call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
393 <                return
394 <          end select      
395 <         gtypeCutoffMap(i,j)%rcut = thisRcut
396 <         gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
397 <         skin = defaultRlist - defaultRcut
398 <         gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
385 >          case(TRADITIONAL_CUTOFF_POLICY)
386 >             thisRcut = maxval(gtypeMaxCutoff)
387 >          case(MIX_CUTOFF_POLICY)
388 >             thisRcut = 0.5_dp * (gtypeMaxCutoff(i) + gtypeMaxCutoff(j))
389 >          case(MAX_CUTOFF_POLICY)
390 >             thisRcut = max(gtypeMaxCutoff(i), gtypeMaxCutoff(j))
391 >          case default
392 >             call handleError("createGtypeCutoffMap", "Unknown Cutoff Policy")
393 >             return
394 >          end select
395 >          gtypeCutoffMap(i,j)%rcut = thisRcut
396 >          gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut
397 >          skin = defaultRlist - defaultRcut
398 >          gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2
399 >
400         enddo
401      enddo
402      
403      haveGtypeCutoffMap = .true.
404 <   end subroutine createGtypeCutoffMap
405 <
406 <   subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
407 <     real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
408 <     integer, intent(in) :: cutPolicy
409 <
410 <     defaultRcut = defRcut
411 <     defaultRsw = defRsw
412 <     defaultRlist = defRlist
413 <     cutoffPolicy = cutPolicy
414 <   end subroutine setDefaultCutoffs
415 <
416 <   subroutine setCutoffPolicy(cutPolicy)
404 >    
405 >  end subroutine createGtypeCutoffMap
406 >  
407 >  subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy)
408 >    real(kind=dp),intent(in) :: defRcut, defRsw, defRlist
409 >    integer, intent(in) :: cutPolicy
410 >    
411 >    defaultRcut = defRcut
412 >    defaultRsw = defRsw
413 >    defaultRlist = defRlist
414 >    cutoffPolicy = cutPolicy
415 >  end subroutine setDefaultCutoffs
416 >  
417 >  subroutine setCutoffPolicy(cutPolicy)
418  
419       integer, intent(in) :: cutPolicy
420       cutoffPolicy = cutPolicy
# Line 457 | Line 467 | contains
467         call setSimVariables()
468      endif
469  
470 <    if (.not. haveRlist) then
471 <       write(default_error, *) 'rList has not been set in doForces!'
472 <       error = -1
473 <       return
474 <    endif
470 >  !  if (.not. haveRlist) then
471 >  !     write(default_error, *) 'rList has not been set in doForces!'
472 >  !     error = -1
473 >  !     return
474 >  !  endif
475  
476      if (.not. haveNeighborList) then
477         write(default_error, *) 'neighbor list has not been initialized in doForces!'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines