jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recover some const'ness in Domain class, that was lost when merging MESSAGE package. fixes lib/atc compilation issue

This commit is contained in:
Axel Kohlmeyer 2018-09-04 09:13:22 -04:00
parent 1d3116d7c2
commit a6dfab6f27
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/domain.cpp
View File

@ -1176,12 +1176,12 @@ int Domain::closest_image(int i, int j)
if J is not a valid index like -1, just return it if J is not a valid index like -1, just return it
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
int Domain::closest_image(double *pos, int j) int Domain::closest_image(const double * const pos, int j)
{ {
if (j < 0) return j; if (j < 0) return j;
int *sametag = atom->sametag; const int * const sametag = atom->sametag;
double **x = atom->x; const double * const * const x = atom->x;
int closest = j; int closest = j;
double delx = pos[0] - x[j][0]; double delx = pos[0] - x[j][0];
@ -1208,10 +1208,10 @@ int Domain::closest_image(double *pos, int j)
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
find and return Xj image = periodic image of Xj that is closest to Xi find and return Xj image = periodic image of Xj that is closest to Xi
for triclinic, add/subtract tilt factors in other dims as needed for triclinic, add/subtract tilt factors in other dims as needed
called by ServerMD class called by ServerMD class and LammpsInterface in lib/atc.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
void Domain::closest_image(double *xi, double *xj, double *xjimage) void Domain::closest_image(const double * const xi, const double * const xj, double * const xjimage)
{ {
double dx = xj[0] - xi[0]; double dx = xj[0] - xi[0];
double dy = xj[1] - xi[1]; double dy = xj[1] - xi[1];

4
src/domain.h
View File

@ -115,8 +115,8 @@ class Domain : protected Pointers {
void minimum_image(double *); void minimum_image(double *);
void minimum_image_once(double *); void minimum_image_once(double *);
int closest_image(int, int); int closest_image(int, int);
int closest_image(double *, int); int closest_image(const double * const, int);
void closest_image(double *, double *, double *); void closest_image(const double * const, const double * const, double * const);
void remap(double *, imageint &); void remap(double *, imageint &);
void remap(double *); void remap(double *);
void remap_near(double *, double *); void remap_near(double *, double *);