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

Merge branch 'master' into feature-cnt

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-06-12 05:53:17 -04:00
parent 0bc1c3b2a2 22ed175632
commit cf5c748fb4
572 changed files with 83637 additions and 10156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/atom.h
View File

@ -24,6 +24,7 @@ class Atom : protected Pointers {
public:
char *atom_style;
class AtomVec *avec;
enum{DOUBLE,INT,BIGINT};
// atom counts
@ -269,8 +270,8 @@ class Atom : protected Pointers {
void add_peratom_change_columns(const char *, int);
void add_peratom_vary(const char *, void *, int, int *,
void *, int collength=0);
void create_avec(const char *, int, char **, int);
virtual class AtomVec *new_avec(const char *, int, int &);
void create_avec(const std::string &, int, char **, int);
virtual class AtomVec *new_avec(const std::string &, int, int &);
void init();
void setup();
@ -284,8 +285,6 @@ class Atom : protected Pointers {
void bonus_check();
int parse_data(const char *);
int count_words(const char *);
int count_words(const char *, char *);
void deallocate_topology();