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 2503 by gezelter, Thu Dec 8 22:04:40 2005 UTC vs.
Revision 2512 by gezelter, Thu Dec 15 21:43:16 2005 UTC

# Line 45 | Line 45
45  
46   !! @author Charles F. Vardeman II
47   !! @author Matthew Meineke
48 < !! @version $Id: doForces.F90,v 1.70 2005-12-08 22:04:40 gezelter Exp $, $Date: 2005-12-08 22:04:40 $, $Name: not supported by cvs2svn $, $Revision: 1.70 $
48 > !! @version $Id: doForces.F90,v 1.71 2005-12-15 21:43:16 gezelter Exp $, $Date: 2005-12-15 21:43:16 $, $Name: not supported by cvs2svn $, $Revision: 1.71 $
49  
50  
51   module doForces
# Line 436 | Line 436 | contains
436               groupMaxCutoffRow(i)=atypeMaxCutoff(me_i)
437            endif          
438         enddo
439
439         if (nGroupTypesRow.eq.0) then
440            nGroupTypesRow = nGroupTypesRow + 1
441            gtypeMaxCutoffRow(nGroupTypesRow) = groupMaxCutoffRow(i)
# Line 579 | Line 578 | contains
578  
579       localError = 0
580       call setLJDefaultCutoff( defaultRcut, defaultDoShift )
581 +     call setElectrostaticCutoffRadius( defaultRcut, defaultRsw )
582       call setCutoffEAM( defaultRcut, localError)
583       if (localError /= 0) then
584         write(errMsg, *) 'An error has occured in setting the EAM cutoff'
585         call handleError("setCutoffs", errMsg)
586       end if
587       call set_switch(GROUP_SWITCH, defaultRsw, defaultRcut)
588 <    
588 >
589       haveDefaultCutoffs = .true.
590 +     haveGtypeCutoffMap = .false.
591     end subroutine setCutoffs
592  
593     subroutine cWasLame()
# Line 602 | Line 603 | contains
603      
604       cutoffPolicy = cutPolicy
605       haveCutoffPolicy = .true.
606 <     write(*,*) 'have cutoffPolicy in F = ', cutPolicy
606 <
607 <     call createGtypeCutoffMap()
606 >     haveGtypeCutoffMap = .false.
607      
608     end subroutine setCutoffPolicy
609    
# Line 622 | Line 621 | contains
621       real(kind=dp), intent(in) :: thisSkin
622      
623       skinThickness = thisSkin
624 <     haveSkinThickness = .true.
625 <    
627 <     call createGtypeCutoffMap()
624 >     haveSkinThickness = .true.    
625 >     haveGtypeCutoffMap = .false.
626      
627     end subroutine setSkinThickness
628        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines