45 |
|
|
46 |
|
!! @author Charles F. Vardeman II |
47 |
|
!! @author Matthew Meineke |
48 |
< |
!! @version $Id: doForces.F90,v 1.67 2005-11-02 21:01:18 chrisfen Exp $, $Date: 2005-11-02 21:01:18 $, $Name: not supported by cvs2svn $, $Revision: 1.67 $ |
48 |
> |
!! @version $Id: doForces.F90,v 1.69 2005-11-21 22:58:35 gezelter Exp $, $Date: 2005-11-21 22:58:35 $, $Name: not supported by cvs2svn $, $Revision: 1.69 $ |
49 |
|
|
50 |
|
|
51 |
|
module doForces |
62 |
|
use shapes |
63 |
|
use vector_class |
64 |
|
use eam |
65 |
+ |
use suttonchen |
66 |
|
use status |
67 |
|
#ifdef IS_MPI |
68 |
|
use mpiSimulation |
87 |
|
logical, save :: haveInteractionHash = .false. |
88 |
|
logical, save :: haveGtypeCutoffMap = .false. |
89 |
|
logical, save :: haveDefaultCutoffs = .false. |
90 |
< |
logical, save :: haveRlist = .false. |
90 |
> |
logical, save :: haveSkinThickness = .false. |
91 |
> |
logical, save :: haveElectrostaticSummationMethod = .false. |
92 |
> |
logical, save :: haveCutoffPolicy = .false. |
93 |
> |
logical, save :: VisitCutoffsAfterComputing = .false. |
94 |
|
|
95 |
|
logical, save :: FF_uses_DirectionalAtoms |
96 |
|
logical, save :: FF_uses_Dipoles |
97 |
|
logical, save :: FF_uses_GayBerne |
98 |
|
logical, save :: FF_uses_EAM |
99 |
+ |
logical, save :: FF_uses_SC |
100 |
+ |
logical, save :: FF_uses_MEAM |
101 |
+ |
|
102 |
|
|
103 |
|
logical, save :: SIM_uses_DirectionalAtoms |
104 |
|
logical, save :: SIM_uses_EAM |
105 |
+ |
logical, save :: SIM_uses_SC |
106 |
+ |
logical, save :: SIM_uses_MEAM |
107 |
|
logical, save :: SIM_requires_postpair_calc |
108 |
|
logical, save :: SIM_requires_prepair_calc |
109 |
|
logical, save :: SIM_uses_PBC |
110 |
|
|
111 |
|
integer, save :: electrostaticSummationMethod |
112 |
+ |
integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY |
113 |
|
|
114 |
+ |
real(kind=dp), save :: defaultRcut, defaultRsw, largestRcut |
115 |
+ |
real(kind=dp), save :: skinThickness |
116 |
+ |
logical, save :: defaultDoShift |
117 |
+ |
|
118 |
|
public :: init_FF |
119 |
< |
public :: setDefaultCutoffs |
119 |
> |
public :: setCutoffs |
120 |
> |
public :: cWasLame |
121 |
> |
public :: setElectrostaticMethod |
122 |
> |
public :: setCutoffPolicy |
123 |
> |
public :: setSkinThickness |
124 |
|
public :: do_force_loop |
107 |
– |
public :: createInteractionHash |
108 |
– |
public :: createGtypeCutoffMap |
109 |
– |
public :: getStickyCut |
110 |
– |
public :: getStickyPowerCut |
111 |
– |
public :: getGayBerneCut |
112 |
– |
public :: getEAMCut |
113 |
– |
public :: getShapeCut |
125 |
|
|
126 |
|
#ifdef PROFILE |
127 |
|
public :: getforcetime |
149 |
|
end type gtypeCutoffs |
150 |
|
type(gtypeCutoffs), dimension(:,:), allocatable :: gtypeCutoffMap |
151 |
|
|
141 |
– |
integer, save :: cutoffPolicy = TRADITIONAL_CUTOFF_POLICY |
142 |
– |
real(kind=dp),save :: defaultRcut, defaultRsw, defaultRlist |
143 |
– |
real(kind=dp),save :: listSkin |
144 |
– |
|
152 |
|
contains |
153 |
|
|
154 |
< |
subroutine createInteractionHash(status) |
154 |
> |
subroutine createInteractionHash() |
155 |
|
integer :: nAtypes |
149 |
– |
integer, intent(out) :: status |
156 |
|
integer :: i |
157 |
|
integer :: j |
158 |
|
integer :: iHash |
164 |
|
logical :: i_is_GB |
165 |
|
logical :: i_is_EAM |
166 |
|
logical :: i_is_Shape |
167 |
+ |
logical :: i_is_SC |
168 |
+ |
logical :: i_is_MEAM |
169 |
|
logical :: j_is_LJ |
170 |
|
logical :: j_is_Elect |
171 |
|
logical :: j_is_Sticky |
173 |
|
logical :: j_is_GB |
174 |
|
logical :: j_is_EAM |
175 |
|
logical :: j_is_Shape |
176 |
+ |
logical :: j_is_SC |
177 |
+ |
logical :: j_is_MEAM |
178 |
|
real(kind=dp) :: myRcut |
179 |
|
|
170 |
– |
status = 0 |
171 |
– |
|
180 |
|
if (.not. associated(atypes)) then |
181 |
< |
call handleError("atype", "atypes was not present before call of createInteractionHash!") |
174 |
< |
status = -1 |
181 |
> |
call handleError("doForces", "atypes was not present before call of createInteractionHash!") |
182 |
|
return |
183 |
|
endif |
184 |
|
|
185 |
|
nAtypes = getSize(atypes) |
186 |
|
|
187 |
|
if (nAtypes == 0) then |
188 |
< |
status = -1 |
188 |
> |
call handleError("doForces", "nAtypes was zero during call of createInteractionHash!") |
189 |
|
return |
190 |
|
end if |
191 |
|
|
211 |
|
call getElementProperty(atypes, i, "is_GayBerne", i_is_GB) |
212 |
|
call getElementProperty(atypes, i, "is_EAM", i_is_EAM) |
213 |
|
call getElementProperty(atypes, i, "is_Shape", i_is_Shape) |
214 |
+ |
call getElementProperty(atypes, i, "is_SC", i_is_SC) |
215 |
+ |
call getElementProperty(atypes, i, "is_MEAM", i_is_MEAM) |
216 |
|
|
217 |
|
do j = i, nAtypes |
218 |
|
|
226 |
|
call getElementProperty(atypes, j, "is_GayBerne", j_is_GB) |
227 |
|
call getElementProperty(atypes, j, "is_EAM", j_is_EAM) |
228 |
|
call getElementProperty(atypes, j, "is_Shape", j_is_Shape) |
229 |
+ |
call getElementProperty(atypes, j, "is_SC", j_is_SC) |
230 |
+ |
call getElementProperty(atypes, j, "is_MEAM", j_is_MEAM) |
231 |
|
|
232 |
|
if (i_is_LJ .and. j_is_LJ) then |
233 |
|
iHash = ior(iHash, LJ_PAIR) |
249 |
|
iHash = ior(iHash, EAM_PAIR) |
250 |
|
endif |
251 |
|
|
252 |
+ |
if (i_is_SC .and. j_is_SC) then |
253 |
+ |
iHash = ior(iHash, SC_PAIR) |
254 |
+ |
endif |
255 |
+ |
|
256 |
|
if (i_is_GB .and. j_is_GB) iHash = ior(iHash, GAYBERNE_PAIR) |
257 |
|
if (i_is_GB .and. j_is_LJ) iHash = ior(iHash, GAYBERNE_LJ) |
258 |
|
if (i_is_LJ .and. j_is_GB) iHash = ior(iHash, GAYBERNE_LJ) |
272 |
|
haveInteractionHash = .true. |
273 |
|
end subroutine createInteractionHash |
274 |
|
|
275 |
< |
subroutine createGtypeCutoffMap(stat) |
275 |
> |
subroutine createGtypeCutoffMap() |
276 |
|
|
262 |
– |
integer, intent(out), optional :: stat |
277 |
|
logical :: i_is_LJ |
278 |
|
logical :: i_is_Elect |
279 |
|
logical :: i_is_Sticky |
288 |
|
integer :: nGroupsInRow |
289 |
|
integer :: nGroupsInCol |
290 |
|
integer :: nGroupTypesRow,nGroupTypesCol |
291 |
< |
real(kind=dp):: thisSigma, bigSigma, thisRcut, tradRcut, tol, skin |
291 |
> |
real(kind=dp):: thisSigma, bigSigma, thisRcut, tradRcut, tol |
292 |
|
real(kind=dp) :: biggestAtypeCutoff |
293 |
|
|
280 |
– |
stat = 0 |
294 |
|
if (.not. haveInteractionHash) then |
295 |
< |
call createInteractionHash(myStatus) |
283 |
< |
if (myStatus .ne. 0) then |
284 |
< |
write(default_error, *) 'createInteractionHash failed in doForces!' |
285 |
< |
stat = -1 |
286 |
< |
return |
287 |
< |
endif |
295 |
> |
call createInteractionHash() |
296 |
|
endif |
297 |
|
#ifdef IS_MPI |
298 |
|
nGroupsInRow = getNgroupsInRow(plan_group_row) |
344 |
|
if (thisRCut .gt. atypeMaxCutoff(i)) atypeMaxCutoff(i) = thisRCut |
345 |
|
endif |
346 |
|
endif |
347 |
< |
|
340 |
< |
|
347 |
> |
|
348 |
|
if (atypeMaxCutoff(i).gt.biggestAtypeCutoff) then |
349 |
|
biggestAtypeCutoff = atypeMaxCutoff(i) |
350 |
|
endif |
351 |
|
|
352 |
|
endif |
353 |
|
enddo |
347 |
– |
|
348 |
– |
|
354 |
|
|
355 |
|
istart = 1 |
356 |
|
jstart = 1 |
499 |
|
groupMaxCutoffCol => groupMaxCutoffRow |
500 |
|
#endif |
501 |
|
|
497 |
– |
|
498 |
– |
|
499 |
– |
|
500 |
– |
|
502 |
|
!! allocate the gtypeCutoffMap here. |
503 |
|
allocate(gtypeCutoffMap(nGroupTypesRow,nGroupTypesCol)) |
504 |
|
!! then we do a double loop over all the group TYPES to find the cutoff |
505 |
|
!! map between groups of two types |
506 |
|
tradRcut = max(maxval(gtypeMaxCutoffRow),maxval(gtypeMaxCutoffCol)) |
507 |
|
|
508 |
< |
do i = 1, nGroupTypesRow |
508 |
> |
do i = 1, nGroupTypesRow |
509 |
|
do j = 1, nGroupTypesCol |
510 |
|
|
511 |
|
select case(cutoffPolicy) |
520 |
|
return |
521 |
|
end select |
522 |
|
gtypeCutoffMap(i,j)%rcut = thisRcut |
523 |
+ |
|
524 |
+ |
if (thisRcut.gt.largestRcut) largestRcut = thisRcut |
525 |
+ |
|
526 |
|
gtypeCutoffMap(i,j)%rcutsq = thisRcut*thisRcut |
523 |
– |
skin = defaultRlist - defaultRcut |
524 |
– |
listSkin = skin ! set neighbor list skin thickness |
525 |
– |
gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skin)**2 |
527 |
|
|
528 |
+ |
if (.not.haveSkinThickness) then |
529 |
+ |
skinThickness = 1.0_dp |
530 |
+ |
endif |
531 |
+ |
|
532 |
+ |
gtypeCutoffMap(i,j)%rlistsq = (thisRcut + skinThickness)**2 |
533 |
+ |
|
534 |
|
! sanity check |
535 |
|
|
536 |
|
if (haveDefaultCutoffs) then |
540 |
|
endif |
541 |
|
enddo |
542 |
|
enddo |
543 |
+ |
|
544 |
|
if(allocated(gtypeMaxCutoffRow)) deallocate(gtypeMaxCutoffRow) |
545 |
|
if(allocated(groupMaxCutoffRow)) deallocate(groupMaxCutoffRow) |
546 |
|
if(allocated(atypeMaxCutoff)) deallocate(atypeMaxCutoff) |
554 |
|
haveGtypeCutoffMap = .true. |
555 |
|
end subroutine createGtypeCutoffMap |
556 |
|
|
557 |
< |
subroutine setDefaultCutoffs(defRcut, defRsw, defRlist, cutPolicy) |
550 |
< |
real(kind=dp),intent(in) :: defRcut, defRsw, defRlist |
551 |
< |
integer, intent(in) :: cutPolicy |
557 |
> |
subroutine setCutoffs(defRcut, defRsw) |
558 |
|
|
559 |
+ |
real(kind=dp),intent(in) :: defRcut, defRsw |
560 |
+ |
character(len = statusMsgSize) :: errMsg |
561 |
+ |
integer :: localError |
562 |
+ |
|
563 |
|
defaultRcut = defRcut |
564 |
|
defaultRsw = defRsw |
565 |
< |
defaultRlist = defRlist |
566 |
< |
cutoffPolicy = cutPolicy |
565 |
> |
|
566 |
> |
defaultDoShift = .false. |
567 |
> |
if (abs(defaultRcut-defaultRsw) .lt. 0.0001) then |
568 |
> |
|
569 |
> |
write(errMsg, *) & |
570 |
> |
'cutoffRadius and switchingRadius are set to the same', newline & |
571 |
> |
// tab, 'value. OOPSE will use shifted ', newline & |
572 |
> |
// tab, 'potentials instead of switching functions.' |
573 |
> |
|
574 |
> |
call handleInfo("setCutoffs", errMsg) |
575 |
> |
|
576 |
> |
defaultDoShift = .true. |
577 |
> |
|
578 |
> |
endif |
579 |
|
|
580 |
+ |
localError = 0 |
581 |
+ |
call setLJDefaultCutoff( defaultRcut, defaultDoShift ) |
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 |
+ |
|
589 |
|
haveDefaultCutoffs = .true. |
590 |
< |
end subroutine setDefaultCutoffs |
590 |
> |
end subroutine setCutoffs |
591 |
|
|
592 |
+ |
subroutine cWasLame() |
593 |
+ |
|
594 |
+ |
VisitCutoffsAfterComputing = .true. |
595 |
+ |
return |
596 |
+ |
|
597 |
+ |
end subroutine cWasLame |
598 |
+ |
|
599 |
|
subroutine setCutoffPolicy(cutPolicy) |
600 |
< |
|
600 |
> |
|
601 |
|
integer, intent(in) :: cutPolicy |
602 |
+ |
|
603 |
|
cutoffPolicy = cutPolicy |
604 |
+ |
haveCutoffPolicy = .true. |
605 |
+ |
|
606 |
|
call createGtypeCutoffMap() |
566 |
– |
end subroutine setCutoffPolicy |
567 |
– |
|
607 |
|
|
608 |
< |
subroutine setSimVariables() |
609 |
< |
SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms() |
610 |
< |
SIM_uses_EAM = SimUsesEAM() |
572 |
< |
SIM_requires_postpair_calc = SimRequiresPostpairCalc() |
573 |
< |
SIM_requires_prepair_calc = SimRequiresPrepairCalc() |
574 |
< |
SIM_uses_PBC = SimUsesPBC() |
608 |
> |
end subroutine setCutoffPolicy |
609 |
> |
|
610 |
> |
subroutine setElectrostaticMethod( thisESM ) |
611 |
|
|
612 |
< |
haveSIMvariables = .true. |
612 |
> |
integer, intent(in) :: thisESM |
613 |
|
|
614 |
< |
return |
615 |
< |
end subroutine setSimVariables |
614 |
> |
electrostaticSummationMethod = thisESM |
615 |
> |
haveElectrostaticSummationMethod = .true. |
616 |
> |
|
617 |
> |
end subroutine setElectrostaticMethod |
618 |
|
|
619 |
+ |
subroutine setSkinThickness( thisSkin ) |
620 |
+ |
|
621 |
+ |
real(kind=dp), intent(in) :: thisSkin |
622 |
+ |
|
623 |
+ |
skinThickness = thisSkin |
624 |
+ |
haveSkinThickness = .true. |
625 |
+ |
|
626 |
+ |
call createGtypeCutoffMap() |
627 |
+ |
|
628 |
+ |
end subroutine setSkinThickness |
629 |
+ |
|
630 |
+ |
subroutine setSimVariables() |
631 |
+ |
SIM_uses_DirectionalAtoms = SimUsesDirectionalAtoms() |
632 |
+ |
SIM_uses_EAM = SimUsesEAM() |
633 |
+ |
SIM_requires_postpair_calc = SimRequiresPostpairCalc() |
634 |
+ |
SIM_requires_prepair_calc = SimRequiresPrepairCalc() |
635 |
+ |
SIM_uses_PBC = SimUsesPBC() |
636 |
+ |
|
637 |
+ |
haveSIMvariables = .true. |
638 |
+ |
|
639 |
+ |
return |
640 |
+ |
end subroutine setSimVariables |
641 |
+ |
|
642 |
|
subroutine doReadyCheck(error) |
643 |
|
integer, intent(out) :: error |
644 |
|
|
647 |
|
error = 0 |
648 |
|
|
649 |
|
if (.not. haveInteractionHash) then |
650 |
< |
myStatus = 0 |
590 |
< |
call createInteractionHash(myStatus) |
591 |
< |
if (myStatus .ne. 0) then |
592 |
< |
write(default_error, *) 'createInteractionHash failed in doForces!' |
593 |
< |
error = -1 |
594 |
< |
return |
595 |
< |
endif |
650 |
> |
call createInteractionHash() |
651 |
|
endif |
652 |
|
|
653 |
|
if (.not. haveGtypeCutoffMap) then |
654 |
< |
myStatus = 0 |
600 |
< |
call createGtypeCutoffMap(myStatus) |
601 |
< |
if (myStatus .ne. 0) then |
602 |
< |
write(default_error, *) 'createGtypeCutoffMap failed in doForces!' |
603 |
< |
error = -1 |
604 |
< |
return |
605 |
< |
endif |
654 |
> |
call createGtypeCutoffMap() |
655 |
|
endif |
656 |
|
|
657 |
+ |
|
658 |
+ |
if (VisitCutoffsAfterComputing) then |
659 |
+ |
call set_switch(GROUP_SWITCH, largestRcut, largestRcut) |
660 |
+ |
endif |
661 |
+ |
|
662 |
+ |
|
663 |
|
if (.not. haveSIMvariables) then |
664 |
|
call setSimVariables() |
665 |
|
endif |
693 |
|
end subroutine doReadyCheck |
694 |
|
|
695 |
|
|
696 |
< |
subroutine init_FF(thisESM, thisStat) |
696 |
> |
subroutine init_FF(thisStat) |
697 |
|
|
643 |
– |
integer, intent(in) :: thisESM |
698 |
|
integer, intent(out) :: thisStat |
699 |
|
integer :: my_status, nMatches |
700 |
|
integer, pointer :: MatchList(:) => null() |
702 |
|
!! assume things are copacetic, unless they aren't |
703 |
|
thisStat = 0 |
704 |
|
|
651 |
– |
electrostaticSummationMethod = thisESM |
652 |
– |
|
705 |
|
!! init_FF is called *after* all of the atom types have been |
706 |
|
!! defined in atype_module using the new_atype subroutine. |
707 |
|
!! |
798 |
|
real( kind = DP ) :: rVal |
799 |
|
real(kind=dp),dimension(3) :: d_atm, d_grp, fpair, fij |
800 |
|
real(kind=dp) :: rfpot, mu_i, virial |
801 |
+ |
real(kind=dp):: rCut |
802 |
|
integer :: me_i, me_j, n_in_i, n_in_j |
803 |
|
logical :: is_dp_i |
804 |
|
integer :: neighborListSize |
872 |
|
! (but only on the first time through): |
873 |
|
if (loop .eq. loopStart) then |
874 |
|
#ifdef IS_MPI |
875 |
< |
call checkNeighborList(nGroupsInRow, q_group_row, listSkin, & |
875 |
> |
call checkNeighborList(nGroupsInRow, q_group_row, skinThickness, & |
876 |
|
update_nlist) |
877 |
|
#else |
878 |
< |
call checkNeighborList(nGroups, q_group, listSkin, & |
878 |
> |
call checkNeighborList(nGroups, q_group, skinThickness, & |
879 |
|
update_nlist) |
880 |
|
#endif |
881 |
|
endif |
955 |
|
|
956 |
|
list(nlist) = j |
957 |
|
endif |
958 |
+ |
|
959 |
+ |
|
960 |
|
|
961 |
|
if (rgrpsq < gtypeCutoffMap(groupToGtypeRow(i),groupToGtypeCol(j))%rCutsq) then |
962 |
|
|
963 |
+ |
rCut = gtypeCutoffMap(groupToGtypeRow(i),groupToGtypeCol(j))%rCut |
964 |
|
if (loop .eq. PAIR_LOOP) then |
965 |
|
vij = 0.0d0 |
966 |
|
fij(1:3) = 0.0d0 |
967 |
|
endif |
968 |
|
|
969 |
< |
call get_switch(rgrpsq, sw, dswdr, rgrp, group_switch, & |
970 |
< |
in_switching_region) |
969 |
> |
call get_switch(rgrpsq, sw, dswdr, rgrp, & |
970 |
> |
group_switch, in_switching_region) |
971 |
|
|
972 |
|
n_in_j = groupStartCol(j+1) - groupStartCol(j) |
973 |
|
|
997 |
|
if (loop .eq. PREPAIR_LOOP) then |
998 |
|
#ifdef IS_MPI |
999 |
|
call do_prepair(atom1, atom2, ratmsq, d_atm, sw, & |
1000 |
< |
rgrpsq, d_grp, do_pot, do_stress, & |
1000 |
> |
rgrpsq, d_grp, rCut, do_pot, do_stress, & |
1001 |
|
eFrame, A, f, t, pot_local) |
1002 |
|
#else |
1003 |
|
call do_prepair(atom1, atom2, ratmsq, d_atm, sw, & |
1004 |
< |
rgrpsq, d_grp, do_pot, do_stress, & |
1004 |
> |
rgrpsq, d_grp, rCut, do_pot, do_stress, & |
1005 |
|
eFrame, A, f, t, pot) |
1006 |
|
#endif |
1007 |
|
else |
1008 |
|
#ifdef IS_MPI |
1009 |
|
call do_pair(atom1, atom2, ratmsq, d_atm, sw, & |
1010 |
|
do_pot, eFrame, A, f, t, pot_local, vpair, & |
1011 |
< |
fpair, d_grp, rgrp) |
1011 |
> |
fpair, d_grp, rgrp, rCut) |
1012 |
|
#else |
1013 |
|
call do_pair(atom1, atom2, ratmsq, d_atm, sw, & |
1014 |
|
do_pot, eFrame, A, f, t, pot, vpair, fpair, & |
1015 |
< |
d_grp, rgrp) |
1015 |
> |
d_grp, rgrp, rCut) |
1016 |
|
#endif |
1017 |
|
vij = vij + vpair |
1018 |
|
fij(1:3) = fij(1:3) + fpair(1:3) |
1220 |
|
end subroutine do_force_loop |
1221 |
|
|
1222 |
|
subroutine do_pair(i, j, rijsq, d, sw, do_pot, & |
1223 |
< |
eFrame, A, f, t, pot, vpair, fpair, d_grp, r_grp) |
1223 |
> |
eFrame, A, f, t, pot, vpair, fpair, d_grp, r_grp, rCut) |
1224 |
|
|
1225 |
|
real( kind = dp ) :: vpair, sw |
1226 |
|
real( kind = dp ), dimension(LR_POT_TYPES) :: pot |
1237 |
|
real ( kind = dp ), intent(inout) :: r_grp |
1238 |
|
real ( kind = dp ), intent(inout) :: d(3) |
1239 |
|
real ( kind = dp ), intent(inout) :: d_grp(3) |
1240 |
+ |
real ( kind = dp ), intent(inout) :: rCut |
1241 |
|
real ( kind = dp ) :: r |
1242 |
|
integer :: me_i, me_j |
1243 |
|
|
1258 |
|
iHash = InteractionHash(me_i, me_j) |
1259 |
|
|
1260 |
|
if ( iand(iHash, LJ_PAIR).ne.0 ) then |
1261 |
< |
call do_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1261 |
> |
call do_lj_pair(i, j, d, r, rijsq, rcut, sw, vpair, fpair, & |
1262 |
|
pot(VDW_POT), f, do_pot) |
1263 |
|
endif |
1264 |
|
|
1265 |
|
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1266 |
< |
call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1266 |
> |
call doElectrostaticPair(i, j, d, r, rijsq, rcut, sw, vpair, fpair, & |
1267 |
|
pot(ELECTROSTATIC_POT), eFrame, f, t, do_pot) |
1268 |
|
endif |
1269 |
|
|
1283 |
|
endif |
1284 |
|
|
1285 |
|
if ( iand(iHash, GAYBERNE_LJ).ne.0 ) then |
1286 |
< |
call do_gb_lj_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1286 |
> |
call do_gb_lj_pair(i, j, d, r, rijsq, rcut, sw, vpair, fpair, & |
1287 |
|
pot(VDW_POT), A, f, t, do_pot) |
1288 |
|
endif |
1289 |
|
|
1301 |
|
call do_shape_pair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1302 |
|
pot(VDW_POT), A, f, t, do_pot) |
1303 |
|
endif |
1304 |
+ |
|
1305 |
+ |
if ( iand(iHash, SC_PAIR).ne.0 ) then |
1306 |
+ |
call do_SC_pair(i, j, d, r, rijsq, rcut, sw, vpair, fpair, & |
1307 |
+ |
pot(METALLIC_POT), f, do_pot) |
1308 |
+ |
endif |
1309 |
+ |
|
1310 |
+ |
|
1311 |
|
|
1312 |
|
end subroutine do_pair |
1313 |
|
|
1314 |
< |
subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, & |
1314 |
> |
subroutine do_prepair(i, j, rijsq, d, sw, rcijsq, dc, rCut, & |
1315 |
|
do_pot, do_stress, eFrame, A, f, t, pot) |
1316 |
|
|
1317 |
|
real( kind = dp ) :: sw |
1323 |
|
|
1324 |
|
logical, intent(inout) :: do_pot, do_stress |
1325 |
|
integer, intent(in) :: i, j |
1326 |
< |
real ( kind = dp ), intent(inout) :: rijsq, rcijsq |
1326 |
> |
real ( kind = dp ), intent(inout) :: rijsq, rcijsq, rCut |
1327 |
|
real ( kind = dp ) :: r, rc |
1328 |
|
real ( kind = dp ), intent(inout) :: d(3), dc(3) |
1329 |
|
|
1342 |
|
iHash = InteractionHash(me_i, me_j) |
1343 |
|
|
1344 |
|
if ( iand(iHash, EAM_PAIR).ne.0 ) then |
1345 |
< |
call calc_EAM_prepair_rho(i, j, d, r, rijsq ) |
1345 |
> |
call calc_EAM_prepair_rho(i, j, d, r, rijsq) |
1346 |
|
endif |
1347 |
+ |
|
1348 |
+ |
if ( iand(iHash, SC_PAIR).ne.0 ) then |
1349 |
+ |
call calc_SC_prepair_rho(i, j, d, r, rijsq, rcut ) |
1350 |
+ |
endif |
1351 |
|
|
1352 |
|
end subroutine do_prepair |
1353 |
|
|
1359 |
|
if (FF_uses_EAM .and. SIM_uses_EAM) then |
1360 |
|
call calc_EAM_preforce_Frho(nlocal,pot(METALLIC_POT)) |
1361 |
|
endif |
1362 |
+ |
if (FF_uses_SC .and. SIM_uses_SC) then |
1363 |
+ |
call calc_SC_preforce_Frho(nlocal,pot(METALLIC_POT)) |
1364 |
+ |
endif |
1365 |
|
|
1366 |
|
|
1367 |
|
end subroutine do_preforce |
1545 |
|
|
1546 |
|
function FF_RequiresPrepairCalc() result(doesit) |
1547 |
|
logical :: doesit |
1548 |
< |
doesit = FF_uses_EAM |
1548 |
> |
doesit = FF_uses_EAM .or. FF_uses_SC & |
1549 |
> |
.or. FF_uses_MEAM |
1550 |
|
end function FF_RequiresPrepairCalc |
1551 |
|
|
1552 |
|
#ifdef PROFILE |