Merge remote-tracking branch 'origin/master' into refactor-table-reading
This commit is contained in:
38
src/force.h
38
src/force.h
@ -101,32 +101,32 @@ class Force : protected Pointers {
|
||||
void init();
|
||||
void setup();
|
||||
|
||||
void create_pair(const char *, int);
|
||||
class Pair *new_pair(const char *, int, int &);
|
||||
class Pair *pair_match(const char *, int, int nsub=0);
|
||||
void create_pair(const std::string &, int);
|
||||
class Pair *new_pair(const std::string &, int, int &);
|
||||
class Pair *pair_match(const std::string &, int, int nsub=0);
|
||||
char *pair_match_ptr(Pair *);
|
||||
|
||||
void create_bond(const char *, int);
|
||||
class Bond *new_bond(const char *, int, int &);
|
||||
class Bond *bond_match(const char *);
|
||||
void create_bond(const std::string &, int);
|
||||
class Bond *new_bond(const std::string &, int, int &);
|
||||
class Bond *bond_match(const std::string &);
|
||||
|
||||
void create_angle(const char *, int);
|
||||
class Angle *new_angle(const char *, int, int &);
|
||||
class Angle *angle_match(const char *);
|
||||
void create_angle(const std::string &, int);
|
||||
class Angle *new_angle(const std::string &, int, int &);
|
||||
class Angle *angle_match(const std::string &);
|
||||
|
||||
void create_dihedral(const char *, int);
|
||||
class Dihedral *new_dihedral(const char *, int, int &);
|
||||
class Dihedral *dihedral_match(const char *);
|
||||
void create_dihedral(const std::string &, int);
|
||||
class Dihedral *new_dihedral(const std::string &, int, int &);
|
||||
class Dihedral *dihedral_match(const std::string &);
|
||||
|
||||
void create_improper(const char *, int);
|
||||
class Improper *new_improper(const char *, int, int &);
|
||||
class Improper *improper_match(const char *);
|
||||
void create_improper(const std::string &, int);
|
||||
class Improper *new_improper(const std::string &, int, int &);
|
||||
class Improper *improper_match(const std::string &);
|
||||
|
||||
void create_kspace(const char *, int);
|
||||
class KSpace *new_kspace(const char *, int, int &);
|
||||
class KSpace *kspace_match(const char *, int);
|
||||
void create_kspace(const std::string &, int);
|
||||
class KSpace *new_kspace(const std::string &, int, int &);
|
||||
class KSpace *kspace_match(const std::string &, int);
|
||||
|
||||
void store_style(char *&, const char *, int);
|
||||
void store_style(char *&, const std::string &, int);
|
||||
void set_special(int, char **);
|
||||
void bounds(const char *, int, char *, int, int &, int &, int nmin=1);
|
||||
void boundsbig(const char *, int, char *, bigint, bigint &, bigint &, bigint nmin=1);
|
||||
|
||||
Reference in New Issue
Block a user