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

fixed compile issue

Browse Source
This commit is contained in:
Steve Plimpton
2022-11-17 16:32:15 -07:00
parent c9b431214c
commit 3683f144a6
4 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dump_grid.cpp
View File

@ -653,9 +653,8 @@ int DumpGrid::parse_fields(int narg, char **arg)
int igrid,idata,index; int igrid,idata,index;
int iflag = int iflag =
utils::check_grid_reference(igrid,idata,index,lmp); utils::check_grid_reference((char *) "Dump grid",
//utils::check_grid_reference((char *) "Dump grid", arg[iarg],igrid,idata,index,lmp);
// arg[iarg],igrid,idata,index,lmp);
// arg is not a Grid reference // arg is not a Grid reference

5
src/dump_image.cpp
View File

@ -187,9 +187,8 @@ DumpImage::DumpImage(LAMMPS *lmp, int narg, char **arg) :
char *id; char *id;
int igrid,idata,index; int igrid,idata,index;
int iflag = int iflag =
utils::check_grid_reference(igrid,idata,index,lmp); utils::check_grid_reference((char *) "Dump image",
// utils::check_grid_reference((char *) "Dump image", arg[iarg+1],igrid,idata,index,lmp);
// arg[iarg+1],igrid,idata,index,lmp);
iarg += 2; iarg += 2;

12
src/utils.cpp
View File

@ -877,13 +877,9 @@ char *utils::expand_type(const char *file, int line, const std::string &str, int
caller decides what to do if not COMPUTE or FIX caller decides what to do if not COMPUTE or FIX
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
//int check_grid_reference(char *errstr, char *ref, int &igrid, int &idata, int &index, int utils::check_grid_reference(char *errstr, char *ref, int &igrid, int &idata, int &index,
// LAMMPS *lmp) LAMMPS *lmp)
int check_grid_reference(int &igrid, int &idata, int &index, LAMMPS *lmp)
{ {
char *ref;
char *errstr;
ArgInfo argi(ref, ArgInfo::COMPUTE | ArgInfo::FIX); ArgInfo argi(ref, ArgInfo::COMPUTE | ArgInfo::FIX);
index = argi.get_index1(); index = argi.get_index1();
auto name = argi.get_name(); auto name = argi.get_name();
@ -900,7 +896,7 @@ int check_grid_reference(int &igrid, int &idata, int &index, LAMMPS *lmp)
// split name = idcompute:gname:dname into 3 strings // split name = idcompute:gname:dname into 3 strings
auto words = utils::parse_grid_id(FLERR,name,lmp->error); auto words = parse_grid_id(FLERR,name,lmp->error);
const auto &idcompute = words[0]; const auto &idcompute = words[0];
const auto &gname = words[1]; const auto &gname = words[1];
const auto &dname = words[2]; const auto &dname = words[2];
@ -937,7 +933,7 @@ int check_grid_reference(int &igrid, int &idata, int &index, LAMMPS *lmp)
// split name = idfix:gname:dname into 3 strings // split name = idfix:gname:dname into 3 strings
auto words = utils::parse_grid_id(FLERR,name,lmp->error); auto words = parse_grid_id(FLERR,name,lmp->error);
const auto &idfix = words[0]; const auto &idfix = words[0];
const auto &gname = words[1]; const auto &gname = words[1];
const auto &dname = words[2]; const auto &dname = words[2];

5
src/utils.h
View File

@ -383,9 +383,8 @@ namespace utils {
//int check_grid_reference(char *errstr, char *ref, int &igrid, int &idata, int &index, int check_grid_reference(char *errstr, char *ref, int &igrid, int &idata, int &index,
// LAMMPS *lmp); LAMMPS *lmp);
int check_grid_reference(int &igrid, int &idata, int &index, LAMMPS *lmp);
/*! Parse grid reference into 3 sub-strings /*! Parse grid reference into 3 sub-strings