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

Merge branch 'master' into more-fmtlib-and-string

Browse Source 
# Conflicts:
#	src/write_restart.cpp
This commit is contained in:
Axel Kohlmeyer
2020-06-05 11:13:44 -04:00
parent 9ba84f37d7 863828540a
commit f547d66104
63 changed files with 648 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/comm.cpp
View File

@ -679,23 +679,19 @@ double Comm::get_comm_cutoff()
if (!force->pair && (cutghostuser == 0.0)) {
maxcommcutoff = MAX(maxcommcutoff,maxbondcutoff);
} else {
if ((me == 0) && (maxbondcutoff > maxcommcutoff)) {
char mesg[256];
snprintf(mesg,256,"Communication cutoff %g is shorter than a bond "
"length based estimate of %g. This may lead to errors.",
maxcommcutoff,maxbondcutoff);
error->warning(FLERR,mesg);
}
if ((me == 0) && (maxbondcutoff > maxcommcutoff))
error->warning(FLERR,fmt::format("Communication cutoff {} is shorter "
"than a bond length based estimate of "
"{}. This may lead to errors.",
maxcommcutoff,maxbondcutoff));
}
// print warning if neighborlist cutoff overrides user cutoff
if ((me == 0) && (update->setupflag == 1)) {
if ((cutghostuser > 0.0) && (maxcommcutoff > cutghostuser)) {
char mesg[128];
snprintf(mesg,128,"Communication cutoff adjusted to %g",maxcommcutoff);
error->warning(FLERR,mesg);
}
if ((cutghostuser > 0.0) && (maxcommcutoff > cutghostuser))
error->warning(FLERR,fmt::format("Communication cutoff adjusted to {}",
maxcommcutoff));
}
return maxcommcutoff;