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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13644 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2015-07-17 23:33:36 +00:00
parent 1ebb654b4d
commit 11de055c0f
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fix.h
View File

@ -182,7 +182,7 @@ class Fix : protected Pointers {
virtual void reset_dt() {}
virtual void read_data_header(char *) {}
virtual void read_data_section(char *, int, char *) {}
virtual void read_data_section(char *, int, char *, tagint) {}
virtual bigint read_data_skip_lines(char *) {return 0;}
virtual void write_data_header(FILE *, int) {}

6
src/fix_property_atom.cpp
View File

@ -182,9 +182,11 @@ void FixPropertyAtom::init()
/* ----------------------------------------------------------------------
unpack N lines in buf from section of data file labeled by keyword
id_offset is applied to first atomID field if multiple data files are read
------------------------------------------------------------------------- */
void FixPropertyAtom::read_data_section(char *keyword, int n, char *buf)
void FixPropertyAtom::read_data_section(char *keyword, int n, char *buf,
tagint id_offset)
{
int j,m;
tagint itag;
@ -223,7 +225,7 @@ void FixPropertyAtom::read_data_section(char *keyword, int n, char *buf)
for (j = 1; j < nwords; j++)
values[j] = strtok(NULL," \t\n\r\f");
itag = ATOTAGINT(values[0]);
itag = ATOTAGINT(values[0]) + id_offset;
if (itag <= 0 || itag > map_tag_max) {
char str[128];
sprintf(str,"Invalid atom ID in %s section of data file",keyword);

2
src/fix_property_atom.h
View File

@ -31,7 +31,7 @@ class FixPropertyAtom : public Fix {
int setmask();
void init();
void read_data_section(char *, int, char *);
void read_data_section(char *, int, char *, tagint);
bigint read_data_skip_lines(char *);
void write_data_section_size(int, int &, int &);
void write_data_section_pack(int, double **);

2
src/read_data.cpp
View File

@ -1681,7 +1681,7 @@ void ReadData::fix(int ifix, char *keyword)
nchunk = MIN(nline-nread,CHUNK);
eof = comm->read_lines_from_file(fp,nchunk,MAXLINE,buffer);
if (eof) error->all(FLERR,"Unexpected end of data file");
modify->fix[ifix]->read_data_section(keyword,nchunk,buffer);
modify->fix[ifix]->read_data_section(keyword,nchunk,buffer,id_offset);
nread += nchunk;
}
}