ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/do_Forces.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/do_Forces.F90 (file contents):
Revision 891 by mmeineke, Fri Dec 19 20:36:35 2003 UTC vs.
Revision 894 by chuckv, Mon Jan 5 21:00:05 2004 UTC

# Line 4 | Line 4
4  
5   !! @author Charles F. Vardeman II
6   !! @author Matthew Meineke
7 < !! @version $Id: do_Forces.F90,v 1.40 2003-12-19 20:36:35 mmeineke Exp $, $Date: 2003-12-19 20:36:35 $, $Name: not supported by cvs2svn $, $Revision: 1.40 $
7 > !! @version $Id: do_Forces.F90,v 1.41 2004-01-05 21:00:05 chuckv Exp $, $Date: 2004-01-05 21:00:05 $, $Name: not supported by cvs2svn $, $Revision: 1.41 $
8  
9   module do_Forces
10    use force_globals
# Line 721 | Line 721 | contains
721      logical :: is_EAM_i,is_EAM_j
722      logical :: is_Sticky_i, is_Sticky_j
723      integer :: me_i, me_j
724 <
724 >    integer :: propPack_i
725 >    integer :: propPack_j
726      r = sqrt(rijsq)
727  
728   #ifdef IS_MPI
# Line 738 | Line 739 | contains
739      me_j = atid(j)
740  
741   #endif
742 +
743 +    call getElementProperty(atypes, me_i, "propertyPack", propPack_i)
744 +    call getElementProperty(atypes, me_j, "propertyPack", propPack_j)
745 +    
746 +    ! unpack the properties
747 +
748 +    if (iand(propPack_i, LJ_PROPERTY_MASK) .eq. LJ_PROPERTY_MASK) is_LJ_i = .true.
749 +    if (iand(propPack_i, DP_PROPERTY_MASK) .eq. DP_PROPERTY_MASK) is_DP_i = .true.
750 +    if (iand(propPack_i, STICKY_PROPERTY_MASK) .eq. STICKY_PROPERTY_MASK) is_Sticky_i = .true.
751 +    if (iand(propPack_i, GB_PROPERTY_MASK) .eq. GB_PROPERTY_MASK) is_GB_i = .true.
752 +    if (iand(propPack_i, EAM_PROPERTY_MASK) .eq. EAM_PROPERTY_MASK) is_EAM_i = .true.
753 +
754 +    if (iand(propPack_j, LJ_PROPERTY_MASK) .eq. LJ_PROPERTY_MASK) is_LJ_j = .true.
755 +    if (iand(propPack_j, DP_PROPERTY_MASK) .eq. DP_PROPERTY_MASK) is_DP_j = .true.
756 +    if (iand(propPack_j, STICKY_PROPERTY_MASK) .eq. STICKY_PROPERTY_MASK) is_Sticky_j = .true.
757 +    if (iand(propPack_j, GB_PROPERTY_MASK) .eq. GB_PROPERTY_MASK) is_GB_j = .true.
758 +    if (iand(propPack_j, EAM_PROPERTY_MASK) .eq. EAM_PROPERTY_MASK) is_EAM_j = .true.
759  
760 +
761      if (FF_uses_LJ .and. SimUsesLJ()) then
743       call getElementProperty(atypes, me_i, "is_LJ", is_LJ_i)
744       call getElementProperty(atypes, me_j, "is_LJ", is_LJ_j)
762  
763         if ( is_LJ_i .and. is_LJ_j ) &
764              call do_lj_pair(i, j, d, r, rijsq, pot, f, do_pot, do_stress)
765 +
766      endif
767  
768      if (FF_uses_dipoles .and. SimUsesDipoles()) then
751       call getElementProperty(atypes, me_i, "is_DP", is_DP_i)
752       call getElementProperty(atypes, me_j, "is_DP", is_DP_j)
769        
770         if ( is_DP_i .and. is_DP_j ) then
771            call do_dipole_pair(i, j, d, r, rijsq, pot, u_l, f, t, &
# Line 764 | Line 780 | contains
780  
781      if (FF_uses_Sticky .and. SimUsesSticky()) then
782  
767       call getElementProperty(atypes, me_i, "is_Sticky", is_Sticky_i)
768       call getElementProperty(atypes, me_j, "is_Sticky", is_Sticky_j)
769
783         if ( is_Sticky_i .and. is_Sticky_j ) then
784            call do_sticky_pair(i, j, d, r, rijsq, A, pot, f, t, &
785                 do_pot, do_stress)
# Line 775 | Line 788 | contains
788  
789  
790      if (FF_uses_GB .and. SimUsesGB()) then
778
779
780       call getElementProperty(atypes, me_i, "is_GB", is_GB_i)
781       call getElementProperty(atypes, me_j, "is_GB", is_GB_j)
791        
792         if ( is_GB_i .and. is_GB_j ) then
793            call do_gb_pair(i, j, d, r, rijsq, u_l, pot, f, t, &
794                 do_pot, do_stress)          
795         endif
796 +
797      endif
798      
799  
800    
801     if (FF_uses_EAM .and. SimUsesEAM()) then
792      call getElementProperty(atypes, me_i, "is_EAM", is_EAM_i)
793      call getElementProperty(atypes, me_j, "is_EAM", is_EAM_j)
802        
803        if ( is_EAM_i .and. is_EAM_j ) &
804             call do_eam_pair(i, j, d, r, rijsq, pot, f, do_pot, do_stress)
797   endif
798
805  
806 <
806 >   endif
807  
808    end subroutine do_pair
809  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines