diff --git a/src/read_dump.cpp b/src/read_dump.cpp index 4be47497e0..8b5e2a6269 100644 --- a/src/read_dump.cpp +++ b/src/read_dump.cpp @@ -815,7 +815,7 @@ void ReadDump::process_atoms() double **x = atom->x; double **v = atom->v; double *q = atom->q; - double *lambda = atom->lambda; + double *apip_lambda = atom->lambda; double **f = atom->f; tagint *tag = atom->tag; imageint *image = atom->image; @@ -865,8 +865,8 @@ void ReadDump::process_atoms() case Reader::Q: q[m] = fields[i][ifield]; break; - case Reader::LAMBDA: - lambda[m] = fields[i][ifield]; + case Reader::APIP_LAMBDA: + apip_lambda[m] = fields[i][ifield]; break; case Reader::VY: v[m][1] = fields[i][ifield]; @@ -983,7 +983,7 @@ void ReadDump::process_atoms() tag = atom->tag; v = atom->v; q = atom->q; - lambda = atom->lambda; + apip_lambda = atom->lambda; image = atom->image; // set atom attributes from other dump file fields @@ -1008,8 +1008,8 @@ void ReadDump::process_atoms() case Reader::Q: q[m] = fields[i][ifield]; break; - case Reader::LAMBDA: - lambda[m] = fields[i][ifield]; + case Reader::APIP_LAMBDA: + apip_lambda[m] = fields[i][ifield]; break; case Reader::IX: xbox = static_cast (fields[i][ifield]); @@ -1173,8 +1173,8 @@ int ReadDump::fields_and_keywords(int narg, char **arg) if (type < 0) break; if (type == Reader::Q && !atom->q_flag) error->all(FLERR,"Read dump of charge property that isn't supported by atom style"); - if (type == Reader::LAMBDA && !atom->lambda_flag) - error->all(FLERR,"Read dump of lambda property that isn't supported by atom style"); + if (type == Reader::APIP_LAMBDA && !atom->lambda_flag) + error->all(FLERR,"Read dump of apip_lambda property that isn't supported by atom style"); fieldtype[nfield++] = type; iarg++; } @@ -1300,7 +1300,7 @@ int ReadDump::whichtype(char *str) else if (strcmp(str,"vy") == 0) type = Reader::VY; else if (strcmp(str,"vz") == 0) type = Reader::VZ; else if (strcmp(str,"q") == 0) type = Reader::Q; - else if (strcmp(str,"lambda") == 0) type = Reader::LAMBDA; + else if (strcmp(str,"apip_lambda") == 0) type = Reader::APIP_LAMBDA; else if (strcmp(str,"ix") == 0) type = Reader::IX; else if (strcmp(str,"iy") == 0) type = Reader::IY; else if (strcmp(str,"iz") == 0) type = Reader::IZ; diff --git a/src/reader.h b/src/reader.h index c82cc736c3..4b75c953cc 100644 --- a/src/reader.h +++ b/src/reader.h @@ -22,7 +22,7 @@ namespace LAMMPS_NS { class Reader : protected Pointers { public: - enum { ID, TYPE, X, Y, Z, VX, VY, VZ, Q, LAMBDA, IX, IY, IZ, FX, FY, FZ }; + enum { ID, TYPE, X, Y, Z, VX, VY, VZ, Q, APIP_LAMBDA, IX, IY, IZ, FX, FY, FZ }; enum { UNSET, NOSCALE_NOWRAP, NOSCALE_WRAP, SCALE_NOWRAP, SCALE_WRAP }; Reader(class LAMMPS *); diff --git a/src/reader_native.cpp b/src/reader_native.cpp index 0b9d4e014e..840813dab3 100644 --- a/src/reader_native.cpp +++ b/src/reader_native.cpp @@ -413,8 +413,8 @@ bigint ReaderNative::read_header(double box[3][3], int &boxinfo, int &triclinic, else if (fieldtype[i] == Q) fieldindex[i] = find_label("q", labels); - else if (fieldtype[i] == LAMBDA) - fieldindex[i] = find_label("lambda", labels); + else if (fieldtype[i] == APIP_LAMBDA) + fieldindex[i] = find_label("apip_lambda", labels); else if (fieldtype[i] == IX) fieldindex[i] = find_label("ix", labels);