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

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/electrostatic.F90 (file contents):
Revision 2355 by chuckv, Wed Oct 12 18:59:16 2005 UTC vs.
Revision 2439 by chrisfen, Tue Nov 15 19:42:22 2005 UTC

# Line 58 | Line 58 | module electrostatic_module
58   #define __FORTRAN90
59   #include "UseTheForce/DarkSide/fInteractionMap.h"
60   #include "UseTheForce/DarkSide/fElectrostaticSummationMethod.h"
61 + #include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
62  
63  
64    !! these prefactors convert the multipole interactions into kcal / mol
# Line 74 | Line 75 | module electrostatic_module
75    !! This unit is also known affectionately as an esu centi-barn.
76    real(kind=dp), parameter :: pre14 = 69.13373_dp
77  
78 <  !! variables to handle different summation methods for long-range electrostatics:
78 >  !! variables to handle different summation methods for long-range
79 >  !! electrostatics:
80    integer, save :: summationMethod = NONE
81 +  integer, save :: screeningMethod = UNDAMPED
82    logical, save :: summationMethodChecked = .false.
83    real(kind=DP), save :: defaultCutoff = 0.0_DP
84 +  real(kind=DP), save :: defaultCutoff2 = 0.0_DP
85    logical, save :: haveDefaultCutoff = .false.
86    real(kind=DP), save :: dampingAlpha = 0.0_DP
87 +  real(kind=DP), save :: alpha2 = 0.0_DP
88    logical, save :: haveDampingAlpha = .false.
89 <  real(kind=DP), save :: dielectric = 0.0_DP
89 >  real(kind=DP), save :: dielectric = 1.0_DP
90    logical, save :: haveDielectric = .false.
86 –  real(kind=DP), save :: constERFC = 0.0_DP
91    real(kind=DP), save :: constEXP = 0.0_DP
92 <  logical, save :: haveDWAconstants = .false.
93 <  real(kind=dp), save :: rcuti = 0.0_dp
94 <  real(kind=dp), save :: rcuti2 = 0.0_dp
95 <  real(kind=dp), save :: rcuti3 = 0.0_dp
96 <  real(kind=dp), save :: rcuti4 = 0.0_dp
97 <  real(kind=dp), save :: alphaPi = 0.0_dp
98 <  real(kind=dp), save :: invRootPi = 0.0_dp
99 <  
92 >  real(kind=dp), save :: rcuti = 0.0_DP
93 >  real(kind=dp), save :: rcuti2 = 0.0_DP
94 >  real(kind=dp), save :: rcuti3 = 0.0_DP
95 >  real(kind=dp), save :: rcuti4 = 0.0_DP
96 >  real(kind=dp), save :: alphaPi = 0.0_DP
97 >  real(kind=dp), save :: invRootPi = 0.0_DP
98 >  real(kind=dp), save :: rrf = 1.0_DP
99 >  real(kind=dp), save :: rt = 1.0_DP
100 >  real(kind=dp), save :: rrfsq = 1.0_DP
101 >  real(kind=dp), save :: preRF = 0.0_DP
102 >  real(kind=dp), save :: preRF2 = 0.0_DP
103 >  real(kind=dp), save :: f0 = 1.0_DP
104 >  real(kind=dp), save :: f1 = 1.0_DP
105 >  real(kind=dp), save :: f2 = 0.0_DP
106 >  real(kind=dp), save :: f0c = 1.0_DP
107 >  real(kind=dp), save :: f1c = 1.0_DP
108 >  real(kind=dp), save :: f2c = 0.0_DP
109 >
110   #ifdef __IFC
111   ! error function for ifc version > 7.
112    double precision, external :: derfc
113   #endif
114    
115    public :: setElectrostaticSummationMethod
116 +  public :: setScreeningMethod
117    public :: setElectrostaticCutoffRadius
118 <  public :: setDampedWolfAlpha
118 >  public :: setDampingAlpha
119    public :: setReactionFieldDielectric
120    public :: newElectrostaticType
121    public :: setCharge
# Line 110 | Line 125 | module electrostatic_module
125    public :: doElectrostaticPair
126    public :: getCharge
127    public :: getDipoleMoment
113 –  public :: pre22
128    public :: destroyElectrostaticTypes
129 +  public :: self_self
130 +  public :: rf_self_excludes
131  
132    type :: Electrostatic
133       integer :: c_ident
# Line 141 | Line 157 | contains
157  
158    end subroutine setElectrostaticSummationMethod
159  
160 <  subroutine setElectrostaticCutoffRadius(thisRcut)
160 >  subroutine setScreeningMethod(the_SM)
161 >    integer, intent(in) :: the_SM    
162 >    screeningMethod = the_SM
163 >  end subroutine setScreeningMethod
164 >
165 >  subroutine setElectrostaticCutoffRadius(thisRcut, thisRsw)
166      real(kind=dp), intent(in) :: thisRcut
167 +    real(kind=dp), intent(in) :: thisRsw
168      defaultCutoff = thisRcut
169 +    rrf = defaultCutoff
170 +    rt = thisRsw
171      haveDefaultCutoff = .true.
172    end subroutine setElectrostaticCutoffRadius
173  
174 <  subroutine setDampedWolfAlpha(thisAlpha)
174 >  subroutine setDampingAlpha(thisAlpha)
175      real(kind=dp), intent(in) :: thisAlpha
176      dampingAlpha = thisAlpha
177 +    alpha2 = dampingAlpha*dampingAlpha
178      haveDampingAlpha = .true.
179 <  end subroutine setDampedWolfAlpha
179 >  end subroutine setDampingAlpha
180    
181    subroutine setReactionFieldDielectric(thisDielectric)
182      real(kind=dp), intent(in) :: thisDielectric
# Line 380 | Line 405 | contains
405      rcuti3 = rcuti2*rcuti
406      rcuti4 = rcuti2*rcuti2
407  
408 <    if (summationMethod .eq. DAMPED_WOLF) then
409 <       if (.not.haveDWAconstants) then
410 <          
386 <          if (.not.haveDampingAlpha) then
387 <             call handleError("checkSummationMethod", "no Damping Alpha set!")
388 <          endif
389 <          
390 <          if (.not.haveDefaultCutoff) then
391 <             call handleError("checkSummationMethod", "no Default Cutoff set!")
392 <          endif
393 <
394 <          constEXP = exp(-dampingAlpha*dampingAlpha*defaultCutoff*defaultCutoff)
395 <          constERFC = derfc(dampingAlpha*defaultCutoff)
396 <          invRootPi = 0.56418958354775628695d0
397 <          alphaPi = 2*dampingAlpha*invRootPi
398 <  
399 <          haveDWAconstants = .true.
408 >    if (screeningMethod .eq. DAMPED) then
409 >       if (.not.haveDampingAlpha) then
410 >          call handleError("checkSummationMethod", "no Damping Alpha set!")
411         endif
412 +      
413 +       if (.not.haveDefaultCutoff) then
414 +          call handleError("checkSummationMethod", "no Default Cutoff set!")
415 +       endif
416 +
417 +       constEXP = exp(-alpha2*defaultCutoff*defaultCutoff)
418 +       invRootPi = 0.56418958354775628695d0
419 +       alphaPi = 2.0d0*dampingAlpha*invRootPi
420 +       f0c = derfc(dampingAlpha*defaultCutoff)
421 +       f1c = alphaPi*defaultCutoff*constEXP + f0c
422 +       f2c = alphaPi*2.0d0*alpha2*constEXP*rcuti2
423 +
424      endif
425  
426      if (summationMethod .eq. REACTION_FIELD) then
427 <       if (.not.haveDielectric) then
428 <          call handleError("checkSummationMethod", "no reaction field Dielectric set!")
427 >       if (haveDielectric) then
428 >          defaultCutoff2 = defaultCutoff*defaultCutoff
429 >          preRF = (dielectric-1.0d0) / &
430 >               ((2.0d0*dielectric+1.0d0)*defaultCutoff2*defaultCutoff)
431 >          preRF2 = 2.0d0*preRF
432 >       else
433 >          call handleError("checkSummationMethod", "Dielectric not set")
434         endif
435 +      
436      endif
437  
438      summationMethodChecked = .true.
439    end subroutine checkSummationMethod
440  
441  
413 –
442    subroutine doElectrostaticPair(atom1, atom2, d, rij, r2, sw, &
443         vpair, fpair, pot, eFrame, f, t, do_pot)
444  
# Line 422 | Line 450 | contains
450      real(kind=dp), intent(in) :: rij, r2, sw
451      real(kind=dp), intent(in), dimension(3) :: d
452      real(kind=dp), intent(inout) :: vpair
453 <    real(kind=dp), intent(inout), dimension(3) :: fpair
453 >    real(kind=dp), intent(inout), dimension(3) :: fpair    
454  
455      real( kind = dp ) :: pot
456      real( kind = dp ), dimension(9,nLocal) :: eFrame
457      real( kind = dp ), dimension(3,nLocal) :: f
458 +    real( kind = dp ), dimension(3,nLocal) :: felec
459      real( kind = dp ), dimension(3,nLocal) :: t
460  
461      real (kind = dp), dimension(3) :: ux_i, uy_i, uz_i
# Line 444 | Line 473 | contains
473      real (kind=dp) :: cx_i, cy_i, cz_i
474      real (kind=dp) :: cx_j, cy_j, cz_j
475      real (kind=dp) :: cx2, cy2, cz2
476 <    real (kind=dp) :: ct_i, ct_j, ct_ij, a1
476 >    real (kind=dp) :: ct_i, ct_j, ct_ij, a0, a1
477      real (kind=dp) :: riji, ri, ri2, ri3, ri4
478      real (kind=dp) :: pref, vterm, epot, dudr, vterm1, vterm2
479      real (kind=dp) :: xhat, yhat, zhat
480      real (kind=dp) :: dudx, dudy, dudz
481      real (kind=dp) :: scale, sc2, bigR
482 <    real (kind=dp) :: varERFC, varEXP
483 <    real (kind=dp) :: limScale
482 >    real (kind=dp) :: varEXP
483 >    real (kind=dp) :: pot_term
484 >    real (kind=dp) :: preVal, rfVal
485  
486      if (.not.allocated(ElectrostaticMap)) then
487         call handleError("electrostatic", "no ElectrostaticMap was present before first call of do_electrostatic_pair!")
# Line 460 | Line 490 | contains
490  
491      if (.not.summationMethodChecked) then
492         call checkSummationMethod()
463 –      
493      endif
494  
466 –
495   #ifdef IS_MPI
496      me1 = atid_Row(atom1)
497      me2 = atid_Col(atom2)
# Line 472 | Line 500 | contains
500      me2 = atid(atom2)
501   #endif
502  
503 + !!$    if (rij .ge. defaultCutoff) then
504 + !!$       write(*,*) 'warning: rij = ', rij, ' rcut = ', defaultCutoff, ' sw = ', sw
505 + !!$    endif
506 +
507      !! some variables we'll need independent of electrostatic type:
508  
509      riji = 1.0d0 / rij
# Line 614 | Line 646 | contains
646      if (i_is_Charge) then
647  
648         if (j_is_Charge) then
649 +          if (screeningMethod .eq. DAMPED) then
650 +             f0 = derfc(dampingAlpha*rij)
651 +             varEXP = exp(-alpha2*rij*rij)
652 +             f1 = alphaPi*rij*varEXP + f0
653 +          endif
654  
655 <          if (summationMethod .eq. UNDAMPED_WOLF) then
655 >          preVal = pre11 * q_i * q_j
656  
657 <             vterm = pre11 * q_i * q_j * (riji - rcuti)
658 <             vpair = vpair + vterm
622 <             epot = epot + sw*vterm
657 >          if (summationMethod .eq. SHIFTED_POTENTIAL) then
658 >             vterm = preVal * (riji*f0 - rcuti*f0c)
659              
660 <             dudr  = -sw*pre11*q_i*q_j * (riji*riji-rcuti2)*riji
660 >             dudr  = -sw * preVal * riji * riji * f1
661 >  
662 >          elseif (summationMethod .eq. SHIFTED_FORCE) then
663 >             vterm = preVal * ( riji*f0 - rcuti*f0c + &
664 >                  f1c*rcuti2*(rij-defaultCutoff) )
665              
666 <             dudx = dudx + dudr * d(1)
667 <             dudy = dudy + dudr * d(2)
668 <             dudz = dudz + dudr * d(3)
669 <
670 <          elseif (summationMethod .eq. DAMPED_WOLF) then
631 <
632 <             varERFC = derfc(dampingAlpha*rij)
633 <             varEXP = exp(-dampingAlpha*dampingAlpha*rij*rij)
634 <             vterm = pre11 * q_i * q_j * (varERFC*riji - constERFC*rcuti)
635 <             vpair = vpair + vterm
636 <             epot = epot + sw*vterm
666 >             dudr  = -sw*preVal * (riji*riji*f1 - rcuti2*f1c)
667 >  
668 >          elseif (summationMethod .eq. REACTION_FIELD) then
669 >             rfVal = preRF*rij*rij
670 >             vterm = preVal * ( riji + rfVal )
671              
672 <             dudr  = -sw*pre11*q_i*q_j * ( riji*((varERFC*riji*riji &
673 <                                                  + alphaPi*varEXP) &
640 <                                                 - (constERFC*rcuti2 &
641 <                                                    + alphaPi*constEXP)) )
642 <            
643 <             dudx = dudx + dudr * d(1)
644 <             dudy = dudy + dudr * d(2)
645 <             dudz = dudz + dudr * d(3)
646 <
672 >             dudr  = sw * preVal * ( 2.0d0*rfVal - riji )*riji
673 >  
674            else
675 <
649 <             vterm = pre11 * q_i * q_j * riji
650 <             vpair = vpair + vterm
651 <             epot = epot + sw*vterm
675 >             vterm = preVal * riji*f0
676              
677 <             dudr  = - sw * vterm * riji
678 <            
655 <             dudx = dudx + dudr * xhat
656 <             dudy = dudy + dudr * yhat
657 <             dudz = dudz + dudr * zhat
658 <
677 >             dudr  = - sw * preVal * riji*riji*f1
678 >  
679            endif
680  
681 +          vpair = vpair + vterm
682 +          epot = epot + sw*vterm
683 +
684 +          dudx = dudx + dudr * xhat
685 +          dudy = dudy + dudr * yhat
686 +          dudz = dudz + dudr * zhat
687 +
688         endif
689  
690         if (j_is_Dipole) then
691  
692            pref = pre12 * q_i * mu_j
693  
694 <          if (summationMethod .eq. UNDAMPED_WOLF) then
694 >          if (summationMethod .eq. REACTION_FIELD) then
695               ri2 = riji * riji
696               ri3 = ri2 * riji
697 <
698 <             pref = pre12 * q_i * mu_j
672 <             vterm = - pref * ct_j * (ri2 - rcuti2)
697 >    
698 >             vterm = - pref * ct_j * ( ri2 - preRF2*rij )
699               vpair = vpair + vterm
700               epot = epot + sw*vterm
701              
# Line 677 | Line 703 | contains
703               !! r_j - r_i and the charge-dipole potential takes the origin
704               !! as the point dipole, which is atom j in this case.
705              
706 <             dudx = dudx - sw*pref * ( ri3*( uz_j(1) - 3.0d0*ct_j*xhat) &
707 <                  - rcuti3*( uz_j(1) - 3.0d0*ct_j*d(1)*rcuti ) )
708 <             dudy = dudy - sw*pref * ( ri3*( uz_j(2) - 3.0d0*ct_j*yhat) &
709 <                  - rcuti3*( uz_j(2) - 3.0d0*ct_j*d(2)*rcuti ) )
710 <             dudz = dudz - sw*pref * ( ri3*( uz_j(3) - 3.0d0*ct_j*zhat) &
711 <                  - rcuti3*( uz_j(3) - 3.0d0*ct_j*d(3)*rcuti ) )
712 <            
713 <             duduz_j(1) = duduz_j(1) - sw*pref*( ri2*xhat - d(1)*rcuti3 )
714 <             duduz_j(2) = duduz_j(2) - sw*pref*( ri2*yhat - d(2)*rcuti3 )
689 <             duduz_j(3) = duduz_j(3) - sw*pref*( ri2*zhat - d(3)*rcuti3 )
706 >             dudx = dudx - sw*pref*( ri3*(uz_j(1) - 3.0d0*ct_j*xhat) - &
707 >                                     preRF2*uz_j(1) )
708 >             dudy = dudy - sw*pref*( ri3*(uz_j(2) - 3.0d0*ct_j*yhat) - &
709 >                                     preRF2*uz_j(2) )
710 >             dudz = dudz - sw*pref*( ri3*(uz_j(3) - 3.0d0*ct_j*zhat) - &
711 >                                     preRF2*uz_j(3) )        
712 >             duduz_j(1) = duduz_j(1) - sw*pref * xhat * ( ri2 - preRF2*rij )
713 >             duduz_j(2) = duduz_j(2) - sw*pref * yhat * ( ri2 - preRF2*rij )
714 >             duduz_j(3) = duduz_j(3) - sw*pref * zhat * ( ri2 - preRF2*rij )
715  
716            else
717               if (j_is_SplitDipole) then
# Line 702 | Line 727 | contains
727               ri3 = ri2 * ri
728               sc2 = scale * scale
729  
705 –             pref = pre12 * q_i * mu_j
730               vterm = - pref * ct_j * ri2 * scale
731               vpair = vpair + vterm
732               epot = epot + sw*vterm
# Line 730 | Line 754 | contains
754            cy2 = cy_j * cy_j
755            cz2 = cz_j * cz_j
756  
757 <          if (summationMethod .eq. UNDAMPED_WOLF) then
758 <             pref =  pre14 * q_i / 3.0_dp
759 <             vterm1 = pref * ri3*( qxx_j * (3.0_dp*cx2 - 1.0_dp) + &
760 <                  qyy_j * (3.0_dp*cy2 - 1.0_dp) + &
761 <                  qzz_j * (3.0_dp*cz2 - 1.0_dp) )
762 <             vterm2 = pref * rcuti3*( qxx_j * (3.0_dp*cx2 - 1.0_dp) + &
739 <                  qyy_j * (3.0_dp*cy2 - 1.0_dp) + &
740 <                  qzz_j * (3.0_dp*cz2 - 1.0_dp) )
741 <             vpair = vpair + ( vterm1 - vterm2 )
742 <             epot = epot + sw*( vterm1 - vterm2 )
743 <            
744 <             dudx = dudx - (5.0_dp * &
745 <                  (vterm1*riji*xhat - vterm2*rcuti2*d(1))) + sw*pref * ( &
746 <                  (ri4 - rcuti4)*(qxx_j*(6.0_dp*cx_j*ux_j(1)) - &
747 <                  qxx_j*2.0_dp*(xhat - rcuti*d(1))) + &
748 <                  (ri4 - rcuti4)*(qyy_j*(6.0_dp*cy_j*uy_j(1)) - &
749 <                  qyy_j*2.0_dp*(xhat - rcuti*d(1))) + &
750 <                  (ri4 - rcuti4)*(qzz_j*(6.0_dp*cz_j*uz_j(1)) - &
751 <                  qzz_j*2.0_dp*(xhat - rcuti*d(1))) )
752 <             dudy = dudy - (5.0_dp * &
753 <                  (vterm1*riji*yhat - vterm2*rcuti2*d(2))) + sw*pref * ( &
754 <                  (ri4 - rcuti4)*(qxx_j*(6.0_dp*cx_j*ux_j(2)) - &
755 <                  qxx_j*2.0_dp*(yhat - rcuti*d(2))) + &
756 <                  (ri4 - rcuti4)*(qyy_j*(6.0_dp*cy_j*uy_j(2)) - &
757 <                  qyy_j*2.0_dp*(yhat - rcuti*d(2))) + &
758 <                  (ri4 - rcuti4)*(qzz_j*(6.0_dp*cz_j*uz_j(2)) - &
759 <                  qzz_j*2.0_dp*(yhat - rcuti*d(2))) )
760 <             dudz = dudz - (5.0_dp * &
761 <                  (vterm1*riji*zhat - vterm2*rcuti2*d(3))) + sw*pref * ( &
762 <                  (ri4 - rcuti4)*(qxx_j*(6.0_dp*cx_j*ux_j(3)) - &
763 <                  qxx_j*2.0_dp*(zhat - rcuti*d(3))) + &
764 <                  (ri4 - rcuti4)*(qyy_j*(6.0_dp*cy_j*uy_j(3)) - &
765 <                  qyy_j*2.0_dp*(zhat - rcuti*d(3))) + &
766 <                  (ri4 - rcuti4)*(qzz_j*(6.0_dp*cz_j*uz_j(3)) - &
767 <                  qzz_j*2.0_dp*(zhat - rcuti*d(3))) )
768 <            
769 <             dudux_j(1) = dudux_j(1) + sw*pref*(ri3*(qxx_j*6.0_dp*cx_j*xhat) -&
770 <                  rcuti4*(qxx_j*6.0_dp*cx_j*d(1)))
771 <             dudux_j(2) = dudux_j(2) + sw*pref*(ri3*(qxx_j*6.0_dp*cx_j*yhat) -&
772 <                  rcuti4*(qxx_j*6.0_dp*cx_j*d(2)))
773 <             dudux_j(3) = dudux_j(3) + sw*pref*(ri3*(qxx_j*6.0_dp*cx_j*zhat) -&
774 <                  rcuti4*(qxx_j*6.0_dp*cx_j*d(3)))
775 <            
776 <             duduy_j(1) = duduy_j(1) + sw*pref*(ri3*(qyy_j*6.0_dp*cy_j*xhat) -&
777 <                  rcuti4*(qyy_j*6.0_dp*cx_j*d(1)))
778 <             duduy_j(2) = duduy_j(2) + sw*pref*(ri3*(qyy_j*6.0_dp*cy_j*yhat) -&
779 <                  rcuti4*(qyy_j*6.0_dp*cx_j*d(2)))
780 <             duduy_j(3) = duduy_j(3) + sw*pref*(ri3*(qyy_j*6.0_dp*cy_j*zhat) -&
781 <                  rcuti4*(qyy_j*6.0_dp*cx_j*d(3)))
782 <            
783 <             duduz_j(1) = duduz_j(1) + sw*pref*(ri3*(qzz_j*6.0_dp*cz_j*xhat) -&
784 <                  rcuti4*(qzz_j*6.0_dp*cx_j*d(1)))
785 <             duduz_j(2) = duduz_j(2) + sw*pref*(ri3*(qzz_j*6.0_dp*cz_j*yhat) -&
786 <                  rcuti4*(qzz_j*6.0_dp*cx_j*d(2)))
787 <             duduz_j(3) = duduz_j(3) + sw*pref*(ri3*(qzz_j*6.0_dp*cz_j*zhat) -&
788 <                  rcuti4*(qzz_j*6.0_dp*cx_j*d(3)))
789 <        
790 <          else
791 <             pref =  pre14 * q_i / 3.0_dp
792 <             vterm = pref * ri3 * (qxx_j * (3.0_dp*cx2 - 1.0_dp) + &
793 <                  qyy_j * (3.0_dp*cy2 - 1.0_dp) + &
794 <                  qzz_j * (3.0_dp*cz2 - 1.0_dp))
795 <             vpair = vpair + vterm
796 <             epot = epot + sw*vterm
797 <            
798 <             dudx = dudx - 5.0_dp*sw*vterm*riji*xhat + sw*pref * ri4 * ( &
799 <                  qxx_j*(6.0_dp*cx_j*ux_j(1) - 2.0_dp*xhat) + &
800 <                  qyy_j*(6.0_dp*cy_j*uy_j(1) - 2.0_dp*xhat) + &
801 <                  qzz_j*(6.0_dp*cz_j*uz_j(1) - 2.0_dp*xhat) )
802 <             dudy = dudy - 5.0_dp*sw*vterm*riji*yhat + sw*pref * ri4 * ( &
803 <                  qxx_j*(6.0_dp*cx_j*ux_j(2) - 2.0_dp*yhat) + &
804 <                  qyy_j*(6.0_dp*cy_j*uy_j(2) - 2.0_dp*yhat) + &
805 <                  qzz_j*(6.0_dp*cz_j*uz_j(2) - 2.0_dp*yhat) )
806 <             dudz = dudz - 5.0_dp*sw*vterm*riji*zhat + sw*pref * ri4 * ( &
807 <                  qxx_j*(6.0_dp*cx_j*ux_j(3) - 2.0_dp*zhat) + &
808 <                  qyy_j*(6.0_dp*cy_j*uy_j(3) - 2.0_dp*zhat) + &
809 <                  qzz_j*(6.0_dp*cz_j*uz_j(3) - 2.0_dp*zhat) )
810 <            
811 <             dudux_j(1) = dudux_j(1) + sw*pref * ri3*(qxx_j*6.0_dp*cx_j*xhat)
812 <             dudux_j(2) = dudux_j(2) + sw*pref * ri3*(qxx_j*6.0_dp*cx_j*yhat)
813 <             dudux_j(3) = dudux_j(3) + sw*pref * ri3*(qxx_j*6.0_dp*cx_j*zhat)
814 <            
815 <             duduy_j(1) = duduy_j(1) + sw*pref * ri3*(qyy_j*6.0_dp*cy_j*xhat)
816 <             duduy_j(2) = duduy_j(2) + sw*pref * ri3*(qyy_j*6.0_dp*cy_j*yhat)
817 <             duduy_j(3) = duduy_j(3) + sw*pref * ri3*(qyy_j*6.0_dp*cy_j*zhat)
818 <            
819 <             duduz_j(1) = duduz_j(1) + sw*pref * ri3*(qzz_j*6.0_dp*cz_j*xhat)
820 <             duduz_j(2) = duduz_j(2) + sw*pref * ri3*(qzz_j*6.0_dp*cz_j*yhat)
821 <             duduz_j(3) = duduz_j(3) + sw*pref * ri3*(qzz_j*6.0_dp*cz_j*zhat)
757 >          pref =  pre14 * q_i / 3.0_dp
758 >          vterm = pref * ri3 * (qxx_j * (3.0_dp*cx2 - 1.0_dp) + &
759 >               qyy_j * (3.0_dp*cy2 - 1.0_dp) + &
760 >               qzz_j * (3.0_dp*cz2 - 1.0_dp))
761 >          vpair = vpair + vterm
762 >          epot = epot + sw*vterm
763            
764 <          endif
764 >          dudx = dudx - 5.0_dp*sw*vterm*riji*xhat + sw*pref * ri4 * ( &
765 >               qxx_j*(6.0_dp*cx_j*ux_j(1) - 2.0_dp*xhat) + &
766 >               qyy_j*(6.0_dp*cy_j*uy_j(1) - 2.0_dp*xhat) + &
767 >               qzz_j*(6.0_dp*cz_j*uz_j(1) - 2.0_dp*xhat) )
768 >          dudy = dudy - 5.0_dp*sw*vterm*riji*yhat + sw*pref * ri4 * ( &
769 >               qxx_j*(6.0_dp*cx_j*ux_j(2) - 2.0_dp*yhat) + &
770 >               qyy_j*(6.0_dp*cy_j*uy_j(2) - 2.0_dp*yhat) + &
771 >               qzz_j*(6.0_dp*cz_j*uz_j(2) - 2.0_dp*yhat) )
772 >          dudz = dudz - 5.0_dp*sw*vterm*riji*zhat + sw*pref * ri4 * ( &
773 >               qxx_j*(6.0_dp*cx_j*ux_j(3) - 2.0_dp*zhat) + &
774 >               qyy_j*(6.0_dp*cy_j*uy_j(3) - 2.0_dp*zhat) + &
775 >               qzz_j*(6.0_dp*cz_j*uz_j(3) - 2.0_dp*zhat) )
776 >          
777 >          dudux_j(1) = dudux_j(1) + sw*pref * ri3*(qxx_j*6.0_dp*cx_j*xhat)
778 >          dudux_j(2) = dudux_j(2) + sw*pref * ri3*(qxx_j*6.0_dp*cx_j*yhat)
779 >          dudux_j(3) = dudux_j(3) + sw*pref * ri3*(qxx_j*6.0_dp*cx_j*zhat)
780 >          
781 >          duduy_j(1) = duduy_j(1) + sw*pref * ri3*(qyy_j*6.0_dp*cy_j*xhat)
782 >          duduy_j(2) = duduy_j(2) + sw*pref * ri3*(qyy_j*6.0_dp*cy_j*yhat)
783 >          duduy_j(3) = duduy_j(3) + sw*pref * ri3*(qyy_j*6.0_dp*cy_j*zhat)
784 >          
785 >          duduz_j(1) = duduz_j(1) + sw*pref * ri3*(qzz_j*6.0_dp*cz_j*xhat)
786 >          duduz_j(2) = duduz_j(2) + sw*pref * ri3*(qzz_j*6.0_dp*cz_j*yhat)
787 >          duduz_j(3) = duduz_j(3) + sw*pref * ri3*(qzz_j*6.0_dp*cz_j*zhat)
788 >          
789         endif
790      endif
791 <
791 >    
792      if (i_is_Dipole) then
793  
794         if (j_is_Charge) then
795            
796            pref = pre12 * q_j * mu_i
797            
798 <          if (summationMethod .eq. UNDAMPED_WOLF) then
798 >          if (summationMethod .eq. SHIFTED_POTENTIAL) then
799               ri2 = riji * riji
800               ri3 = ri2 * riji
801 +            
802 +             pot_term = ri2 - rcuti2
803 +             vterm = pref * ct_i * pot_term
804 +             vpair = vpair + vterm
805 +             epot = epot + sw*vterm
806 +            
807 +             dudx = dudx + sw*pref * ( ri3*(uz_i(1)-3.0d0*ct_i*xhat) )
808 +             dudy = dudy + sw*pref * ( ri3*(uz_i(2)-3.0d0*ct_i*yhat) )
809 +             dudz = dudz + sw*pref * ( ri3*(uz_i(3)-3.0d0*ct_i*zhat) )
810 +            
811 +             duduz_i(1) = duduz_i(1) + sw*pref * xhat * pot_term
812 +             duduz_i(2) = duduz_i(2) + sw*pref * yhat * pot_term
813 +             duduz_i(3) = duduz_i(3) + sw*pref * zhat * pot_term
814  
815 <             pref = pre12 * q_j * mu_i
816 <             vterm = pref * ct_i * (ri2 - rcuti2)
815 >          elseif (summationMethod .eq. SHIFTED_FORCE) then
816 >             ri2 = riji * riji
817 >             ri3 = ri2 * riji
818 >
819 >             pot_term = ri2 - rcuti2 + 2.0d0*rcuti3*( rij - defaultCutoff )
820 >             vterm = pref * ct_i * pot_term
821               vpair = vpair + vterm
822               epot = epot + sw*vterm
823              
824 <             !! this has a + sign in the () because the rij vector is
825 <             !! r_j - r_i and the charge-dipole potential takes the origin
826 <             !! as the point dipole, which is atom j in this case.
824 >             dudx = dudx + sw*pref * ( (ri3-rcuti3)*(uz_i(1)-3.0d0*ct_i*xhat) )
825 >             dudy = dudy + sw*pref * ( (ri3-rcuti3)*(uz_i(2)-3.0d0*ct_i*yhat) )
826 >             dudz = dudz + sw*pref * ( (ri3-rcuti3)*(uz_i(3)-3.0d0*ct_i*zhat) )
827              
828 <             dudx = dudx + sw*pref * ( ri3*( uz_i(1) - 3.0d0*ct_i*xhat) &
829 <                  - rcuti3*( uz_i(1) - 3.0d0*ct_i*d(1)*rcuti ) )
830 <             dudy = dudy + sw*pref * ( ri3*( uz_i(2) - 3.0d0*ct_i*yhat) &
831 <                  - rcuti3*( uz_i(2) - 3.0d0*ct_i*d(2)*rcuti ) )
832 <             dudz = dudz + sw*pref * ( ri3*( uz_i(3) - 3.0d0*ct_i*zhat) &
833 <                  - rcuti3*( uz_i(3) - 3.0d0*ct_i*d(3)*rcuti ) )
828 >             duduz_i(1) = duduz_i(1) + sw*pref * xhat * pot_term
829 >             duduz_i(2) = duduz_i(2) + sw*pref * yhat * pot_term
830 >             duduz_i(3) = duduz_i(3) + sw*pref * zhat * pot_term
831 >
832 >          elseif (summationMethod .eq. REACTION_FIELD) then
833 >             ri2 = riji * riji
834 >             ri3 = ri2 * riji
835 >
836 >             vterm = pref * ct_i * ( ri2 - preRF2*rij )
837 >             vpair = vpair + vterm
838 >             epot = epot + sw*vterm
839              
840 <             duduz_i(1) = duduz_i(1) - sw*pref*( ri2*xhat - d(1)*rcuti3 )
841 <             duduz_i(2) = duduz_i(2) - sw*pref*( ri2*yhat - d(2)*rcuti3 )
842 <             duduz_i(3) = duduz_i(3) - sw*pref*( ri2*zhat - d(3)*rcuti3 )
840 >             dudx = dudx + sw*pref * ( ri3*(uz_i(1) - 3.0d0*ct_i*xhat) - &
841 >                  preRF2*uz_i(1) )
842 >             dudy = dudy + sw*pref * ( ri3*(uz_i(2) - 3.0d0*ct_i*yhat) - &
843 >                  preRF2*uz_i(2) )
844 >             dudz = dudz + sw*pref * ( ri3*(uz_i(3) - 3.0d0*ct_i*zhat) - &
845 >                  preRF2*uz_i(3) )
846 >            
847 >             duduz_i(1) = duduz_i(1) + sw*pref * xhat * ( ri2 - preRF2*rij )
848 >             duduz_i(2) = duduz_i(2) + sw*pref * yhat * ( ri2 - preRF2*rij )
849 >             duduz_i(3) = duduz_i(3) + sw*pref * zhat * ( ri2 - preRF2*rij )
850  
851            else
852               if (i_is_SplitDipole) then
# Line 868 | Line 862 | contains
862               ri3 = ri2 * ri
863               sc2 = scale * scale
864  
871 –             pref = pre12 * q_j * mu_i
865               vterm = pref * ct_i * ri2 * scale
866               vpair = vpair + vterm
867               epot = epot + sw*vterm
# Line 884 | Line 877 | contains
877         endif
878        
879         if (j_is_Dipole) then
880 +          ct_ij = uz_i(1)*uz_j(1) + uz_i(2)*uz_j(2) + uz_i(3)*uz_j(3)
881 +          
882 +          ri2 = riji * riji
883 +          ri3 = ri2 * riji
884 +          ri4 = ri2 * ri2
885 +          
886 +          pref = pre22 * mu_i * mu_j
887  
888 <          if (summationMethod .eq. UNDAMPED_WOLF) then
889 <             ri2 = riji * riji
890 <             ri3 = ri2 * riji
891 <             ri4 = ri2 * ri2
892 <
893 <             pref = pre22 * mu_i * mu_j
894 <             vterm = pref * (ri3 - rcuti3) * (ct_ij - 3.0d0 * ct_i * ct_j)
888 >          if (summationMethod .eq. REACTION_FIELD) then
889 >             vterm = pref*( ri3*(ct_ij - 3.0d0 * ct_i * ct_j) - &
890 >                  preRF2*ct_ij )
891               vpair = vpair + vterm
892               epot = epot + sw*vterm
893              
894               a1 = 5.0d0 * ct_i * ct_j - ct_ij
895              
896               dudx = dudx + sw*pref*3.0d0*ri4 &
897 <                             * (a1*xhat-ct_i*uz_j(1)-ct_j*uz_i(1)) &
902 <                         - sw*pref*3.0d0*rcuti4 &
903 <                             * (a1*rcuti*d(1)-ct_i*uz_j(1)-ct_j*uz_i(1))
897 >                             * (a1*xhat-ct_i*uz_j(1)-ct_j*uz_i(1))
898               dudy = dudy + sw*pref*3.0d0*ri4 &
899 <                             * (a1*yhat-ct_i*uz_j(2)-ct_j*uz_i(2)) &
906 <                         - sw*pref*3.0d0*rcuti4 &
907 <                             * (a1*rcuti*d(2)-ct_i*uz_j(2)-ct_j*uz_i(2))
899 >                             * (a1*yhat-ct_i*uz_j(2)-ct_j*uz_i(2))
900               dudz = dudz + sw*pref*3.0d0*ri4 &
901 <                             * (a1*zhat-ct_i*uz_j(3)-ct_j*uz_i(3)) &
910 <                         - sw*pref*3.0d0*rcuti4 &
911 <                             * (a1*rcuti*d(3)-ct_i*uz_j(3)-ct_j*uz_i(3))
901 >                             * (a1*zhat-ct_i*uz_j(3)-ct_j*uz_i(3))
902              
903               duduz_i(1) = duduz_i(1) + sw*pref*(ri3*(uz_j(1)-3.0d0*ct_j*xhat) &
904 <                  - rcuti3*(uz_j(1) - 3.0d0*ct_j*d(1)*rcuti))
904 >                  - preRF2*uz_j(1))
905               duduz_i(2) = duduz_i(2) + sw*pref*(ri3*(uz_j(2)-3.0d0*ct_j*yhat) &
906 <                  - rcuti3*(uz_j(2) - 3.0d0*ct_j*d(2)*rcuti))
906 >                  - preRF2*uz_j(2))
907               duduz_i(3) = duduz_i(3) + sw*pref*(ri3*(uz_j(3)-3.0d0*ct_j*zhat) &
908 <                  - rcuti3*(uz_j(3) - 3.0d0*ct_j*d(3)*rcuti))
908 >                  - preRF2*uz_j(3))
909               duduz_j(1) = duduz_j(1) + sw*pref*(ri3*(uz_i(1)-3.0d0*ct_i*xhat) &
910 <                  - rcuti3*(uz_i(1) - 3.0d0*ct_i*d(1)*rcuti))
910 >                  - preRF2*uz_i(1))
911               duduz_j(2) = duduz_j(2) + sw*pref*(ri3*(uz_i(2)-3.0d0*ct_i*yhat) &
912 <                  - rcuti3*(uz_i(2) - 3.0d0*ct_i*d(2)*rcuti))
912 >                  - preRF2*uz_i(2))
913               duduz_j(3) = duduz_j(3) + sw*pref*(ri3*(uz_i(3)-3.0d0*ct_i*zhat) &
914 <                  - rcuti3*(uz_i(3) - 3.0d0*ct_i*d(3)*rcuti))
914 >                  - preRF2*uz_i(3))
915  
916            else
917               if (i_is_SplitDipole) then
# Line 943 | Line 933 | contains
933                  endif
934               endif
935              
946 –             ct_ij = uz_i(1)*uz_j(1) + uz_i(2)*uz_j(2) + uz_i(3)*uz_j(3)
947 –            
948 –             ri2 = ri * ri
949 –             ri3 = ri2 * ri
950 –             ri4 = ri2 * ri2
936               sc2 = scale * scale
937 <            
953 <             pref = pre22 * mu_i * mu_j
937 >
938               vterm = pref * ri3 * (ct_ij - 3.0d0 * ct_i * ct_j * sc2)
939               vpair = vpair + vterm
940               epot = epot + sw*vterm
# Line 983 | Line 967 | contains
967  
968      if (i_is_Quadrupole) then
969         if (j_is_Charge) then
986 –
970            ri2 = riji * riji
971            ri3 = ri2 * riji
972            ri4 = ri2 * ri2
# Line 991 | Line 974 | contains
974            cy2 = cy_i * cy_i
975            cz2 = cz_i * cz_i
976  
977 <          if (summationMethod .eq. UNDAMPED_WOLF) then
978 <             pref = pre14 * q_j / 3.0_dp
979 <             vterm1 = pref * ri3*( qxx_i * (3.0_dp*cx2 - 1.0_dp) + &
980 <                  qyy_i * (3.0_dp*cy2 - 1.0_dp) + &
981 <                  qzz_i * (3.0_dp*cz2 - 1.0_dp) )
982 <             vterm2 = pref * rcuti3*( qxx_i * (3.0_dp*cx2 - 1.0_dp) + &
983 <                  qyy_i * (3.0_dp*cy2 - 1.0_dp) + &
984 <                  qzz_i * (3.0_dp*cz2 - 1.0_dp) )
985 <             vpair = vpair + ( vterm1 - vterm2 )
986 <             epot = epot + sw*( vterm1 - vterm2 )
987 <            
988 <             dudx = dudx - sw*(5.0_dp*(vterm1*riji*xhat-vterm2*rcuti2*d(1))) +&
989 <                  sw*pref * ( (ri4 - rcuti4)*(qxx_i*(6.0_dp*cx_i*ux_i(1)) - &
990 <                  qxx_i*2.0_dp*(xhat - rcuti*d(1))) + &
991 <                  (ri4 - rcuti4)*(qyy_i*(6.0_dp*cy_i*uy_i(1)) - &
992 <                  qyy_i*2.0_dp*(xhat - rcuti*d(1))) + &
993 <                  (ri4 - rcuti4)*(qzz_i*(6.0_dp*cz_i*uz_i(1)) - &
994 <                  qzz_i*2.0_dp*(xhat - rcuti*d(1))) )
995 <             dudy = dudy - sw*(5.0_dp*(vterm1*riji*yhat-vterm2*rcuti2*d(2))) +&
996 <                  sw*pref * ( (ri4 - rcuti4)*(qxx_i*(6.0_dp*cx_i*ux_i(2)) - &
997 <                  qxx_i*2.0_dp*(yhat - rcuti*d(2))) + &
998 <                  (ri4 - rcuti4)*(qyy_i*(6.0_dp*cy_i*uy_i(2)) - &
999 <                  qyy_i*2.0_dp*(yhat - rcuti*d(2))) + &
1000 <                  (ri4 - rcuti4)*(qzz_i*(6.0_dp*cz_i*uz_i(2)) - &
1001 <                  qzz_i*2.0_dp*(yhat - rcuti*d(2))) )
1002 <             dudz = dudz - sw*(5.0_dp*(vterm1*riji*zhat-vterm2*rcuti2*d(3))) +&
1003 <                  sw*pref * ( (ri4 - rcuti4)*(qxx_i*(6.0_dp*cx_i*ux_i(3)) - &
1004 <                  qxx_i*2.0_dp*(zhat - rcuti*d(3))) + &
1005 <                  (ri4 - rcuti4)*(qyy_i*(6.0_dp*cy_i*uy_i(3)) - &
1006 <                  qyy_i*2.0_dp*(zhat - rcuti*d(3))) + &
1007 <                  (ri4 - rcuti4)*(qzz_i*(6.0_dp*cz_i*uz_i(3)) - &
1025 <                  qzz_i*2.0_dp*(zhat - rcuti*d(3))) )
1026 <            
1027 <             dudux_i(1) = dudux_i(1) + sw*pref*(ri3*(qxx_i*6.0_dp*cx_i*xhat) -&
1028 <                  rcuti4*(qxx_i*6.0_dp*cx_i*d(1)))
1029 <             dudux_i(2) = dudux_i(2) + sw*pref*(ri3*(qxx_i*6.0_dp*cx_i*yhat) -&
1030 <                  rcuti4*(qxx_i*6.0_dp*cx_i*d(2)))
1031 <             dudux_i(3) = dudux_i(3) + sw*pref*(ri3*(qxx_i*6.0_dp*cx_i*zhat) -&
1032 <                  rcuti4*(qxx_i*6.0_dp*cx_i*d(3)))
1033 <            
1034 <             duduy_i(1) = duduy_i(1) + sw*pref*(ri3*(qyy_i*6.0_dp*cy_i*xhat) -&
1035 <                  rcuti4*(qyy_i*6.0_dp*cx_i*d(1)))
1036 <             duduy_i(2) = duduy_i(2) + sw*pref*(ri3*(qyy_i*6.0_dp*cy_i*yhat) -&
1037 <                  rcuti4*(qyy_i*6.0_dp*cx_i*d(2)))
1038 <             duduy_i(3) = duduy_i(3) + sw*pref*(ri3*(qyy_i*6.0_dp*cy_i*zhat) -&
1039 <                  rcuti4*(qyy_i*6.0_dp*cx_i*d(3)))
1040 <            
1041 <             duduz_i(1) = duduz_i(1) + sw*pref*(ri3*(qzz_i*6.0_dp*cz_i*xhat) -&
1042 <                  rcuti4*(qzz_i*6.0_dp*cx_i*d(1)))
1043 <             duduz_i(2) = duduz_i(2) + sw*pref*(ri3*(qzz_i*6.0_dp*cz_i*yhat) -&
1044 <                  rcuti4*(qzz_i*6.0_dp*cx_i*d(2)))
1045 <             duduz_i(3) = duduz_i(3) + sw*pref*(ri3*(qzz_i*6.0_dp*cz_i*zhat) -&
1046 <                  rcuti4*(qzz_i*6.0_dp*cx_i*d(3)))
977 >          pref = pre14 * q_j / 3.0_dp
978 >          vterm = pref * ri3 * (qxx_i * (3.0_dp*cx2 - 1.0_dp) + &
979 >               qyy_i * (3.0_dp*cy2 - 1.0_dp) + &
980 >               qzz_i * (3.0_dp*cz2 - 1.0_dp))
981 >          vpair = vpair + vterm
982 >          epot = epot + sw*vterm
983 >          
984 >          dudx = dudx - 5.0_dp*sw*vterm*riji*xhat + sw*pref*ri4 * ( &
985 >               qxx_i*(6.0_dp*cx_i*ux_i(1) - 2.0_dp*xhat) + &
986 >               qyy_i*(6.0_dp*cy_i*uy_i(1) - 2.0_dp*xhat) + &
987 >               qzz_i*(6.0_dp*cz_i*uz_i(1) - 2.0_dp*xhat) )
988 >          dudy = dudy - 5.0_dp*sw*vterm*riji*yhat + sw*pref*ri4 * ( &
989 >               qxx_i*(6.0_dp*cx_i*ux_i(2) - 2.0_dp*yhat) + &
990 >               qyy_i*(6.0_dp*cy_i*uy_i(2) - 2.0_dp*yhat) + &
991 >               qzz_i*(6.0_dp*cz_i*uz_i(2) - 2.0_dp*yhat) )
992 >          dudz = dudz - 5.0_dp*sw*vterm*riji*zhat + sw*pref*ri4 * ( &
993 >               qxx_i*(6.0_dp*cx_i*ux_i(3) - 2.0_dp*zhat) + &
994 >               qyy_i*(6.0_dp*cy_i*uy_i(3) - 2.0_dp*zhat) + &
995 >               qzz_i*(6.0_dp*cz_i*uz_i(3) - 2.0_dp*zhat) )
996 >          
997 >          dudux_i(1) = dudux_i(1) + sw*pref*ri3*(qxx_i*6.0_dp*cx_i*xhat)
998 >          dudux_i(2) = dudux_i(2) + sw*pref*ri3*(qxx_i*6.0_dp*cx_i*yhat)
999 >          dudux_i(3) = dudux_i(3) + sw*pref*ri3*(qxx_i*6.0_dp*cx_i*zhat)
1000 >          
1001 >          duduy_i(1) = duduy_i(1) + sw*pref*ri3*(qyy_i*6.0_dp*cy_i*xhat)
1002 >          duduy_i(2) = duduy_i(2) + sw*pref*ri3*(qyy_i*6.0_dp*cy_i*yhat)
1003 >          duduy_i(3) = duduy_i(3) + sw*pref*ri3*(qyy_i*6.0_dp*cy_i*zhat)
1004 >          
1005 >          duduz_i(1) = duduz_i(1) + sw*pref*ri3*(qzz_i*6.0_dp*cz_i*xhat)
1006 >          duduz_i(2) = duduz_i(2) + sw*pref*ri3*(qzz_i*6.0_dp*cz_i*yhat)
1007 >          duduz_i(3) = duduz_i(3) + sw*pref*ri3*(qzz_i*6.0_dp*cz_i*zhat)
1008  
1048 –          else
1049 –             pref = pre14 * q_j / 3.0_dp
1050 –             vterm = pref * ri3 * (qxx_i * (3.0_dp*cx2 - 1.0_dp) + &
1051 –                  qyy_i * (3.0_dp*cy2 - 1.0_dp) + &
1052 –                  qzz_i * (3.0_dp*cz2 - 1.0_dp))
1053 –             vpair = vpair + vterm
1054 –             epot = epot + sw*vterm
1055 –            
1056 –             dudx = dudx - 5.0_dp*sw*vterm*riji*xhat + sw*pref*ri4 * ( &
1057 –                  qxx_i*(6.0_dp*cx_i*ux_i(1) - 2.0_dp*xhat) + &
1058 –                  qyy_i*(6.0_dp*cy_i*uy_i(1) - 2.0_dp*xhat) + &
1059 –                  qzz_i*(6.0_dp*cz_i*uz_i(1) - 2.0_dp*xhat) )
1060 –             dudy = dudy - 5.0_dp*sw*vterm*riji*yhat + sw*pref*ri4 * ( &
1061 –                  qxx_i*(6.0_dp*cx_i*ux_i(2) - 2.0_dp*yhat) + &
1062 –                  qyy_i*(6.0_dp*cy_i*uy_i(2) - 2.0_dp*yhat) + &
1063 –                  qzz_i*(6.0_dp*cz_i*uz_i(2) - 2.0_dp*yhat) )
1064 –             dudz = dudz - 5.0_dp*sw*vterm*riji*zhat + sw*pref*ri4 * ( &
1065 –                  qxx_i*(6.0_dp*cx_i*ux_i(3) - 2.0_dp*zhat) + &
1066 –                  qyy_i*(6.0_dp*cy_i*uy_i(3) - 2.0_dp*zhat) + &
1067 –                  qzz_i*(6.0_dp*cz_i*uz_i(3) - 2.0_dp*zhat) )
1068 –            
1069 –             dudux_i(1) = dudux_i(1) + sw*pref*ri3*(qxx_i*6.0_dp*cx_i*xhat)
1070 –             dudux_i(2) = dudux_i(2) + sw*pref*ri3*(qxx_i*6.0_dp*cx_i*yhat)
1071 –             dudux_i(3) = dudux_i(3) + sw*pref*ri3*(qxx_i*6.0_dp*cx_i*zhat)
1072 –            
1073 –             duduy_i(1) = duduy_i(1) + sw*pref*ri3*(qyy_i*6.0_dp*cy_i*xhat)
1074 –             duduy_i(2) = duduy_i(2) + sw*pref*ri3*(qyy_i*6.0_dp*cy_i*yhat)
1075 –             duduy_i(3) = duduy_i(3) + sw*pref*ri3*(qyy_i*6.0_dp*cy_i*zhat)
1076 –            
1077 –             duduz_i(1) = duduz_i(1) + sw*pref*ri3*(qzz_i*6.0_dp*cz_i*xhat)
1078 –             duduz_i(2) = duduz_i(2) + sw*pref*ri3*(qzz_i*6.0_dp*cz_i*yhat)
1079 –             duduz_i(3) = duduz_i(3) + sw*pref*ri3*(qzz_i*6.0_dp*cz_i*zhat)
1080 –          endif
1009         endif
1010      endif
1011  
# Line 1190 | Line 1118 | contains
1118      return
1119    end subroutine doElectrostaticPair
1120  
1193 –  !! calculates the switching functions and their derivatives for a given
1194 –  subroutine calc_switch(r, mu, scale, dscale)
1195 –
1196 –    real (kind=dp), intent(in) :: r, mu
1197 –    real (kind=dp), intent(inout) :: scale, dscale
1198 –    real (kind=dp) :: rl, ru, mulow, minRatio, temp, scaleVal
1199 –
1200 –    ! distances must be in angstroms
1201 –    rl = 2.75d0
1202 –    ru = 3.75d0
1203 –    mulow = 0.0d0 !3.3856d0 ! 1.84 * 1.84
1204 –    minRatio = mulow / (mu*mu)
1205 –    scaleVal = 1.0d0 - minRatio
1206 –    
1207 –    if (r.lt.rl) then
1208 –       scale = minRatio
1209 –       dscale = 0.0d0
1210 –    elseif (r.gt.ru) then
1211 –       scale = 1.0d0
1212 –       dscale = 0.0d0
1213 –    else
1214 –       scale = 1.0d0 - scaleVal*((ru + 2.0d0*r - 3.0d0*rl) * (ru-r)**2) &
1215 –                        / ((ru - rl)**3)
1216 –       dscale = -scaleVal * 6.0d0 * (r-ru)*(r-rl)/((ru - rl)**3)    
1217 –    endif
1218 –        
1219 –    return
1220 –  end subroutine calc_switch
1221 –
1121    subroutine destroyElectrostaticTypes()
1122  
1123      if(allocated(ElectrostaticMap)) deallocate(ElectrostaticMap)
1124  
1125    end subroutine destroyElectrostaticTypes
1126 +
1127 +  subroutine self_self(atom1, eFrame, mypot, t, do_pot)
1128 +    logical, intent(in) :: do_pot
1129 +    integer, intent(in) :: atom1
1130 +    integer :: atid1
1131 +    real(kind=dp), dimension(9,nLocal) :: eFrame
1132 +    real(kind=dp), dimension(3,nLocal) :: t
1133 +    real(kind=dp) :: mu1, c1
1134 +    real(kind=dp) :: preVal, epot, mypot
1135 +    real(kind=dp) :: eix, eiy, eiz
1136  
1137 +    ! this is a local only array, so we use the local atom type id's:
1138 +    atid1 = atid(atom1)
1139 +
1140 +    if (.not.summationMethodChecked) then
1141 +       call checkSummationMethod()
1142 +    endif
1143 +    
1144 +    if (summationMethod .eq. REACTION_FIELD) then
1145 +       if (ElectrostaticMap(atid1)%is_Dipole) then
1146 +          mu1 = getDipoleMoment(atid1)
1147 +          
1148 +          preVal = pre22 * preRF2 * mu1*mu1
1149 +          mypot = mypot - 0.5d0*preVal
1150 +          
1151 +          ! The self-correction term adds into the reaction field vector
1152 +          
1153 +          eix = preVal * eFrame(3,atom1)
1154 +          eiy = preVal * eFrame(6,atom1)
1155 +          eiz = preVal * eFrame(9,atom1)
1156 +          
1157 +          ! once again, this is self-self, so only the local arrays are needed
1158 +          ! even for MPI jobs:
1159 +          
1160 +          t(1,atom1)=t(1,atom1) - eFrame(6,atom1)*eiz + &
1161 +               eFrame(9,atom1)*eiy
1162 +          t(2,atom1)=t(2,atom1) - eFrame(9,atom1)*eix + &
1163 +               eFrame(3,atom1)*eiz
1164 +          t(3,atom1)=t(3,atom1) - eFrame(3,atom1)*eiy + &
1165 +               eFrame(6,atom1)*eix
1166 +          
1167 +       endif
1168 +
1169 +    elseif (summationMethod .eq. SHIFTED_FORCE) then
1170 +       if (ElectrostaticMap(atid1)%is_Charge) then
1171 +          c1 = getCharge(atid1)
1172 +          
1173 +          if (screeningMethod .eq. DAMPED) then
1174 +             mypot = mypot - (f0c * rcuti * 0.5_dp + &
1175 +                  dampingAlpha*invRootPi) * c1 * c1    
1176 +            
1177 +          else            
1178 +             mypot = mypot - (rcuti * 0.5_dp * c1 * c1)
1179 +            
1180 +          endif
1181 +       endif
1182 +    endif
1183 +    
1184 +    return
1185 +  end subroutine self_self
1186 +
1187 +  subroutine rf_self_excludes(atom1, atom2, sw, eFrame, d, rij, vpair, myPot, &
1188 +       f, t, do_pot)
1189 +    logical, intent(in) :: do_pot
1190 +    integer, intent(in) :: atom1
1191 +    integer, intent(in) :: atom2
1192 +    logical :: i_is_Charge, j_is_Charge
1193 +    logical :: i_is_Dipole, j_is_Dipole
1194 +    integer :: atid1
1195 +    integer :: atid2
1196 +    real(kind=dp), intent(in) :: rij
1197 +    real(kind=dp), intent(in) :: sw
1198 +    real(kind=dp), intent(in), dimension(3) :: d
1199 +    real(kind=dp), intent(inout) :: vpair
1200 +    real(kind=dp), dimension(9,nLocal) :: eFrame
1201 +    real(kind=dp), dimension(3,nLocal) :: f
1202 +    real(kind=dp), dimension(3,nLocal) :: t
1203 +    real (kind = dp), dimension(3) :: duduz_i
1204 +    real (kind = dp), dimension(3) :: duduz_j
1205 +    real (kind = dp), dimension(3) :: uz_i
1206 +    real (kind = dp), dimension(3) :: uz_j
1207 +    real(kind=dp) :: q_i, q_j, mu_i, mu_j
1208 +    real(kind=dp) :: xhat, yhat, zhat
1209 +    real(kind=dp) :: ct_i, ct_j
1210 +    real(kind=dp) :: ri2, ri3, riji, vterm
1211 +    real(kind=dp) :: pref, preVal, rfVal, myPot
1212 +    real(kind=dp) :: dudx, dudy, dudz, dudr
1213 +
1214 +    if (.not.summationMethodChecked) then
1215 +       call checkSummationMethod()
1216 +    endif
1217 +
1218 +    dudx = 0.0d0
1219 +    dudy = 0.0d0
1220 +    dudz = 0.0d0
1221 +
1222 +    riji = 1.0d0/rij
1223 +
1224 +    xhat = d(1) * riji
1225 +    yhat = d(2) * riji
1226 +    zhat = d(3) * riji
1227 +
1228 +    ! this is a local only array, so we use the local atom type id's:
1229 +    atid1 = atid(atom1)
1230 +    atid2 = atid(atom2)
1231 +    i_is_Charge = ElectrostaticMap(atid1)%is_Charge
1232 +    j_is_Charge = ElectrostaticMap(atid2)%is_Charge
1233 +    i_is_Dipole = ElectrostaticMap(atid1)%is_Dipole
1234 +    j_is_Dipole = ElectrostaticMap(atid2)%is_Dipole
1235 +
1236 +    if (i_is_Charge.and.j_is_Charge) then
1237 +       q_i = ElectrostaticMap(atid1)%charge
1238 +       q_j = ElectrostaticMap(atid2)%charge
1239 +      
1240 +       preVal = pre11 * q_i * q_j
1241 +       rfVal = preRF*rij*rij
1242 +       vterm = preVal * rfVal
1243 +      
1244 +       myPot = myPot + sw*vterm
1245 +      
1246 +       dudr  = sw*preVal * 2.0d0*rfVal*riji
1247 +      
1248 +       dudx = dudx + dudr * xhat
1249 +       dudy = dudy + dudr * yhat
1250 +       dudz = dudz + dudr * zhat
1251 +      
1252 +    elseif (i_is_Charge.and.j_is_Dipole) then
1253 +       q_i = ElectrostaticMap(atid1)%charge
1254 +       mu_j = ElectrostaticMap(atid2)%dipole_moment
1255 +       uz_j(1) = eFrame(3,atom2)
1256 +       uz_j(2) = eFrame(6,atom2)
1257 +       uz_j(3) = eFrame(9,atom2)
1258 +       ct_j = uz_j(1)*xhat + uz_j(2)*yhat + uz_j(3)*zhat
1259 +      
1260 +       ri2 = riji * riji
1261 +       ri3 = ri2 * riji
1262 +      
1263 +       pref = pre12 * q_i * mu_j
1264 +       vterm = - pref * ct_j * ( ri2 - preRF2*rij )
1265 +       myPot = myPot + sw*vterm
1266 +      
1267 +       dudx = dudx - sw*pref*( ri3*(uz_j(1)-3.0d0*ct_j*xhat) &
1268 +            - preRF2*uz_j(1) )
1269 +       dudy = dudy - sw*pref*( ri3*(uz_j(2)-3.0d0*ct_j*yhat) &
1270 +            - preRF2*uz_j(2) )
1271 +       dudz = dudz - sw*pref*( ri3*(uz_j(3)-3.0d0*ct_j*zhat) &
1272 +            - preRF2*uz_j(3) )
1273 +      
1274 +       duduz_j(1) = duduz_j(1) - sw * pref * xhat * ( ri2 - preRF2*rij )
1275 +       duduz_j(2) = duduz_j(2) - sw * pref * yhat * ( ri2 - preRF2*rij )
1276 +       duduz_j(3) = duduz_j(3) - sw * pref * zhat * ( ri2 - preRF2*rij )
1277 +      
1278 +    elseif (i_is_Dipole.and.j_is_Charge) then
1279 +       mu_i = ElectrostaticMap(atid1)%dipole_moment
1280 +       q_j = ElectrostaticMap(atid2)%charge
1281 +       uz_i(1) = eFrame(3,atom1)
1282 +       uz_i(2) = eFrame(6,atom1)
1283 +       uz_i(3) = eFrame(9,atom1)
1284 +       ct_i = uz_i(1)*xhat + uz_i(2)*yhat + uz_i(3)*zhat
1285 +      
1286 +       ri2 = riji * riji
1287 +       ri3 = ri2 * riji
1288 +      
1289 +       pref = pre12 * q_j * mu_i
1290 +       vterm = pref * ct_i * ( ri2 - preRF2*rij )
1291 +       myPot = myPot + sw*vterm
1292 +      
1293 +       dudx = dudx + sw*pref*( ri3*(uz_i(1)-3.0d0*ct_i*xhat) &
1294 +            - preRF2*uz_i(1) )
1295 +       dudy = dudy + sw*pref*( ri3*(uz_i(2)-3.0d0*ct_i*yhat) &
1296 +            - preRF2*uz_i(2) )
1297 +       dudz = dudz + sw*pref*( ri3*(uz_i(3)-3.0d0*ct_i*zhat) &
1298 +            - preRF2*uz_i(3) )
1299 +      
1300 +       duduz_i(1) = duduz_i(1) + sw * pref * xhat * ( ri2 - preRF2*rij )
1301 +       duduz_i(2) = duduz_i(2) + sw * pref * yhat * ( ri2 - preRF2*rij )
1302 +       duduz_i(3) = duduz_i(3) + sw * pref * zhat * ( ri2 - preRF2*rij )
1303 +      
1304 +    endif
1305 +      
1306 +
1307 +    ! accumulate the forces and torques resulting from the self term
1308 +    f(1,atom1) = f(1,atom1) + dudx
1309 +    f(2,atom1) = f(2,atom1) + dudy
1310 +    f(3,atom1) = f(3,atom1) + dudz
1311 +    
1312 +    f(1,atom2) = f(1,atom2) - dudx
1313 +    f(2,atom2) = f(2,atom2) - dudy
1314 +    f(3,atom2) = f(3,atom2) - dudz
1315 +    
1316 +    if (i_is_Dipole) then
1317 +       t(1,atom1)=t(1,atom1) - uz_i(2)*duduz_i(3) + uz_i(3)*duduz_i(2)
1318 +       t(2,atom1)=t(2,atom1) - uz_i(3)*duduz_i(1) + uz_i(1)*duduz_i(3)
1319 +       t(3,atom1)=t(3,atom1) - uz_i(1)*duduz_i(2) + uz_i(2)*duduz_i(1)
1320 +    elseif (j_is_Dipole) then
1321 +       t(1,atom2)=t(1,atom2) - uz_j(2)*duduz_j(3) + uz_j(3)*duduz_j(2)
1322 +       t(2,atom2)=t(2,atom2) - uz_j(3)*duduz_j(1) + uz_j(1)*duduz_j(3)
1323 +       t(3,atom2)=t(3,atom2) - uz_j(1)*duduz_j(2) + uz_j(2)*duduz_j(1)
1324 +    endif
1325 +
1326 +    return
1327 +  end subroutine rf_self_excludes
1328 +
1329   end module electrostatic_module

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines