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

remove changes left behind from GLE merge

Browse Source
This commit is contained in:
Axel Kohlmeyer
2014-08-08 11:25:04 -04:00
parent 4a197537c0
commit cb8a838a63
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/atom.cpp
View File

@ -54,7 +54,6 @@ enum{LAYOUT_UNIFORM,LAYOUT_NONUNIFORM,LAYOUT_TILED}; // several files
Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
{
natoms = 0;
ns = 0; //!GLE
nlocal = nghost = nmax = 0;
ntypes = 0;
nbondtypes = nangletypes = ndihedraltypes = nimpropertypes = 0;
@ -75,7 +74,6 @@ Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
type = mask = NULL;
image = NULL;
x = v = f = NULL;
s = NULL; //!GLE
molecule = NULL;
molindex = molatom = NULL;
@ -209,7 +207,6 @@ Atom::~Atom()
memory->destroy(x);
memory->destroy(v);
memory->destroy(f);
memory->destroy(s); //!GLE
memory->destroy(molecule);
memory->destroy(molindex);
@ -1912,7 +1909,6 @@ void *Atom::extract(char *name)
if (strcmp(name,"x") == 0) return (void *) x;
if (strcmp(name,"v") == 0) return (void *) v;
if (strcmp(name,"f") == 0) return (void *) f;
if (strcmp(name,"s") == 0) return (void *) s; //!GLE
if (strcmp(name,"molecule") == 0) return (void *) molecule;
if (strcmp(name,"q") == 0) return (void *) q;
if (strcmp(name,"mu") == 0) return (void *) mu;

1
src/atom.h
View File

@ -51,7 +51,6 @@ class Atom : protected Pointers {
imageint *image;
double **x,**v,**f;
double **s; int ns; //!GLE
tagint *molecule;
int *molindex,*molatom;