From 010c9953c3e89ae55613c9cdd17d428763075a21 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 15 Nov 2013 18:53:33 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11017
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/RIGID/fix_rigid_small.cpp | 14 +++++++-------
src/domain.cpp | 2 +-
src/set.cpp | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/RIGID/fix_rigid_small.cpp b/src/RIGID/fix_rigid_small.cpp
index e91eccfd78..ec1db7f0f9 100644
--- a/src/RIGID/fix_rigid_small.cpp
+++ b/src/RIGID/fix_rigid_small.cpp
@@ -369,7 +369,7 @@ void FixRigidSmall::setup(int vflag)
double **x = atom->x;
double **f = atom->f;
int *type = atom->type;
- int *image = atom->image;
+ tagint *image = atom->image;
int nlocal = atom->nlocal;
double *xcm,*fcm,*tcm;
@@ -1224,7 +1224,7 @@ void FixRigidSmall::create_bodies()
// error check on image flags of atoms in rigid bodies
- int *image = atom->image;
+ tagint *image = atom->image;
int *mask = atom->mask;
int nlocal = atom->nlocal;
@@ -1474,7 +1474,7 @@ void FixRigidSmall::ring_nearest(int n, char *cbuf)
void FixRigidSmall::ring_farthest(int n, char *cbuf)
{
double **x = frsptr->atom->x;
- int *image = frsptr->atom->image;
+ tagint *image = frsptr->atom->image;
int nlocal = frsptr->atom->nlocal;
double *buf = (double *) cbuf;
@@ -2017,7 +2017,7 @@ void FixRigidSmall::setup_bodies_dynamic()
double *rmass = atom->rmass;
double *mass = atom->mass;
int *type = atom->type;
- int *image = atom->image;
+ tagint *image = atom->image;
int nlocal = atom->nlocal;
double *xcm,*vcm,*acm;
@@ -2797,9 +2797,9 @@ void FixRigidSmall::unpack_reverse_comm(int n, int *list, double *buf)
j = list[i];
if (bodyown[j] < 0) continue;
k = bodyown[j];
- counts[k][0] += buf[m++];
- counts[k][1] += buf[m++];
- counts[k][2] += buf[m++];
+ counts[k][0] += static_cast<int> (buf[m++]);
+ counts[k][1] += static_cast<int> (buf[m++]);
+ counts[k][2] += static_cast<int> (buf[m++]);
}
}
}
diff --git a/src/domain.cpp b/src/domain.cpp
index 85b78407c3..93c5a7f191 100644
--- a/src/domain.cpp
+++ b/src/domain.cpp
@@ -565,7 +565,7 @@ void Domain::image_check()
memory->create(unwrap,atom->nmax,3,"domain:unwrap");
double **x = atom->x;
- int *image = atom->image;
+ tagint *image = atom->image;
int nlocal = atom->nlocal;
for (i = 0; i < nlocal; i++)
diff --git a/src/set.cpp b/src/set.cpp
index 5c0774f6c4..df4d3d18d8 100644
--- a/src/set.cpp
+++ b/src/set.cpp
@@ -387,7 +387,7 @@ void Set::command(int narg, char **arg)
} else if (strstr(arg[iarg],"i_") == arg[iarg]) {
if (iarg+2 > narg) error->all(FLERR,"Illegal set command");
if (strstr(arg[iarg+1],"v_") == arg[iarg+1]) varparse(arg[iarg+1],1);
- else ivalue = force->numeric(FLERR,arg[iarg+1]);
+ else ivalue = force->inumeric(FLERR,arg[iarg+1]);
int flag;
index_custom = atom->find_custom(&arg[iarg][2],flag);
if (index_custom < 0 || flag != 0)
--
GitLab