Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp-master

This commit is contained in:
Axel Kohlmeyer
2011-12-02 17:59:47 -05:00
2 changed files with 2 additions and 2 deletions

View File

@ -141,7 +141,7 @@ Note that in the current Tersoff implementation in LAMMPS, m must be
specified as either 3 or 1. Tersoff used a slightly different but
equivalent form for alloys, which we will refer to as Tersoff_2
potential "(Tersoff_2)"_#Tersoff_2. The {tersoff/table} style implements
Teroff_2 parameterization only.
Tersoff_2 parameterization only.
LAMMPS parameter values for Tersoff_2 can be obtained as follows:
gamma_ijk = omega_ik, lambda3 = 0 and the value of

View File

@ -34,7 +34,7 @@ void lammps_free(void *);
void *lammps_extract_global(void *, char *);
void *lammps_extract_atom(void *, char *);
void *lammps_extract_compute(void *, char *, int, int);
void *lammps_extract_fix(void *, int, int, int, int);
void *lammps_extract_fix(void *, char *, int, int, int, int);
void *lammps_extract_variable(void *, char *, char *);
int lammps_get_natoms(void *);