ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bufixes for angle style quartic

Browse Source
This commit is contained in:
Axel Kohlmeyer
2013-11-23 22:55:26 +01:00
parent f3b8891e78
commit 356e222654
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/USER-MISC/angle_quartic.cpp
View File

@ -120,7 +120,7 @@ void AngleQuartic::compute(int eflag, int vflag)
eangle = k2[type] * dtheta2 + k3[type] * dtheta3 + k4[type] * dtheta4;
}
a = -2.0 * tk * s;
a = -tk * s;
a11 = a*c / rsq1;
a12 = -a / (r1*r2);
a22 = a*c / rsq2;
@ -253,7 +253,7 @@ void AngleQuartic::read_restart(FILE *fp)
void AngleQuartic::write_data(FILE *fp)
{
for (int i = 1; i <= atom->nangletypes; i++)
fprintf(fp,"%d %g %g %g %g\n",i,k2[i],k3[i],k4[i],theta0[i]/MY_PI*180.0);
fprintf(fp,"%d %g %g %g %g\n",i,theta0[i]/MY_PI*180.0,k2[i],k3[i],k4[i]);
}
/* ---------------------------------------------------------------------- */

2
src/USER-OMP/angle_quartic_omp.cpp
View File

@ -145,7 +145,7 @@ void AngleQuarticOMP::eval(int nfrom, int nto, ThrData * const thr)
eangle = k2[type] * dtheta2 + k3[type] * dtheta3 + k4[type] * dtheta4;
}
a = -2.0 * tk * s;
a = -tk * s;
a11 = a*c / rsq1;
a12 = -a / (r1*r2);
a22 = a*c / rsq2;