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

use '&&' and '||' instead of 'and' and 'or' operators for consistency

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-05-22 14:42:42 -04:00
parent 97d3c843c4
commit 4780d72809
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/MC/pair_dsmc.cpp
View File

@ -93,9 +93,9 @@ void PairDSMC::compute(int eflag, int vflag)
int ycell = static_cast<int>((x[i][1] - domain->boxlo[1])/celly);
int zcell = static_cast<int>((x[i][2] - domain->boxlo[2])/cellz);
if ((xcell < 0) or (xcell > ncellsx-1) or
(ycell < 0) or (ycell > ncellsy-1) or
(zcell < 0) or (zcell > ncellsz-1)) continue;
if ((xcell < 0) || (xcell > ncellsx-1) ||
(ycell < 0) || (ycell > ncellsy-1) ||
(zcell < 0) || (zcell > ncellsz-1)) continue;
int icell = xcell + ycell*ncellsx + zcell*ncellsx*ncellsy;
itype = type[i];
@ -146,7 +146,7 @@ void PairDSMC::compute(int eflag, int vflag)
double num_of_collisions_double = number_of_A * number_of_B *
weighting * Vs_max * update->dt / vol;
if ((itype == jtype) and number_of_B)
if ((itype == jtype) && number_of_B)
num_of_collisions_double *=
0.5 * double(number_of_B - 1) / double(number_of_B);
@ -161,8 +161,8 @@ void PairDSMC::compute(int eflag, int vflag)
// perform collisions on pairs of particles in icell
for (int k = 0; k < num_of_collisions; k++) {
if ((number_of_A < 1) or (number_of_B < 1)) break;
if ((itype == jtype) and (number_of_A < 2)) break;
if ((number_of_A < 1) || (number_of_B < 1)) break;
if ((itype == jtype) && (number_of_A < 2)) break;
int ith_A = static_cast<int>(random->uniform()*number_of_A);
int jth_B = static_cast<int>(random->uniform()*number_of_B);
int i = particle_list[itype][ith_A];