use consistently the name of the (unaccelerated) pair style in the potential file reader error messages

This commit is contained in:
Axel Kohlmeyer
2020-07-02 23:23:25 -04:00
parent 0b298c7193
commit 7e16a17f31
27 changed files with 29 additions and 30 deletions

View File

@ -372,7 +372,7 @@ void PairEAMAlloyGPU::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(PairEAM::lmp, filename, PotentialFileReader reader(PairEAM::lmp, filename,
"EAMAlloy", unit_convert_flag); "eam/alloy", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -371,7 +371,7 @@ void PairEAMFSGPU::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(PairEAM::lmp, filename, "EAMFS", PotentialFileReader reader(PairEAM::lmp, filename, "eam/fs",
unit_convert_flag); unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -985,7 +985,7 @@ void PairEAMAlloyKokkos<DeviceType>::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAMAlloy", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam/alloy", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -985,7 +985,7 @@ void PairEAMFSKokkos<DeviceType>::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAMFS", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam/fs", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -543,7 +543,7 @@ void PairADP::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "ADP"); PotentialFileReader reader(lmp, filename, "adp");
try { try {
reader.skip_line(); reader.skip_line();

View File

@ -3363,17 +3363,17 @@ void PairAIREBO::read_file(char *filename)
std::string header; std::string header;
switch (variant) { switch (variant) {
case AIREBO: case AIREBO:
potential_name = "AIREBO"; potential_name = "airebo";
header = "# AIREBO "; header = "# AIREBO ";
break; break;
case REBO_2: case REBO_2:
potential_name = "REBO2"; potential_name = "rebo";
header = "# REBO2 "; header = "# REBO2 ";
break; break;
case AIREBO_M: case AIREBO_M:
potential_name = "Cannot open AIREBO-M"; potential_name = "airebo/morse";
header = "# AIREBO-M "; header = "# AIREBO-M ";
break; break;

View File

@ -4914,7 +4914,7 @@ void _noopt PairBOP::read_table(char *filename)
{ {
if (comm->me == 0) { if (comm->me == 0) {
try { try {
PotentialFileReader reader(lmp, filename, "BOP"); PotentialFileReader reader(lmp, filename, "bop");
bop_types = reader.next_int(); bop_types = reader.next_int();
elements = new char*[bop_types]; elements = new char*[bop_types];

View File

@ -591,7 +591,7 @@ void PairComb::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "COMB"); PotentialFileReader reader(lmp, file, "comb");
char * line; char * line;
while((line = reader.next_line(NPARAMS_PER_LINE))) { while((line = reader.next_line(NPARAMS_PER_LINE))) {

View File

@ -316,7 +316,7 @@ void PairComb3::read_lib()
if (comm->me == 0) { if (comm->me == 0) {
try { try {
PotentialFileReader reader(lmp, "lib.comb3", "COMB3"); PotentialFileReader reader(lmp, "lib.comb3", "comb3");
reader.next_dvector(ccutoff, 6); reader.next_dvector(ccutoff, 6);
reader.next_dvector(ch_a, 7); reader.next_dvector(ch_a, 7);

View File

@ -467,7 +467,7 @@ void PairEAM::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAM", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -119,7 +119,7 @@ void PairEAMAlloy::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAMAlloy", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam/alloy", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -119,7 +119,7 @@ void PairEAMFS::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAMFS", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam/fs", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -1065,7 +1065,7 @@ EIMPotentialFileReader::EIMPotentialFileReader(LAMMPS *lmp,
conversion_factor = utils::get_conversion_factor(utils::ENERGY,unit_convert); conversion_factor = utils::get_conversion_factor(utils::ENERGY,unit_convert);
if (fp == NULL) { if (fp == NULL) {
error->one(FLERR, fmt::format("cannot open EIM potential file {}", filename)); error->one(FLERR, fmt::format("cannot open eim potential file {}", filename));
} }
parse(fp); parse(fp);

View File

@ -376,7 +376,7 @@ void PairGW::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "GW", unit_convert_flag); PotentialFileReader reader(lmp, file, "gw", unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -70,7 +70,7 @@ void PairGWZBL::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "GW/ZBL", unit_convert_flag); PotentialFileReader reader(lmp, file, "gw/zbl", unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -356,8 +356,7 @@ void PairSW::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "Stillinger-Weber", PotentialFileReader reader(lmp, file, "sw", unit_convert_flag);
unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -401,7 +401,7 @@ void PairTersoff::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "Tersoff", unit_convert_flag); PotentialFileReader reader(lmp, file, "tersoff", unit_convert_flag);
char *line; char *line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -53,7 +53,7 @@ void PairTersoffMOD::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "TersoffMod", unit_convert_flag); PotentialFileReader reader(lmp, file, "tersoff/mod", unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -44,7 +44,7 @@ void PairTersoffMODC::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "TersoffModC", unit_convert_flag); PotentialFileReader reader(lmp, file, "tersoff/mod/c", unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -71,7 +71,7 @@ void PairTersoffZBL::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "TersoffZBL", unit_convert_flag); PotentialFileReader reader(lmp, file, "tersoff/zbl", unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -362,7 +362,7 @@ void PairVashishta::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "Vashishta", unit_convert_flag); PotentialFileReader reader(lmp, file, "vashishta", unit_convert_flag);
char * line; char * line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -119,7 +119,7 @@ void PairEAMAlloyIntel::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAMAlloy", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam/alloy", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -119,7 +119,7 @@ void PairEAMFSIntel::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(lmp, filename, "EAMFS", unit_convert_flag); PotentialFileReader reader(lmp, filename, "eam/fs", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -850,7 +850,7 @@ void PairTersoffTable::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(lmp, file, "TersoffTable", unit_convert_flag); PotentialFileReader reader(lmp, file, "tersoff/table", unit_convert_flag);
char *line; char *line;
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -120,7 +120,7 @@ void PairEAMAlloyOMP::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(PairEAM::lmp, filename, PotentialFileReader reader(PairEAM::lmp, filename,
"EAMAlloy", unit_convert_flag); "eam/alloy", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -120,7 +120,7 @@ void PairEAMFSOMP::read_file(char *filename)
// read potential file // read potential file
if(comm->me == 0) { if(comm->me == 0) {
PotentialFileReader reader(PairEAM::lmp, filename, PotentialFileReader reader(PairEAM::lmp, filename,
"EAMFS", unit_convert_flag); "eam/fs", unit_convert_flag);
// transparently convert units for supported conversions // transparently convert units for supported conversions

View File

@ -92,7 +92,7 @@ void PairTersoffZBLOMP::read_file(char *file)
// open file on proc 0 // open file on proc 0
if (comm->me == 0) { if (comm->me == 0) {
PotentialFileReader reader(PairTersoff::lmp, file, "TersoffZBLOMP", PotentialFileReader reader(PairTersoff::lmp, file, "tersoff/zbl",
unit_convert_flag); unit_convert_flag);
char * line; char * line;