Skip to content

GitLab

Commit a557b94c authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed compilation error

parent 5f7a30a8
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
plugins/amoeba/platforms/cuda/src/kernels/amoebaTorsionTorsionForce.cu
View file @ a557b94c
...@@ -45,13 +45,12 @@ if (cosine1 > 0.99f || cosine1 < -0.99f) { ...@@ -45,13 +45,12 @@ if (cosine1 > 0.99f || cosine1 < -0.99f) {
// We're close to the singularity in acos(), so take the cross product and use asin() instead. // We're close to the singularity in acos(), so take the cross product and use asin() instead.
real3 cross_prod = cross(make_real3(xt, yt, zt), make_real3(xu, yu, zu)); real3 cross_prod = cross(make_real3(xt, yt, zt), make_real3(xu, yu, zu));
angle1 = ASIN(SQRT(dot(cross_prod, cross_prod)/(rt2*ru2))); angle1 = RAD_TO_DEG*ASIN(SQRT(dot(cross_prod, cross_prod)/(rt2*ru2)));
if (cosine1 < 0.0f) if (cosine1 < 0.0f)
angle1 = M_PI-angle1; angle1 = 180-angle1;
} }
else else
angle1 = ACOS(cosine1); angle1 = RAD_TO_DEG*ACOS(cosine1);
angle1 = RAD_TO_DEG*angle1;
real sign = xba*xu + yba*yu + zba*zu; real sign = xba*xu + yba*yu + zba*zu;
angle1 = (sign < 0 ? -angle1 : angle1); angle1 = (sign < 0 ? -angle1 : angle1);
real value1 = angle1; real value1 = angle1;
...@@ -65,13 +64,12 @@ if (cosine2 > 0.99f || cosine2 < -0.99f) { ...@@ -65,13 +64,12 @@ if (cosine2 > 0.99f || cosine2 < -0.99f) {
// We're close to the singularity in acos(), so take the cross product and use asin() instead. // We're close to the singularity in acos(), so take the cross product and use asin() instead.
real3 cross_prod = cross(make_real3(xu, yu, zu), make_real3(xv, yv, zv)); real3 cross_prod = cross(make_real3(xu, yu, zu), make_real3(xv, yv, zv));
angle2 = ASIN(SQRT(dot(cross_prod, cross_prod)/(ru2*rv2))); angle2 = RAD_TO_DEG*ASIN(SQRT(dot(cross_prod, cross_prod)/(ru2*rv2)));
if (cosine2 < 0.0f) if (cosine2 < 0.0f)
angle2 = M_PI-angle2; angle2 = 180-angle2;
} }
else else
angle2 = ACOS(cosine2); angle2 = RAD_TO_DEG*ACOS(cosine2);
angle2 = RAD_TO_DEG*angle2;
sign = xcb*xv + ycb*yv + zcb*zv; sign = xcb*xv + ycb*yv + zcb*zv;
angle2 = (sign < 0 ? -angle2 : angle2); angle2 = (sign < 0 ? -angle2 : angle2);
real value2 = angle2; real value2 = angle2;
......
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