From a2ea263652c61ee13d612eb3751ef88533745b0f Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Tue, 30 Aug 2016 07:04:54 -0400
Subject: [PATCH] remove vector/array class members shadowing the base class
---
src/BODY/compute_body_local.h | 2 --
src/RIGID/compute_rigid_local.h | 2 --
src/USER-REAXC/compute_spec_atom.h | 2 --
src/compute_angle_local.h | 2 --
src/compute_bond_local.h | 2 --
src/compute_dihedral_local.cpp | 3 +--
src/compute_dihedral_local.h | 2 --
src/compute_improper_local.cpp | 3 +--
src/compute_improper_local.h | 2 --
src/compute_pair_local.h | 2 --
src/compute_property_atom.h | 2 --
src/compute_property_local.h | 2 --
12 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/src/BODY/compute_body_local.h b/src/BODY/compute_body_local.h
index 5e9c036ff2..e2ff9a38bd 100644
--- a/src/BODY/compute_body_local.h
+++ b/src/BODY/compute_body_local.h
@@ -37,8 +37,6 @@ class ComputeBodyLocal : public Compute {
int *which,*index;
int nmax;
- double *vector;
- double **array;
class AtomVecBody *avec;
class Body *bptr;
diff --git a/src/RIGID/compute_rigid_local.h b/src/RIGID/compute_rigid_local.h
index 2e54a19ab5..d7d545d1fd 100644
--- a/src/RIGID/compute_rigid_local.h
+++ b/src/RIGID/compute_rigid_local.h
@@ -41,8 +41,6 @@ class ComputeRigidLocal : public Compute {
class FixRigidSmall *fixrigid;
int nmax;
- double *vector;
- double **array;
int compute_rigid(int);
void reallocate(int);
diff --git a/src/USER-REAXC/compute_spec_atom.h b/src/USER-REAXC/compute_spec_atom.h
index 107a2bd39f..4d5cb86d71 100644
--- a/src/USER-REAXC/compute_spec_atom.h
+++ b/src/USER-REAXC/compute_spec_atom.h
@@ -36,8 +36,6 @@ class ComputeSpecAtom : public Compute {
private:
int nvalues;
int nmax;
- double *vector;
- double **array;
double *buf;
double *vbuf;
diff --git a/src/compute_angle_local.h b/src/compute_angle_local.h
index c3248b242a..cf5d2fbe37 100644
--- a/src/compute_angle_local.h
+++ b/src/compute_angle_local.h
@@ -37,8 +37,6 @@ class ComputeAngleLocal : public Compute {
int ncount;
int nmax;
- double *vector;
- double **array;
int compute_angles(int);
void reallocate(int);
diff --git a/src/compute_bond_local.h b/src/compute_bond_local.h
index a6639c2118..7d04515007 100644
--- a/src/compute_bond_local.h
+++ b/src/compute_bond_local.h
@@ -39,8 +39,6 @@ class ComputeBondLocal : public Compute {
int singleflag;
int nmax;
- double *vector;
- double **array;
int compute_bonds(int);
void reallocate(int);
diff --git a/src/compute_dihedral_local.cpp b/src/compute_dihedral_local.cpp
index f50f49fa11..d8fc1b792c 100644
--- a/src/compute_dihedral_local.cpp
+++ b/src/compute_dihedral_local.cpp
@@ -34,8 +34,7 @@ using namespace MathConst;
/* ---------------------------------------------------------------------- */
ComputeDihedralLocal::ComputeDihedralLocal(LAMMPS *lmp, int narg, char **arg) :
- Compute(lmp, narg, arg),
- vector(NULL), array(NULL)
+ Compute(lmp, narg, arg)
{
if (narg < 4) error->all(FLERR,"Illegal compute dihedral/local command");
diff --git a/src/compute_dihedral_local.h b/src/compute_dihedral_local.h
index 095ed68df3..cc4c16ca79 100644
--- a/src/compute_dihedral_local.h
+++ b/src/compute_dihedral_local.h
@@ -37,8 +37,6 @@ class ComputeDihedralLocal : public Compute {
int ncount;
int nmax;
- double *vector;
- double **array;
int compute_dihedrals(int);
void reallocate(int);
diff --git a/src/compute_improper_local.cpp b/src/compute_improper_local.cpp
index b9d69dc5b8..05a0cb4291 100644
--- a/src/compute_improper_local.cpp
+++ b/src/compute_improper_local.cpp
@@ -35,8 +35,7 @@ using namespace MathConst;
/* ---------------------------------------------------------------------- */
ComputeImproperLocal::ComputeImproperLocal(LAMMPS *lmp, int narg, char **arg) :
- Compute(lmp, narg, arg),
- vector(NULL), array(NULL)
+ Compute(lmp, narg, arg)
{
if (narg < 4) error->all(FLERR,"Illegal compute improper/local command");
diff --git a/src/compute_improper_local.h b/src/compute_improper_local.h
index 9a3905e057..57f6b9dcf9 100644
--- a/src/compute_improper_local.h
+++ b/src/compute_improper_local.h
@@ -37,8 +37,6 @@ class ComputeImproperLocal : public Compute {
int ncount;
int nmax;
- double *vector;
- double **array;
int compute_impropers(int);
void reallocate(int);
diff --git a/src/compute_pair_local.h b/src/compute_pair_local.h
index d6c2a12f22..2e01cba3ac 100644
--- a/src/compute_pair_local.h
+++ b/src/compute_pair_local.h
@@ -41,8 +41,6 @@ class ComputePairLocal : public Compute {
int singleflag;
int nmax;
- double *vector;
- double **array;
class NeighList *list;
diff --git a/src/compute_property_atom.h b/src/compute_property_atom.h
index 67fe83eeab..a81f39f6a9 100644
--- a/src/compute_property_atom.h
+++ b/src/compute_property_atom.h
@@ -36,8 +36,6 @@ class ComputePropertyAtom : public Compute {
int nvalues;
int nmax;
int *index;
- double *vector;
- double **array;
double *buf;
class AtomVecEllipsoid *avec_ellipsoid;
class AtomVecLine *avec_line;
diff --git a/src/compute_property_local.h b/src/compute_property_local.h
index 9262bf163f..fb2c5d2d18 100644
--- a/src/compute_property_local.h
+++ b/src/compute_property_local.h
@@ -37,8 +37,6 @@ class ComputePropertyLocal : public Compute {
int nvalues,kindflag,cutstyle;
int nmax;
- double *vector;
- double **array;
double *buf;
class NeighList *list;
--
GitLab