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

silence compiler warnings

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-09-29 14:04:01 -04:00
parent 2651e6ec2f
commit dd4b195552
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/EXTRA-PAIR/pair_coul_exclude.cpp
View File

@ -189,7 +189,7 @@ void PairCoulExclude::init_style()
init for one type pair i,j and corresponding j,i init for one type pair i,j and corresponding j,i
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
double PairCoulExclude::init_one(int i, int j) double PairCoulExclude::init_one(int /*i*/, int /*j*/)
{ {
return cut_global; return cut_global;
} }

2
src/compute_angle_local.cpp
View File

@ -194,7 +194,7 @@ void ComputeAngleLocal::compute_local()
int ComputeAngleLocal::compute_angles(int flag) int ComputeAngleLocal::compute_angles(int flag)
{ {
int i,m,n,na,atom1,atom2,atom3,imol,iatom,atype,ivar; int i,m,na,atom1,atom2,atom3,imol,iatom,atype,ivar;
tagint tagprev; tagint tagprev;
double delx1,dely1,delz1,delx2,dely2,delz2; double delx1,dely1,delz1,delx2,dely2,delz2;
double rsq1,rsq2,r1,r2,c,theta; double rsq1,rsq2,r1,r2,c,theta;

7
src/neighbor.cpp
View File

@ -2527,6 +2527,7 @@ void Neighbor::modify_params(int narg, char **arg)
int i; int i;
// Invalidate old user cutoffs // Invalidate old user cutoffs
comm->ncollections_cutoff = 0; comm->ncollections_cutoff = 0;
interval_collection_flag = 1; interval_collection_flag = 1;
custom_collection_flag = 1; custom_collection_flag = 1;
@ -2558,9 +2559,10 @@ void Neighbor::modify_params(int narg, char **arg)
error->all(FLERR,"Invalid collection/type command"); error->all(FLERR,"Invalid collection/type command");
int ntypes = atom->ntypes; int ntypes = atom->ntypes;
int n, nlo, nhi, i, j, k; int nlo, nhi, i, k;
// Invalidate old user cutoffs // Invalidate old user cutoffs
comm->ncollections_cutoff = 0; comm->ncollections_cutoff = 0;
interval_collection_flag = 0; interval_collection_flag = 0;
custom_collection_flag = 1; custom_collection_flag = 1;
@ -2568,10 +2570,12 @@ void Neighbor::modify_params(int narg, char **arg)
memory->create(type2collection,ntypes+1,"neigh:type2collection"); memory->create(type2collection,ntypes+1,"neigh:type2collection");
// Erase previous mapping // Erase previous mapping
for (i = 1; i <= ntypes; i++) for (i = 1; i <= ntypes; i++)
type2collection[i] = -1; type2collection[i] = -1;
// For each custom range, define mapping for types in interval // For each custom range, define mapping for types in interval
for (i = 0; i < ncollections; i++){ for (i = 0; i < ncollections; i++){
std::vector<std::string> words = Tokenizer(arg[iarg+2+i], ",").as_vector(); std::vector<std::string> words = Tokenizer(arg[iarg+2+i], ",").as_vector();
for (const auto &word : words) { for (const auto &word : words) {
@ -2585,6 +2589,7 @@ void Neighbor::modify_params(int narg, char **arg)
} }
// Check for undefined atom type // Check for undefined atom type
for (i = 1; i <= ntypes; i++){ for (i = 1; i <= ntypes; i++){
if (type2collection[i] == -1) { if (type2collection[i] == -1) {
error->all(FLERR,"Type missing in collection/type commnd"); error->all(FLERR,"Type missing in collection/type commnd");