Use portable logical operators

This commit is contained in:
Axel Kohlmeyer
2021-10-06 20:44:27 -05:00
parent 5c34fe4d5d
commit 98d9b675f9
3 changed files with 3 additions and 3 deletions

View File

@ -761,7 +761,7 @@ void FixTGNHDrude::setup_mol_mass_dof() {
dof_mol, dof_int, dof_drude);
}
}
if (dof_mol <=0 or dof_int <=0 or dof_drude <=0)
if (dof_mol <=0 || dof_int <=0 || dof_drude <=0)
error->all(FLERR, "TGNHC thermostat requires DOFs of molecules, atoms and dipoles larger than 0");
}

View File

@ -550,7 +550,7 @@ int FixOrientECO::get_norm() {
squared_distance = delta[0] * delta[0] + delta[1] * delta[1] + delta[2] * delta[2];
// check if atom is within cutoff region
if ((squared_distance != 0.0) and (squared_distance < squared_cutoff)) {
if ((squared_distance != 0.0) && (squared_distance < squared_cutoff)) {
++neigh;
squared_distance *= inv_squared_cutoff;

View File

@ -203,7 +203,7 @@ void ThirdOrder::options(int narg, char **arg)
iarg += 2;
} else error->all(FLERR,"Illegal third_order command");
}
if (file_flag == 1 and me == 0) {
if (file_flag == 1 && me == 0) {
openfile(filename);
}
}