diff --git a/src/ASPHERE/compute_temp_asphere.cpp b/src/ASPHERE/compute_temp_asphere.cpp index f2d34ac72a..b4fb8c79f8 100755 --- a/src/ASPHERE/compute_temp_asphere.cpp +++ b/src/ASPHERE/compute_temp_asphere.cpp @@ -34,7 +34,7 @@ using namespace LAMMPS_NS; enum{ROTATE,ALL}; -#define INERTIA 0.2 // moment of inertia for ellipsoid +#define INERTIA 0.2 // moment of inertia prefactor for ellipsoid /* ---------------------------------------------------------------------- */ diff --git a/src/ASPHERE/fix_nve_asphere.cpp b/src/ASPHERE/fix_nve_asphere.cpp index 9e4155581f..e078d2fb75 100755 --- a/src/ASPHERE/fix_nve_asphere.cpp +++ b/src/ASPHERE/fix_nve_asphere.cpp @@ -29,7 +29,7 @@ using namespace LAMMPS_NS; -#define INERTIA 0.2 // moment of inertia for ellipsoid +#define INERTIA 0.2 // moment of inertia prefactor for ellipsoid /* ---------------------------------------------------------------------- */ diff --git a/src/compute_erotate_sphere.cpp b/src/compute_erotate_sphere.cpp index b357501a06..1aa5ad8d99 100644 --- a/src/compute_erotate_sphere.cpp +++ b/src/compute_erotate_sphere.cpp @@ -23,7 +23,7 @@ using namespace LAMMPS_NS; -#define INERTIA 0.4 // moment of inertia for sphere +#define INERTIA 0.4 // moment of inertia prefactor for sphere /* ---------------------------------------------------------------------- */ diff --git a/src/compute_temp_sphere.cpp b/src/compute_temp_sphere.cpp index 93c9ec74aa..246d58bae4 100644 --- a/src/compute_temp_sphere.cpp +++ b/src/compute_temp_sphere.cpp @@ -28,7 +28,7 @@ using namespace LAMMPS_NS; enum{ROTATE,ALL}; -#define INERTIA 0.4 // moment of inertia for sphere +#define INERTIA 0.4 // moment of inertia prefactor for sphere /* ---------------------------------------------------------------------- */ diff --git a/src/fix_langevin.cpp b/src/fix_langevin.cpp index 2f4308e386..5e40a7c28b 100644 --- a/src/fix_langevin.cpp +++ b/src/fix_langevin.cpp @@ -40,8 +40,8 @@ using namespace LAMMPS_NS; enum{NOBIAS,BIAS}; -#define SINERTIA 0.4 // moment of inertia for sphere -#define EINERTIA 0.2 // moment of inertia for ellipsoid +#define SINERTIA 0.4 // moment of inertia prefactor for sphere +#define EINERTIA 0.2 // moment of inertia prefactor for ellipsoid /* ---------------------------------------------------------------------- */ diff --git a/src/fix_nh_sphere.cpp b/src/fix_nh_sphere.cpp index d1be4184fd..9f39466552 100644 --- a/src/fix_nh_sphere.cpp +++ b/src/fix_nh_sphere.cpp @@ -24,7 +24,7 @@ using namespace LAMMPS_NS; -#define INERTIA 0.4 // moment of inertia for sphere +#define INERTIA 0.4 // moment of inertia prefactor for sphere /* ---------------------------------------------------------------------- */ diff --git a/src/fix_nve_sphere.cpp b/src/fix_nve_sphere.cpp index 02968e1f13..fc67023f4a 100644 --- a/src/fix_nve_sphere.cpp +++ b/src/fix_nve_sphere.cpp @@ -24,7 +24,7 @@ using namespace LAMMPS_NS; -#define INERTIA 0.4 // moment of inertia for sphere +#define INERTIA 0.4 // moment of inertia prefactor for sphere enum{NONE,DIPOLE}; diff --git a/src/memory.h b/src/memory.h index 64901536c2..47abb49443 100644 --- a/src/memory.h +++ b/src/memory.h @@ -45,7 +45,7 @@ class Memory : protected Pointers { bigint nbytes = sizeof(TYPE) * n; array = (TYPE *) smalloc(nbytes,name); return array; - }; + } template <typename TYPE> TYPE **create(TYPE **&array, int n, const char *name) {fail(name);} @@ -62,7 +62,7 @@ class Memory : protected Pointers { bigint nbytes = sizeof(TYPE) * n; array = (TYPE *) srealloc(array,nbytes,name); return array; - }; + } template <typename TYPE> TYPE **grow(TYPE **&array, int n, const char *name) {fail(name);} @@ -75,7 +75,7 @@ class Memory : protected Pointers { void destroy(TYPE *array) { sfree(array); - }; + } /* ---------------------------------------------------------------------- create a 1d array with index from nlo to nhi inclusive