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

Comparing trunk/OOPSE-3.0/src/UseTheForce/DarkSide/electrostatic.F90 (file contents):
Revision 2415 by chrisfen, Thu Nov 3 23:12:27 2005 UTC vs.
Revision 2416 by chrisfen, Thu Nov 3 23:22:51 2005 UTC

# Line 1368 | Line 1368 | contains
1368            
1369         endif
1370  
1371 < !!$    elseif (summationMethod .eq. SHIFTED_FORCE) then
1372 < !!$       if (ElectrostaticMap(atid1)%is_Charge) then
1373 < !!$          c1 = getCharge(atid1)
1374 < !!$          
1375 < !!$          if (screeningMethod .eq. DAMPED) then
1376 < !!$             mypot = mypot - (f0c * rcuti * 0.5_dp + &
1377 < !!$                  dampingAlpha*invRootPi) * c1 * c1    
1378 < !!$            
1379 < !!$          else            
1380 < !!$             mypot = mypot - (rcuti * 0.5_dp * c1 * c1)
1381 < !!$            
1382 < !!$          endif
1383 < !!$       endif
1384 < !!$    endif
1371 >    elseif (summationMethod .eq. SHIFTED_FORCE) then
1372 >       if (ElectrostaticMap(atid1)%is_Charge) then
1373 >          c1 = getCharge(atid1)
1374 >          
1375 >          if (screeningMethod .eq. DAMPED) then
1376 >             mypot = mypot - (f0c * rcuti * 0.5_dp + &
1377 >                  dampingAlpha*invRootPi) * c1 * c1    
1378 >            
1379 >          else            
1380 >             mypot = mypot - (rcuti * 0.5_dp * c1 * c1)
1381 >            
1382 >          endif
1383 >       endif
1384 >    endif
1385      
1386      return
1387    end subroutine self_self

Diff Legend

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