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

Merge branch 'master' into prepare-clang-format

Browse Source 
# Conflicts:
#	src/MOLECULE/bond_fene.h
#	src/MOLECULE/bond_fene_expand.h
This commit is contained in:
Axel Kohlmeyer
2021-05-11 21:49:48 -04:00
parent d1941392d3 ee546e2fa3
commit d8291eea7b
205 changed files with 16072 additions and 8024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils.cpp
View File

@ -1201,16 +1201,14 @@ FILE *utils::open_potential(const std::string &name, LAMMPS *lmp,
&& (*auto_convert & REAL2METAL)) {
*auto_convert = REAL2METAL;
} else {
error->one(FLERR, "Potential file {} requires {} units "
"but {} units are in use", name,
units, unit_style);
error->one(FLERR, "Potential file {} requires {} units but {} units "
"are in use", name, units, unit_style);
return nullptr;
}
}
if ((*auto_convert != NOCONVERT) && (me == 0))
error->warning(FLERR, fmt::format("Converting potential file in "
"{} units to {} units",
units, unit_style));
error->warning(FLERR, "Converting potential file in {} units to {} "
"units", units, unit_style);
}
return fopen(filepath.c_str(), "r");
}