From b7210e931c01a8e282c2a20fcb985b7677ff10f5 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Fri, 4 May 2018 22:26:53 -0400
Subject: [PATCH] more cosmetic changes to silence pedantic warnings
---
src/REPLICA/neb.cpp | 6 ++++--
src/RIGID/fix_rigid.cpp | 2 +-
src/USER-MISC/pair_lj_sf_dipole_sf.cpp | 2 +-
src/library.cpp | 5 +----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/REPLICA/neb.cpp b/src/REPLICA/neb.cpp
index e16c8c49d8..c9aedf7401 100644
--- a/src/REPLICA/neb.cpp
+++ b/src/REPLICA/neb.cpp
@@ -303,7 +303,7 @@ void NEB::run()
update->minimize->setup();
if (me_universe == 0) {
- if (uscreen)
+ if (uscreen) {
if (verbose) {
fprintf(uscreen,"Step MaxReplicaForce MaxAtomForce "
"GradV0 GradV1 GradVc EBF EBR RDT "
@@ -317,7 +317,8 @@ void NEB::run()
"EBF EBR RDT "
"RD1 PE1 RD2 PE2 ... RDN PEN\n");
}
- if (ulogfile)
+ }
+ if (ulogfile) {
if (verbose) {
fprintf(ulogfile,"Step MaxReplicaForce MaxAtomForce "
"GradV0 GradV1 GradVc EBF EBR RDT "
@@ -331,6 +332,7 @@ void NEB::run()
"EBF EBR RDT "
"RD1 PE1 RD2 PE2 ... RDN PEN\n");
}
+ }
}
print_status();
diff --git a/src/RIGID/fix_rigid.cpp b/src/RIGID/fix_rigid.cpp
index 554412330c..3d9e24ced9 100644
--- a/src/RIGID/fix_rigid.cpp
+++ b/src/RIGID/fix_rigid.cpp
@@ -2342,7 +2342,7 @@ void FixRigid::write_restart_file(char *file)
sprintf(outfile,"%s.rigid",file);
FILE *fp = fopen(outfile,"w");
if (fp == NULL) {
- char str[128];
+ char str[192];
sprintf(str,"Cannot open fix rigid restart file %s",outfile);
error->one(FLERR,str);
}
diff --git a/src/USER-MISC/pair_lj_sf_dipole_sf.cpp b/src/USER-MISC/pair_lj_sf_dipole_sf.cpp
index cc92bfc30f..523b2ca71a 100644
--- a/src/USER-MISC/pair_lj_sf_dipole_sf.cpp
+++ b/src/USER-MISC/pair_lj_sf_dipole_sf.cpp
@@ -539,7 +539,7 @@ double PairLJSFDipoleSF::single(int i, int j, int itype, int jtype, double rsq,
double &fforce)
{
double r2inv,r6inv;
- double pdotp,pidotr,pjdotr,pre1,delx,dely,delz;
+ double pdotp,pidotr,pjdotr,delx,dely,delz;
double rinv, r3inv,r5inv, rcutlj2inv, rcutcoul2inv,rcutlj6inv;
double qtmp,xtmp,ytmp,ztmp,bfac,pqfac,qpfac, ecoul, evdwl;
diff --git a/src/library.cpp b/src/library.cpp
index 865bf2a0a5..0162c560ce 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -933,7 +933,7 @@ void lammps_gather_atoms_concat(void *ptr, char *name,
BEGIN_CAPTURE
{
- int i,j,offset;
+ int i,offset;
// error if tags are not defined
// NOTE: test that name = image or ids is not a 64-bit int in code?
@@ -975,7 +975,6 @@ void lammps_gather_atoms_concat(void *ptr, char *name,
lmp->memory->create(copy,count*natoms,"lib/gather:copy");
for (i = 0; i < count*natoms; i++) copy[i] = 0;
- tagint *tag = lmp->atom->tag;
int nlocal = lmp->atom->nlocal;
if (count == 1) {
@@ -1117,7 +1116,6 @@ void lammps_gather_atoms_subset(void *ptr, char *name,
lmp->memory->create(copy,count*ndata,"lib/gather:copy");
for (i = 0; i < count*ndata; i++) copy[i] = 0;
- tagint *tag = lmp->atom->tag;
int nlocal = lmp->atom->nlocal;
if (count == 1) {
@@ -1163,7 +1161,6 @@ void lammps_gather_atoms_subset(void *ptr, char *name,
lmp->memory->create(copy,count*ndata,"lib/gather:copy");
for (i = 0; i < count*ndata; i++) copy[i] = 0.0;
- tagint *tag = lmp->atom->tag;
int nlocal = lmp->atom->nlocal;
if (count == 1) {
--
GitLab