move match_field to protected method and format the docstring

This commit is contained in:
nw13slx
2021-12-11 14:25:29 -05:00
parent 2cdafb49a2
commit 250a5921a3
2 changed files with 10 additions and 7 deletions

View File

@ -179,17 +179,19 @@ bigint ReaderNative::read_header(double box[3][3], int &boxinfo, int &triclinic,
return natoms;
}
/* ----------------------------------------------------------------------
match each field with a column of per-atom data
if fieldlabel set, match with explicit column
else infer one or more column matches from fieldtype
xyz flag set by scaleflag + wrapflag (if fieldlabel set) or column label
------------------------------------------------------------------------- */
void ReaderNative::match_field(int nfield,
int &xflag, int &yflag, int &zflag,
int *fieldtype, char **fieldlabel,
int scaleflag, int wrapflag, int &fieldflag,
std::map<std::string, int> labels)
{
// match each field with a column of per-atom data
// if fieldlabel set, match with explicit column
// else infer one or more column matches from fieldtype
// xyz flag set by scaleflag + wrapflag (if fieldlabel set) or column label
memory->create(fieldindex,nfield,"read_dump:fieldindex");
int s_index,u_index,su_index;

View File

@ -37,12 +37,13 @@ class ReaderNative : public Reader {
void skip();
bigint read_header(double[3][3], int &, int &, int, int, int *, char **, int, int, int &, int &,
int &, int &);
void match_field(int, int &, int &, int &, int *, char **, int, int, int &,
std::map<std::string, int>);
void read_atoms(int, int, double **);
protected:
int *fieldindex; //
void match_field(int, int &, int &, int &, int *, char **, int, int, int &,
std::map<std::string, int>);
private:
char *line; // line read from dump file