silence compiler warnings
This commit is contained in:
@ -156,7 +156,7 @@ void FixHeatFlow::final_integrate()
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
void FixHeatFlow::final_integrate_respa(int ilevel, int /*iloop*/)
|
||||
void FixHeatFlow::final_integrate_respa(int /*ilevel*/, int /*iloop*/)
|
||||
{
|
||||
dt = update->dt;
|
||||
final_integrate();
|
||||
@ -215,13 +215,11 @@ void FixHeatFlow::unpack_forward_comm(int n, int first, double *buf)
|
||||
|
||||
int FixHeatFlow::pack_reverse_comm(int n, int first, double *buf)
|
||||
{
|
||||
int i,k,last;
|
||||
|
||||
int m = 0;
|
||||
last = first + n;
|
||||
int last = first + n;
|
||||
double *heatflow = atom->heatflow;
|
||||
|
||||
for (i = first; i < last; i++) {
|
||||
for (int i = first; i < last; i++) {
|
||||
buf[m++] = heatflow[i];
|
||||
}
|
||||
|
||||
@ -232,13 +230,9 @@ int FixHeatFlow::pack_reverse_comm(int n, int first, double *buf)
|
||||
|
||||
void FixHeatFlow::unpack_reverse_comm(int n, int *list, double *buf)
|
||||
{
|
||||
int i,j,k,kk,ncount;
|
||||
|
||||
int m = 0;
|
||||
double *heatflow = atom->heatflow;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
j = list[i];
|
||||
heatflow[j] += buf[m++];
|
||||
}
|
||||
for (int i = 0; i < n; i++)
|
||||
heatflow[list[i]] += buf[m++];
|
||||
}
|
||||
|
||||
@ -452,7 +452,7 @@ void FixWallGran::post_force(int /*vflag*/)
|
||||
}
|
||||
|
||||
for (int i = 0; i < nlocal; i++) {
|
||||
if (! mask[i] & groupbit) continue;
|
||||
if ((!mask[i]) & groupbit) continue;
|
||||
|
||||
dx = dy = dz = 0.0;
|
||||
|
||||
|
||||
@ -195,7 +195,7 @@ void FixWallGranRegion::post_force(int /*vflag*/)
|
||||
}
|
||||
|
||||
for (i = 0; i < nlocal; i++) {
|
||||
if (! mask[i] & groupbit) continue;
|
||||
if ((!mask[i]) & groupbit) continue;
|
||||
if (! region->match(x[i][0], x[i][1], x[i][2])) continue;
|
||||
|
||||
nc = region->surface(x[i][0], x[i][1], x[i][2], model->pulloff_distance(radius[i], 0.0));
|
||||
|
||||
@ -174,9 +174,8 @@ GranSubModTangentialLinearHistoryClassic::GranSubModTangentialLinearHistoryClass
|
||||
|
||||
void GranSubModTangentialLinearHistoryClassic::calculate_forces()
|
||||
{
|
||||
double magfs, magfs_inv, rsht, shrmag, prjmag, temp_dbl;
|
||||
double magfs, magfs_inv, rsht, shrmag;
|
||||
double temp_array[3];
|
||||
int frame_update = 0;
|
||||
|
||||
damp = xt * gm->damping_model->damp_prefactor;
|
||||
|
||||
|
||||
@ -685,7 +685,7 @@ void PairGranular::reset_dt()
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
double PairGranular::single(int i, int j, int itype, int jtype,
|
||||
double rsq, double /* factor_coul */,
|
||||
double /*rsq*/, double /* factor_coul */,
|
||||
double factor_lj, double &fforce)
|
||||
{
|
||||
if (factor_lj == 0) {
|
||||
@ -764,8 +764,6 @@ double PairGranular::single(int i, int j, int itype, int jtype,
|
||||
|
||||
model->calculate_forces();
|
||||
double *forces = model->forces;
|
||||
double *torquesi = model->torquesi;
|
||||
double *torquesj = model->torquesj;
|
||||
|
||||
// apply forces & torques
|
||||
fforce = MathExtra::len3(forces);
|
||||
|
||||
Reference in New Issue
Block a user