Skip to content

GitLab

Commit 5f509089 authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #1647 from peastman/polarizationzero 

Support multipoles with polarization set to 0
parents 9480ec98 effb1f57
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
plugins/amoeba/platforms/cuda/src/kernels/multipoleElectrostatics.cu
View file @ 5f509089
...@@ -107,9 +107,9 @@ __device__ void computeOneInteraction(AtomData& atom1, AtomData& atom2, bool has ...@@ -107,9 +107,9 @@ __device__ void computeOneInteraction(AtomData& atom1, AtomData& atom2, bool has
real dmp = atom1.damp*atom2.damp; real dmp = atom1.damp*atom2.damp;
real a = min(atom1.thole, atom2.thole); real a = min(atom1.thole, atom2.thole);
real u = fabs(dmp) > 1.0e-5f ? r/dmp : 1e10f; real u = r/dmp;
real au3 = a*u*u*u; real au3 = fabs(dmp) > 1.0e-5f ? a*u*u*u : 0;
real expau3 = au3 < 50 ? EXP(-au3) : 0; real expau3 = fabs(dmp) > 1.0e-5f ? EXP(-au3) : 0;
real a2u6 = au3*au3; real a2u6 = au3*au3;
real a3u9 = a2u6*au3; real a3u9 = a2u6*au3;
// Thole damping factors for energies // Thole damping factors for energies
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment