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 2105 by gezelter, Thu Mar 10 17:54:58 2005 UTC vs.
Revision 2162 by chrisfen, Mon Apr 11 20:19:22 2005 UTC

# Line 54 | Line 54 | module electrostatic_module
54  
55    PRIVATE
56  
57 +  !! these prefactors convert the multipole interactions into kcal / mol
58 +  !! all were computed assuming distances are measured in angstroms
59 +  !! Charge-Charge, assuming charges are measured in electrons
60    real(kind=dp), parameter :: pre11 = 332.0637778_dp
61 <  real(kind=dp), parameter :: pre12 = 69.13291783_dp
62 <  real(kind=dp), parameter :: pre22 = 14.39289874_dp
63 <  real(kind=dp), parameter :: pre14 = 0.0_dp
61 >  !! Charge-Dipole, assuming charges are measured in electrons, and
62 >  !! dipoles are measured in debyes
63 >  real(kind=dp), parameter :: pre12 = 69.13373_dp
64 >  !! Dipole-Dipole, assuming dipoles are measured in debyes
65 >  real(kind=dp), parameter :: pre22 = 14.39325_dp
66 >  !! Charge-Quadrupole, assuming charges are measured in electrons, and
67 >  !! quadrupoles are measured in 10^-26 esu cm^2
68 >  !! This unit is also known affectionately as an esu centi-barn.
69 >  real(kind=dp), parameter :: pre14 = 69.13373_dp
70  
71    public :: newElectrostaticType
72    public :: setCharge
# Line 67 | Line 76 | module electrostatic_module
76    public :: doElectrostaticPair
77    public :: getCharge
78    public :: getDipoleMoment
79 +  public :: pre22
80  
81    type :: Electrostatic
82       integer :: c_ident
# Line 310 | Line 320 | contains
320      real( kind = dp ), dimension(3,nLocal) :: f
321      real( kind = dp ), dimension(3,nLocal) :: t
322      
323 <    real (kind = dp), dimension(3) :: ul_i
324 <    real (kind = dp), dimension(3) :: ul_j
323 >    real (kind = dp), dimension(3) :: ux_i, uy_i, uz_i
324 >    real (kind = dp), dimension(3) :: ux_j, uy_j, uz_j
325 >    real (kind = dp), dimension(3) :: dudux_i, duduy_i, duduz_i
326 >    real (kind = dp), dimension(3) :: dudux_j, duduy_j, duduz_j
327  
328      logical :: i_is_Charge, i_is_Dipole, i_is_SplitDipole, i_is_Quadrupole
329      logical :: j_is_Charge, j_is_Dipole, j_is_SplitDipole, j_is_Quadrupole
330      integer :: me1, me2, id1, id2
331      real (kind=dp) :: q_i, q_j, mu_i, mu_j, d_i, d_j
332 +    real (kind=dp) :: qxx_i, qyy_i, qzz_i
333 +    real (kind=dp) :: qxx_j, qyy_j, qzz_j
334 +    real (kind=dp) :: cx_i, cy_i, cz_i
335 +    real (kind=dp) :: cx_j, cy_j, cz_j
336 +    real (kind=dp) :: cx2, cy2, cz2
337      real (kind=dp) :: ct_i, ct_j, ct_ij, a1
338      real (kind=dp) :: riji, ri, ri2, ri3, ri4
339      real (kind=dp) :: pref, vterm, epot, dudr    
340      real (kind=dp) :: xhat, yhat, zhat
341      real (kind=dp) :: dudx, dudy, dudz
325    real (kind=dp) :: drdxj, drdyj, drdzj
326    real (kind=dp) :: duduix, duduiy, duduiz, dudujx, dudujy, dudujz
342      real (kind=dp) :: scale, sc2, bigR
343  
344      if (.not.allocated(ElectrostaticMap)) then
# Line 347 | Line 362 | contains
362      yhat = d(2) * riji
363      zhat = d(3) * riji
364  
350    drdxj = xhat
351    drdyj = yhat
352    drdzj = zhat
353
365      !! logicals
366  
367      i_is_Charge = ElectrostaticMap(me1)%is_Charge
# Line 370 | Line 381 | contains
381      if (i_is_Dipole) then
382         mu_i = ElectrostaticMap(me1)%dipole_moment
383   #ifdef IS_MPI
384 <       ul_i(1) = eFrame_Row(3,atom1)
385 <       ul_i(2) = eFrame_Row(6,atom1)
386 <       ul_i(3) = eFrame_Row(9,atom1)
384 >       uz_i(1) = eFrame_Row(3,atom1)
385 >       uz_i(2) = eFrame_Row(6,atom1)
386 >       uz_i(3) = eFrame_Row(9,atom1)
387   #else
388 <       ul_i(1) = eFrame(3,atom1)
389 <       ul_i(2) = eFrame(6,atom1)
390 <       ul_i(3) = eFrame(9,atom1)
388 >       uz_i(1) = eFrame(3,atom1)
389 >       uz_i(2) = eFrame(6,atom1)
390 >       uz_i(3) = eFrame(9,atom1)
391   #endif
392 <       ct_i = ul_i(1)*drdxj + ul_i(2)*drdyj + ul_i(3)*drdzj
392 >       ct_i = uz_i(1)*xhat + uz_i(2)*yhat + uz_i(3)*zhat
393  
394         if (i_is_SplitDipole) then
395            d_i = ElectrostaticMap(me1)%split_dipole_distance
# Line 386 | Line 397 | contains
397        
398      endif
399  
400 +    if (i_is_Quadrupole) then
401 +       qxx_i = ElectrostaticMap(me1)%quadrupole_moments(1)
402 +       qyy_i = ElectrostaticMap(me1)%quadrupole_moments(2)
403 +       qzz_i = ElectrostaticMap(me1)%quadrupole_moments(3)
404 + #ifdef IS_MPI
405 +       ux_i(1) = eFrame_Row(1,atom1)
406 +       ux_i(2) = eFrame_Row(4,atom1)
407 +       ux_i(3) = eFrame_Row(7,atom1)
408 +       uy_i(1) = eFrame_Row(2,atom1)
409 +       uy_i(2) = eFrame_Row(5,atom1)
410 +       uy_i(3) = eFrame_Row(8,atom1)
411 +       uz_i(1) = eFrame_Row(3,atom1)
412 +       uz_i(2) = eFrame_Row(6,atom1)
413 +       uz_i(3) = eFrame_Row(9,atom1)
414 + #else
415 +       ux_i(1) = eFrame(1,atom1)
416 +       ux_i(2) = eFrame(4,atom1)
417 +       ux_i(3) = eFrame(7,atom1)
418 +       uy_i(1) = eFrame(2,atom1)
419 +       uy_i(2) = eFrame(5,atom1)
420 +       uy_i(3) = eFrame(8,atom1)
421 +       uz_i(1) = eFrame(3,atom1)
422 +       uz_i(2) = eFrame(6,atom1)
423 +       uz_i(3) = eFrame(9,atom1)
424 + #endif
425 +       cx_i = ux_i(1)*xhat + ux_i(2)*yhat + ux_i(3)*zhat
426 +       cy_i = uy_i(1)*xhat + uy_i(2)*yhat + uy_i(3)*zhat
427 +       cz_i = uz_i(1)*xhat + uz_i(2)*yhat + uz_i(3)*zhat
428 +    endif
429 +
430 +
431      if (j_is_Charge) then
432         q_j = ElectrostaticMap(me2)%charge      
433      endif
# Line 393 | Line 435 | contains
435      if (j_is_Dipole) then
436         mu_j = ElectrostaticMap(me2)%dipole_moment
437   #ifdef IS_MPI
438 <       ul_j(1) = eFrame_Col(3,atom2)
439 <       ul_j(2) = eFrame_Col(6,atom2)
440 <       ul_j(3) = eFrame_Col(9,atom2)
438 >       uz_j(1) = eFrame_Col(3,atom2)
439 >       uz_j(2) = eFrame_Col(6,atom2)
440 >       uz_j(3) = eFrame_Col(9,atom2)
441   #else
442 <       ul_j(1) = eFrame(3,atom2)
443 <       ul_j(2) = eFrame(6,atom2)
444 <       ul_j(3) = eFrame(9,atom2)
442 >       uz_j(1) = eFrame(3,atom2)
443 >       uz_j(2) = eFrame(6,atom2)
444 >       uz_j(3) = eFrame(9,atom2)
445   #endif
446 <       ct_j = ul_j(1)*drdxj + ul_j(2)*drdyj + ul_j(3)*drdzj
446 >       ct_j = uz_j(1)*xhat + uz_j(2)*yhat + uz_j(3)*zhat
447  
448         if (j_is_SplitDipole) then
449            d_j = ElectrostaticMap(me2)%split_dipole_distance
450         endif
451      endif
452  
453 +    if (j_is_Quadrupole) then
454 +       qxx_j = ElectrostaticMap(me2)%quadrupole_moments(1)
455 +       qyy_j = ElectrostaticMap(me2)%quadrupole_moments(2)
456 +       qzz_j = ElectrostaticMap(me2)%quadrupole_moments(3)
457 + #ifdef IS_MPI
458 +       ux_j(1) = eFrame_Col(1,atom2)
459 +       ux_j(2) = eFrame_Col(4,atom2)
460 +       ux_j(3) = eFrame_Col(7,atom2)
461 +       uy_j(1) = eFrame_Col(2,atom2)
462 +       uy_j(2) = eFrame_Col(5,atom2)
463 +       uy_j(3) = eFrame_Col(8,atom2)
464 +       uz_j(1) = eFrame_Col(3,atom2)
465 +       uz_j(2) = eFrame_Col(6,atom2)
466 +       uz_j(3) = eFrame_Col(9,atom2)
467 + #else
468 +       ux_j(1) = eFrame(1,atom2)
469 +       ux_j(2) = eFrame(4,atom2)
470 +       ux_j(3) = eFrame(7,atom2)
471 +       uy_j(1) = eFrame(2,atom2)
472 +       uy_j(2) = eFrame(5,atom2)
473 +       uy_j(3) = eFrame(8,atom2)
474 +       uz_j(1) = eFrame(3,atom2)
475 +       uz_j(2) = eFrame(6,atom2)
476 +       uz_j(3) = eFrame(9,atom2)
477 + #endif
478 +       cx_j = ux_j(1)*xhat + ux_j(2)*yhat + ux_j(3)*zhat
479 +       cy_j = uy_j(1)*xhat + uy_j(2)*yhat + uy_j(3)*zhat
480 +       cz_j = uz_j(1)*xhat + uz_j(2)*yhat + uz_j(3)*zhat
481 +    endif
482 +
483      epot = 0.0_dp
484      dudx = 0.0_dp
485      dudy = 0.0_dp
486      dudz = 0.0_dp
487  
488 <    duduix = 0.0_dp
489 <    duduiy = 0.0_dp
490 <    duduiz = 0.0_dp
488 >    dudux_i = 0.0_dp
489 >    duduy_i = 0.0_dp
490 >    duduz_i = 0.0_dp
491  
492 <    dudujx = 0.0_dp
493 <    dudujy = 0.0_dp
494 <    dudujz = 0.0_dp
492 >    dudux_j = 0.0_dp
493 >    duduy_j = 0.0_dp
494 >    duduz_j = 0.0_dp
495  
496      if (i_is_Charge) then
497  
# Line 431 | Line 503 | contains
503  
504            dudr  = - sw * vterm * riji
505  
506 <          dudx = dudx + dudr * drdxj
507 <          dudy = dudy + dudr * drdyj
508 <          dudz = dudz + dudr * drdzj
506 >          dudx = dudx + dudr * xhat
507 >          dudy = dudy + dudr * yhat
508 >          dudz = dudz + dudr * zhat
509        
510         endif
511  
# Line 453 | Line 525 | contains
525            sc2 = scale * scale
526              
527            pref = pre12 * q_i * mu_j
528 <          vterm = pref * ct_j * ri2 * scale
528 >          vterm = - pref * ct_j * ri2 * scale
529            vpair = vpair + vterm
530            epot = epot + sw * vterm
531  
# Line 461 | Line 533 | contains
533            !! r_j - r_i and the charge-dipole potential takes the origin
534            !! as the point dipole, which is atom j in this case.
535  
536 <          dudx = dudx + pref * sw * ri3 * ( ul_j(1) + 3.0d0*ct_j*xhat*sc2)
537 <          dudy = dudy + pref * sw * ri3 * ( ul_j(2) + 3.0d0*ct_j*yhat*sc2)
538 <          dudz = dudz + pref * sw * ri3 * ( ul_j(3) + 3.0d0*ct_j*zhat*sc2)
536 >          dudx = dudx - pref * sw * ri3 * ( uz_j(1) - 3.0d0*ct_j*xhat*sc2)
537 >          dudy = dudy - pref * sw * ri3 * ( uz_j(2) - 3.0d0*ct_j*yhat*sc2)
538 >          dudz = dudz - pref * sw * ri3 * ( uz_j(3) - 3.0d0*ct_j*zhat*sc2)
539  
540 <          dudujx = dudujx - pref * sw * ri2 * xhat * scale
541 <          dudujy = dudujy - pref * sw * ri2 * yhat * scale
542 <          dudujz = dudujz - pref * sw * ri2 * zhat * scale
540 >          duduz_j(1) = duduz_j(1) - pref * sw * ri2 * xhat * scale
541 >          duduz_j(2) = duduz_j(2) - pref * sw * ri2 * yhat * scale
542 >          duduz_j(3) = duduz_j(3) - pref * sw * ri2 * zhat * scale
543 >          
544 >       endif
545 >
546 >       if (j_is_Quadrupole) then
547 >          ri2 = riji * riji
548 >          ri3 = ri2 * riji
549 >          ri4 = ri2 * ri2
550 >          cx2 = cx_j * cx_j
551 >          cy2 = cy_j * cy_j
552 >          cz2 = cz_j * cz_j
553 >
554 >
555 >          pref =  pre14 * q_i / 3.0_dp
556 >          vterm = pref * ri3 * (qxx_j * (3.0_dp*cx2 - 1.0_dp) + &
557 >               qyy_j * (3.0_dp*cy2 - 1.0_dp) + &
558 >               qzz_j * (3.0_dp*cz2 - 1.0_dp))
559 >          vpair = vpair + vterm
560 >          epot = epot + sw * vterm
561 >
562 >          dudx = dudx - 5.0_dp*sw*vterm*riji*xhat + pref * sw * ri4 * ( &
563 >               qxx_j*(6.0_dp*cx_j*ux_j(1) - 2.0_dp*xhat) + &
564 >               qyy_j*(6.0_dp*cy_j*uy_j(1) - 2.0_dp*xhat) + &
565 >               qzz_j*(6.0_dp*cz_j*uz_j(1) - 2.0_dp*xhat) )
566 >          dudy = dudy - 5.0_dp*sw*vterm*riji*yhat + pref * sw * ri4 * ( &
567 >               qxx_j*(6.0_dp*cx_j*ux_j(2) - 2.0_dp*yhat) + &
568 >               qyy_j*(6.0_dp*cy_j*uy_j(2) - 2.0_dp*yhat) + &
569 >               qzz_j*(6.0_dp*cz_j*uz_j(2) - 2.0_dp*yhat) )
570 >          dudz = dudz - 5.0_dp*sw*vterm*riji*zhat + pref * sw * ri4 * ( &
571 >               qxx_j*(6.0_dp*cx_j*ux_j(3) - 2.0_dp*zhat) + &
572 >               qyy_j*(6.0_dp*cy_j*uy_j(3) - 2.0_dp*zhat) + &
573 >               qzz_j*(6.0_dp*cz_j*uz_j(3) - 2.0_dp*zhat) )
574            
575 +          dudux_j(1) = dudux_j(1) + pref * sw * ri3 * (qxx_j*6.0_dp*cx_j*xhat)
576 +          dudux_j(2) = dudux_j(2) + pref * sw * ri3 * (qxx_j*6.0_dp*cx_j*yhat)
577 +          dudux_j(3) = dudux_j(3) + pref * sw * ri3 * (qxx_j*6.0_dp*cx_j*zhat)
578 +
579 +          duduy_j(1) = duduy_j(1) + pref * sw * ri3 * (qyy_j*6.0_dp*cy_j*xhat)
580 +          duduy_j(2) = duduy_j(2) + pref * sw * ri3 * (qyy_j*6.0_dp*cy_j*yhat)
581 +          duduy_j(3) = duduy_j(3) + pref * sw * ri3 * (qyy_j*6.0_dp*cy_j*zhat)
582 +
583 +          duduz_j(1) = duduz_j(1) + pref * sw * ri3 * (qzz_j*6.0_dp*cz_j*xhat)
584 +          duduz_j(2) = duduz_j(2) + pref * sw * ri3 * (qzz_j*6.0_dp*cz_j*yhat)
585 +          duduz_j(3) = duduz_j(3) + pref * sw * ri3 * (qzz_j*6.0_dp*cz_j*zhat)
586         endif
587  
588      endif
# Line 495 | Line 609 | contains
609            vpair = vpair + vterm
610            epot = epot + sw * vterm
611  
612 <          dudx = dudx + pref * sw * ri3 * ( ul_i(1) - 3.0d0 * ct_i * xhat*sc2)
613 <          dudy = dudy + pref * sw * ri3 * ( ul_i(2) - 3.0d0 * ct_i * yhat*sc2)
614 <          dudz = dudz + pref * sw * ri3 * ( ul_i(3) - 3.0d0 * ct_i * zhat*sc2)
612 >          dudx = dudx + pref * sw * ri3 * ( uz_i(1) - 3.0d0 * ct_i * xhat*sc2)
613 >          dudy = dudy + pref * sw * ri3 * ( uz_i(2) - 3.0d0 * ct_i * yhat*sc2)
614 >          dudz = dudz + pref * sw * ri3 * ( uz_i(3) - 3.0d0 * ct_i * zhat*sc2)
615  
616 <          duduix = duduix + pref * sw * ri2 * xhat * scale
617 <          duduiy = duduiy + pref * sw * ri2 * yhat * scale
618 <          duduiz = duduiz + pref * sw * ri2 * zhat * scale
616 >          duduz_i(1) = duduz_i(1) + pref * sw * ri2 * xhat * scale
617 >          duduz_i(2) = duduz_i(2) + pref * sw * ri2 * yhat * scale
618 >          duduz_i(3) = duduz_i(3) + pref * sw * ri2 * zhat * scale
619         endif
620  
621         if (j_is_Dipole) then
# Line 525 | Line 639 | contains
639               endif
640            endif
641  
642 <          ct_ij = ul_i(1)*ul_j(1) + ul_i(2)*ul_j(2) + ul_i(3)*ul_j(3)
642 >          ct_ij = uz_i(1)*uz_j(1) + uz_i(2)*uz_j(2) + uz_i(3)*uz_j(3)
643  
644            ri2 = ri * ri
645            ri3 = ri2 * ri
# Line 539 | Line 653 | contains
653            
654            a1 = 5.0d0 * ct_i * ct_j * sc2 - ct_ij
655  
656 <          dudx=dudx+pref*sw*3.0d0*ri4*scale*(a1*xhat-ct_i*ul_j(1)-ct_j*ul_i(1))
657 <          dudy=dudy+pref*sw*3.0d0*ri4*scale*(a1*yhat-ct_i*ul_j(2)-ct_j*ul_i(2))
658 <          dudz=dudz+pref*sw*3.0d0*ri4*scale*(a1*zhat-ct_i*ul_j(3)-ct_j*ul_i(3))
656 >          dudx=dudx+pref*sw*3.0d0*ri4*scale*(a1*xhat-ct_i*uz_j(1)-ct_j*uz_i(1))
657 >          dudy=dudy+pref*sw*3.0d0*ri4*scale*(a1*yhat-ct_i*uz_j(2)-ct_j*uz_i(2))
658 >          dudz=dudz+pref*sw*3.0d0*ri4*scale*(a1*zhat-ct_i*uz_j(3)-ct_j*uz_i(3))
659  
660 <          duduix = duduix + pref*sw*ri3*(ul_j(1) - 3.0d0*ct_j*xhat*sc2)
661 <          duduiy = duduiy + pref*sw*ri3*(ul_j(2) - 3.0d0*ct_j*yhat*sc2)
662 <          duduiz = duduiz + pref*sw*ri3*(ul_j(3) - 3.0d0*ct_j*zhat*sc2)
660 >          duduz_i(1) = duduz_i(1) + pref*sw*ri3*(uz_j(1) - 3.0d0*ct_j*xhat*sc2)
661 >          duduz_i(2) = duduz_i(2) + pref*sw*ri3*(uz_j(2) - 3.0d0*ct_j*yhat*sc2)
662 >          duduz_i(3) = duduz_i(3) + pref*sw*ri3*(uz_j(3) - 3.0d0*ct_j*zhat*sc2)
663  
664 <          dudujx = dudujx + pref*sw*ri3*(ul_i(1) - 3.0d0*ct_i*xhat*sc2)
665 <          dudujy = dudujy + pref*sw*ri3*(ul_i(2) - 3.0d0*ct_i*yhat*sc2)
666 <          dudujz = dudujz + pref*sw*ri3*(ul_i(3) - 3.0d0*ct_i*zhat*sc2)
664 >          duduz_j(1) = duduz_j(1) + pref*sw*ri3*(uz_i(1) - 3.0d0*ct_i*xhat*sc2)
665 >          duduz_j(2) = duduz_j(2) + pref*sw*ri3*(uz_i(2) - 3.0d0*ct_i*yhat*sc2)
666 >          duduz_j(3) = duduz_j(3) + pref*sw*ri3*(uz_i(3) - 3.0d0*ct_i*zhat*sc2)
667         endif
668  
669      endif
670 +
671 +    if (i_is_Quadrupole) then
672 +       if (j_is_Charge) then
673 +          
674 +          ri2 = riji * riji
675 +          ri3 = ri2 * riji
676 +          ri4 = ri2 * ri2
677 +          cx2 = cx_i * cx_i
678 +          cy2 = cy_i * cy_i
679 +          cz2 = cz_i * cz_i
680 +          
681 +          pref = pre14 * q_j / 3.0_dp
682 +          vterm = pref * ri3 * (qxx_i * (3.0_dp*cx2 - 1.0_dp) + &
683 +               qyy_i * (3.0_dp*cy2 - 1.0_dp) + &
684 +               qzz_i * (3.0_dp*cz2 - 1.0_dp))
685 +          vpair = vpair + vterm
686 +          epot = epot + sw * vterm
687 +          
688 +          dudx = dudx - 5.0_dp*sw*vterm*riji*xhat + pref * sw * ri4 * ( &
689 +               qxx_i*(6.0_dp*cx_i*ux_i(1) - 2.0_dp*xhat) + &
690 +               qyy_i*(6.0_dp*cy_i*uy_i(1) - 2.0_dp*xhat) + &
691 +               qzz_i*(6.0_dp*cz_i*uz_i(1) - 2.0_dp*xhat) )
692 +          dudy = dudy - 5.0_dp*sw*vterm*riji*yhat + pref * sw * ri4 * ( &
693 +               qxx_i*(6.0_dp*cx_i*ux_i(2) - 2.0_dp*yhat) + &
694 +               qyy_i*(6.0_dp*cy_i*uy_i(2) - 2.0_dp*yhat) + &
695 +               qzz_i*(6.0_dp*cz_i*uz_i(2) - 2.0_dp*yhat) )
696 +          dudz = dudz - 5.0_dp*sw*vterm*riji*zhat + pref * sw * ri4 * ( &
697 +               qxx_i*(6.0_dp*cx_i*ux_i(3) - 2.0_dp*zhat) + &
698 +               qyy_i*(6.0_dp*cy_i*uy_i(3) - 2.0_dp*zhat) + &
699 +               qzz_i*(6.0_dp*cz_i*uz_i(3) - 2.0_dp*zhat) )
700 +          
701 +          dudux_i(1) = dudux_i(1) + pref * sw * ri3 * (qxx_i*6.0_dp*cx_i*xhat)
702 +          dudux_i(2) = dudux_i(2) + pref * sw * ri3 * (qxx_i*6.0_dp*cx_i*yhat)
703 +          dudux_i(3) = dudux_i(3) + pref * sw * ri3 * (qxx_i*6.0_dp*cx_i*zhat)
704 +          
705 +          duduy_i(1) = duduy_i(1) + pref * sw * ri3 * (qyy_i*6.0_dp*cy_i*xhat)
706 +          duduy_i(2) = duduy_i(2) + pref * sw * ri3 * (qyy_i*6.0_dp*cy_i*yhat)
707 +          duduy_i(3) = duduy_i(3) + pref * sw * ri3 * (qyy_i*6.0_dp*cy_i*zhat)
708 +          
709 +          duduz_i(1) = duduz_i(1) + pref * sw * ri3 * (qzz_i*6.0_dp*cz_i*xhat)
710 +          duduz_i(2) = duduz_i(2) + pref * sw * ri3 * (qzz_i*6.0_dp*cz_i*yhat)
711 +          duduz_i(3) = duduz_i(3) + pref * sw * ri3 * (qzz_i*6.0_dp*cz_i*zhat)
712 +       endif
713 +    endif
714 +      
715      
716      if (do_pot) then
717   #ifdef IS_MPI
# Line 573 | Line 732 | contains
732      f_Col(3,atom2) = f_Col(3,atom2) - dudz
733      
734      if (i_is_Dipole .or. i_is_Quadrupole) then
735 <       t_Row(1,atom1) = t_Row(1,atom1) - ul_i(2)*duduiz + ul_i(3)*duduiy
736 <       t_Row(2,atom1) = t_Row(2,atom1) - ul_i(3)*duduix + ul_i(1)*duduiz
737 <       t_Row(3,atom1) = t_Row(3,atom1) - ul_i(1)*duduiy + ul_i(2)*duduix
735 >       t_Row(1,atom1)=t_Row(1,atom1) - uz_i(2)*duduz_i(3) + uz_i(3)*duduz_i(2)
736 >       t_Row(2,atom1)=t_Row(2,atom1) - uz_i(3)*duduz_i(1) + uz_i(1)*duduz_i(3)
737 >       t_Row(3,atom1)=t_Row(3,atom1) - uz_i(1)*duduz_i(2) + uz_i(2)*duduz_i(1)
738      endif
739 +    if (i_is_Quadrupole) then
740 +       t_Row(1,atom1)=t_Row(1,atom1) - ux_i(2)*dudux_i(3) + ux_i(3)*dudux_i(2)
741 +       t_Row(2,atom1)=t_Row(2,atom1) - ux_i(3)*dudux_i(1) + ux_i(1)*dudux_i(3)
742 +       t_Row(3,atom1)=t_Row(3,atom1) - ux_i(1)*dudux_i(2) + ux_i(2)*dudux_i(1)
743  
744 +       t_Row(1,atom1)=t_Row(1,atom1) - uy_i(2)*duduy_i(3) + uy_i(3)*duduy_i(2)
745 +       t_Row(2,atom1)=t_Row(2,atom1) - uy_i(3)*duduy_i(1) + uy_i(1)*duduy_i(3)
746 +       t_Row(3,atom1)=t_Row(3,atom1) - uy_i(1)*duduy_i(2) + uy_i(2)*duduy_i(1)
747 +    endif
748 +
749      if (j_is_Dipole .or. j_is_Quadrupole) then
750 <       t_Col(1,atom2) = t_Col(1,atom2) - ul_j(2)*dudujz + ul_j(3)*dudujy
751 <       t_Col(2,atom2) = t_Col(2,atom2) - ul_j(3)*dudujx + ul_j(1)*dudujz
752 <       t_Col(3,atom2) = t_Col(3,atom2) - ul_j(1)*dudujy + ul_j(2)*dudujx
750 >       t_Col(1,atom2)=t_Col(1,atom2) - uz_j(2)*duduz_j(3) + uz_j(3)*duduz_j(2)
751 >       t_Col(2,atom2)=t_Col(2,atom2) - uz_j(3)*duduz_j(1) + uz_j(1)*duduz_j(3)
752 >       t_Col(3,atom2)=t_Col(3,atom2) - uz_j(1)*duduz_j(2) + uz_j(2)*duduz_j(1)
753      endif
754 +    if (j_is_Quadrupole) then
755 +       t_Col(1,atom2)=t_Col(1,atom2) - ux_j(2)*dudux_j(3) + ux_j(3)*dudux_j(2)
756 +       t_Col(2,atom2)=t_Col(2,atom2) - ux_j(3)*dudux_j(1) + ux_j(1)*dudux_j(3)
757 +       t_Col(3,atom2)=t_Col(3,atom2) - ux_j(1)*dudux_j(2) + ux_j(2)*dudux_j(1)
758  
759 +       t_Col(1,atom2)=t_Col(1,atom2) - uy_j(2)*duduy_j(3) + uy_j(3)*duduy_j(2)
760 +       t_Col(2,atom2)=t_Col(2,atom2) - uy_j(3)*duduy_j(1) + uy_j(1)*duduy_j(3)
761 +       t_Col(3,atom2)=t_Col(3,atom2) - uy_j(1)*duduy_j(2) + uy_j(2)*duduy_j(1)
762 +    endif
763 +
764   #else
765      f(1,atom1) = f(1,atom1) + dudx
766      f(2,atom1) = f(2,atom1) + dudy
# Line 594 | Line 771 | contains
771      f(3,atom2) = f(3,atom2) - dudz
772      
773      if (i_is_Dipole .or. i_is_Quadrupole) then
774 <       t(1,atom1) = t(1,atom1) - ul_i(2)*duduiz + ul_i(3)*duduiy
775 <       t(2,atom1) = t(2,atom1) - ul_i(3)*duduix + ul_i(1)*duduiz
776 <       t(3,atom1) = t(3,atom1) - ul_i(1)*duduiy + ul_i(2)*duduix
774 >       t(1,atom1)=t(1,atom1) - uz_i(2)*duduz_i(3) + uz_i(3)*duduz_i(2)
775 >       t(2,atom1)=t(2,atom1) - uz_i(3)*duduz_i(1) + uz_i(1)*duduz_i(3)
776 >       t(3,atom1)=t(3,atom1) - uz_i(1)*duduz_i(2) + uz_i(2)*duduz_i(1)
777      endif
778 <      
778 >    if (i_is_Quadrupole) then
779 >       t(1,atom1)=t(1,atom1) - ux_i(2)*dudux_i(3) + ux_i(3)*dudux_i(2)
780 >       t(2,atom1)=t(2,atom1) - ux_i(3)*dudux_i(1) + ux_i(1)*dudux_i(3)
781 >       t(3,atom1)=t(3,atom1) - ux_i(1)*dudux_i(2) + ux_i(2)*dudux_i(1)
782 >
783 >       t(1,atom1)=t(1,atom1) - uy_i(2)*duduy_i(3) + uy_i(3)*duduy_i(2)
784 >       t(2,atom1)=t(2,atom1) - uy_i(3)*duduy_i(1) + uy_i(1)*duduy_i(3)
785 >       t(3,atom1)=t(3,atom1) - uy_i(1)*duduy_i(2) + uy_i(2)*duduy_i(1)
786 >    endif
787 >
788      if (j_is_Dipole .or. j_is_Quadrupole) then
789 <       t(1,atom2) = t(1,atom2) - ul_j(2)*dudujz + ul_j(3)*dudujy
790 <       t(2,atom2) = t(2,atom2) - ul_j(3)*dudujx + ul_j(1)*dudujz
791 <       t(3,atom2) = t(3,atom2) - ul_j(1)*dudujy + ul_j(2)*dudujx
789 >       t(1,atom2)=t(1,atom2) - uz_j(2)*duduz_j(3) + uz_j(3)*duduz_j(2)
790 >       t(2,atom2)=t(2,atom2) - uz_j(3)*duduz_j(1) + uz_j(1)*duduz_j(3)
791 >       t(3,atom2)=t(3,atom2) - uz_j(1)*duduz_j(2) + uz_j(2)*duduz_j(1)
792      endif
793 +    if (j_is_Quadrupole) then
794 +       t(1,atom2)=t(1,atom2) - ux_j(2)*dudux_j(3) + ux_j(3)*dudux_j(2)
795 +       t(2,atom2)=t(2,atom2) - ux_j(3)*dudux_j(1) + ux_j(1)*dudux_j(3)
796 +       t(3,atom2)=t(3,atom2) - ux_j(1)*dudux_j(2) + ux_j(2)*dudux_j(1)
797 +
798 +       t(1,atom2)=t(1,atom2) - uy_j(2)*duduy_j(3) + uy_j(3)*duduy_j(2)
799 +       t(2,atom2)=t(2,atom2) - uy_j(3)*duduy_j(1) + uy_j(1)*duduy_j(3)
800 +       t(3,atom2)=t(3,atom2) - uy_j(1)*duduy_j(2) + uy_j(2)*duduy_j(1)
801 +    endif
802 +
803   #endif
804      
805   #ifdef IS_MPI

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines