45 |
|
|
46 |
|
!! @author Charles F. Vardeman II |
47 |
|
!! @author Matthew Meineke |
48 |
< |
!! @version $Id: doForces.F90,v 1.61 2005-10-19 19:24:29 chrisfen Exp $, $Date: 2005-10-19 19:24:29 $, $Name: not supported by cvs2svn $, $Revision: 1.61 $ |
48 |
> |
!! @version $Id: doForces.F90,v 1.62 2005-10-23 21:08:02 chrisfen Exp $, $Date: 2005-10-23 21:08:02 $, $Name: not supported by cvs2svn $, $Revision: 1.62 $ |
49 |
|
|
50 |
|
|
51 |
|
module doForces |
754 |
|
integer :: propPack_i, propPack_j |
755 |
|
integer :: loopStart, loopEnd, loop |
756 |
|
integer :: iHash |
757 |
+ |
integer :: ig |
758 |
|
|
759 |
|
|
760 |
|
!! initialize local variables |
949 |
|
else |
950 |
|
#ifdef IS_MPI |
951 |
|
call do_pair(atom1, atom2, ratmsq, d_atm, sw, & |
952 |
< |
do_pot, & |
953 |
< |
eFrame, A, f, t, pot_local, vpair, fpair) |
952 |
> |
do_pot, eFrame, A, f, t, pot_local, vpair, & |
953 |
> |
fpair, d_grp, rgrp) |
954 |
|
#else |
955 |
|
call do_pair(atom1, atom2, ratmsq, d_atm, sw, & |
956 |
< |
do_pot, & |
957 |
< |
eFrame, A, f, t, pot, vpair, fpair) |
956 |
> |
do_pot, eFrame, A, f, t, pot, vpair, fpair, & |
957 |
> |
d_grp, rgrp) |
958 |
|
#endif |
959 |
|
|
960 |
|
vij = vij + vpair |
1086 |
|
#endif |
1087 |
|
|
1088 |
|
if (SIM_requires_postpair_calc) then |
1089 |
< |
|
1090 |
< |
#ifdef IS_MPI |
1091 |
< |
call scatter(rf_Row,rf,plan_atom_row_3d) |
1092 |
< |
call scatter(rf_Col,rf_Temp,plan_atom_col_3d) |
1093 |
< |
do i = 1,nlocal |
1093 |
< |
rf(1:3,i) = rf(1:3,i) + rf_Temp(1:3,i) |
1094 |
< |
end do |
1095 |
< |
#endif |
1096 |
< |
|
1097 |
< |
do i = 1, nLocal |
1098 |
< |
|
1099 |
< |
rfpot = 0.0_DP |
1100 |
< |
#ifdef IS_MPI |
1101 |
< |
me_i = atid_row(i) |
1102 |
< |
#else |
1089 |
> |
do i = 1, nlocal |
1090 |
> |
|
1091 |
> |
! we loop only over the local atoms, so we don't need row and column |
1092 |
> |
! lookups for the types |
1093 |
> |
|
1094 |
|
me_i = atid(i) |
1104 |
– |
#endif |
1105 |
– |
iHash = InteractionHash(me_i,me_j) |
1095 |
|
|
1096 |
+ |
! is the atom electrostatic? See if it would have an |
1097 |
+ |
! electrostatic interaction with itself |
1098 |
+ |
iHash = InteractionHash(me_i,me_i) |
1099 |
+ |
|
1100 |
|
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1108 |
– |
|
1109 |
– |
mu_i = getDipoleMoment(me_i) |
1110 |
– |
|
1111 |
– |
!! The reaction field needs to include a self contribution |
1112 |
– |
!! to the field: |
1113 |
– |
call accumulate_self_rf(i, mu_i, eFrame) |
1114 |
– |
!! Get the reaction field contribution to the |
1115 |
– |
!! potential and torques: |
1116 |
– |
call reaction_field_final(i, mu_i, eFrame, rfpot, t, do_pot) |
1101 |
|
#ifdef IS_MPI |
1102 |
< |
pot_local(ELECTROSTATIC_POT) = pot_local(ELECTROSTATIC_POT) + rfpot |
1102 |
> |
call rf_self_self(i, eFrame, pot_local(ELECTROSTATIC_POT), & |
1103 |
> |
t, do_pot) |
1104 |
|
#else |
1105 |
< |
pot(ELECTROSTATIC_POT) = pot(ELECTROSTATIC_POT) + rfpot |
1106 |
< |
|
1105 |
> |
call rf_self_self(i, eFrame, pot(ELECTROSTATIC_POT), & |
1106 |
> |
t, do_pot) |
1107 |
|
#endif |
1108 |
|
endif |
1109 |
|
enddo |
1110 |
|
endif |
1111 |
|
|
1112 |
|
#ifdef IS_MPI |
1113 |
< |
|
1113 |
> |
|
1114 |
|
if (do_pot) then |
1115 |
< |
pot(1:LR_POT_TYPES) = pot(1:LR_POT_TYPES) & |
1116 |
< |
+ pot_local(1:LR_POT_TYPES) |
1132 |
< |
!! we assume the c code will do the allreduce to get the total potential |
1133 |
< |
!! we could do it right here if we needed to... |
1115 |
> |
call mpi_allreduce(pot_local, pot, LR_POT_TYPES,mpi_double_precision,mpi_sum, & |
1116 |
> |
mpi_comm_world,mpi_err) |
1117 |
|
endif |
1118 |
< |
|
1118 |
> |
|
1119 |
|
if (do_stress) then |
1120 |
|
call mpi_allreduce(tau_Temp, tau, 9,mpi_double_precision,mpi_sum, & |
1121 |
|
mpi_comm_world,mpi_err) |
1122 |
|
call mpi_allreduce(virial_Temp, virial,1,mpi_double_precision,mpi_sum, & |
1123 |
|
mpi_comm_world,mpi_err) |
1124 |
|
endif |
1125 |
< |
|
1125 |
> |
|
1126 |
|
#else |
1127 |
< |
|
1127 |
> |
|
1128 |
|
if (do_stress) then |
1129 |
|
tau = tau_Temp |
1130 |
|
virial = virial_Temp |
1131 |
|
endif |
1132 |
< |
|
1132 |
> |
|
1133 |
|
#endif |
1134 |
< |
|
1134 |
> |
|
1135 |
|
end subroutine do_force_loop |
1136 |
|
|
1137 |
|
subroutine do_pair(i, j, rijsq, d, sw, do_pot, & |
1138 |
< |
eFrame, A, f, t, pot, vpair, fpair) |
1138 |
> |
eFrame, A, f, t, pot, vpair, fpair, d_grp, r_grp) |
1139 |
|
|
1140 |
|
real( kind = dp ) :: vpair, sw |
1141 |
|
real( kind = dp ), dimension(LR_POT_TYPES) :: pot |
1149 |
|
logical, intent(inout) :: do_pot |
1150 |
|
integer, intent(in) :: i, j |
1151 |
|
real ( kind = dp ), intent(inout) :: rijsq |
1152 |
< |
real ( kind = dp ) :: r |
1152 |
> |
real ( kind = dp ), intent(inout) :: r_grp |
1153 |
|
real ( kind = dp ), intent(inout) :: d(3) |
1154 |
+ |
real ( kind = dp ), intent(inout) :: d_grp(3) |
1155 |
+ |
real ( kind = dp ) :: r |
1156 |
|
integer :: me_i, me_j |
1157 |
|
|
1158 |
|
integer :: iHash |
1179 |
|
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1180 |
|
call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1181 |
|
pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot) |
1197 |
– |
|
1198 |
– |
if (electrostaticSummationMethod == REACTION_FIELD) then |
1199 |
– |
|
1200 |
– |
! CHECK ME (RF needs to know about all electrostatic types) |
1201 |
– |
call accumulate_rf(i, j, r, eFrame, sw) |
1202 |
– |
call rf_correct_forces(i, j, d, r, eFrame, sw, f, fpair) |
1203 |
– |
endif |
1204 |
– |
|
1182 |
|
endif |
1183 |
|
|
1184 |
|
if ( iand(iHash, STICKY_PAIR).ne.0 ) then |