45 |
|
|
46 |
|
!! @author Charles F. Vardeman II |
47 |
|
!! @author Matthew Meineke |
48 |
< |
!! @version $Id: doForces.F90,v 1.32 2005-08-26 21:30:30 chrisfen Exp $, $Date: 2005-08-26 21:30:30 $, $Name: not supported by cvs2svn $, $Revision: 1.32 $ |
48 |
> |
!! @version $Id: doForces.F90,v 1.33 2005-08-30 18:23:29 chrisfen Exp $, $Date: 2005-08-30 18:23:29 $, $Name: not supported by cvs2svn $, $Revision: 1.33 $ |
49 |
|
|
50 |
|
|
51 |
|
module doForces |
99 |
|
logical, save :: SIM_requires_prepair_calc |
100 |
|
logical, save :: SIM_uses_PBC |
101 |
|
|
102 |
+ |
integer, save :: corrMethod |
103 |
+ |
|
104 |
|
public :: init_FF |
105 |
|
public :: setDefaultCutoffs |
106 |
|
public :: do_force_loop |
438 |
|
end subroutine doReadyCheck |
439 |
|
|
440 |
|
|
441 |
< |
subroutine init_FF(use_RF_c, thisStat) |
441 |
> |
subroutine init_FF(use_RF_c, use_UW_c, use_DW_c, thisStat) |
442 |
|
|
443 |
|
logical, intent(in) :: use_RF_c |
444 |
< |
|
444 |
> |
logical, intent(in) :: use_UW_c |
445 |
> |
logical, intent(in) :: use_DW_c |
446 |
|
integer, intent(out) :: thisStat |
447 |
|
integer :: my_status, nMatches |
448 |
+ |
integer :: corrMethod |
449 |
|
integer, pointer :: MatchList(:) => null() |
450 |
|
real(kind=dp) :: rcut, rrf, rt, dielect |
451 |
|
|
455 |
|
!! Fortran's version of a cast: |
456 |
|
FF_uses_RF = use_RF_c |
457 |
|
|
458 |
+ |
!! set the electrostatic correction method |
459 |
+ |
if (use_UW_c .eq. .true.) then |
460 |
+ |
corrMethod = 1 |
461 |
+ |
elseif (use_DW_c .eq. .true.) then |
462 |
+ |
corrMethod = 2 |
463 |
+ |
else |
464 |
+ |
corrMethod = 0 |
465 |
+ |
endif |
466 |
+ |
|
467 |
|
!! init_FF is called *after* all of the atom types have been |
468 |
|
!! defined in atype_module using the new_atype subroutine. |
469 |
|
!! |
1028 |
|
|
1029 |
|
if ( iand(iHash, ELECTROSTATIC_PAIR).ne.0 ) then |
1030 |
|
call doElectrostaticPair(i, j, d, r, rijsq, sw, vpair, fpair, & |
1031 |
< |
pot, eFrame, f, t, do_pot) |
1031 |
> |
pot, eFrame, f, t, do_pot, corrMethod) |
1032 |
|
|
1033 |
|
if (FF_uses_RF .and. SIM_uses_RF) then |
1034 |
|
|