From 42c7eae479ea7b0b5be041fea0c7ea92b42c3daf Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 1 Dec 2011 15:21:06 -0500 Subject: [PATCH 1/2] fix typo --- doc/pair_tersoff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pair_tersoff.txt b/doc/pair_tersoff.txt index db5a82e188..d822ac7777 100644 --- a/doc/pair_tersoff.txt +++ b/doc/pair_tersoff.txt @@ -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 From 0ce291599e37721d48720b2cde4fd50be1040d19 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 1 Dec 2011 19:18:06 -0500 Subject: [PATCH 2/2] bugfix for bug reported by karl hammond --- src/library.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/library.h b/src/library.h index db2d051698..3d692b4f50 100644 --- a/src/library.h +++ b/src/library.h @@ -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 *);