Add type information for table potentials
This commit is contained in:
@ -383,7 +383,7 @@ void AngleTable::free_table(Table *tb)
|
|||||||
|
|
||||||
void AngleTable::read_table(Table *tb, char *file, char *keyword)
|
void AngleTable::read_table(Table *tb, char *file, char *keyword)
|
||||||
{
|
{
|
||||||
TableFileReader reader(lmp, file);
|
TableFileReader reader(lmp, file, "angle");
|
||||||
|
|
||||||
char * line = reader.find_section_start(keyword);
|
char * line = reader.find_section_start(keyword);
|
||||||
|
|
||||||
|
|||||||
@ -309,7 +309,7 @@ void BondTable::free_table(Table *tb)
|
|||||||
|
|
||||||
void BondTable::read_table(Table *tb, char *file, char *keyword)
|
void BondTable::read_table(Table *tb, char *file, char *keyword)
|
||||||
{
|
{
|
||||||
TableFileReader reader(lmp, file);
|
TableFileReader reader(lmp, file, "bond");
|
||||||
double emin = BIGNUM;
|
double emin = BIGNUM;
|
||||||
|
|
||||||
char * line = reader.find_section_start(keyword);
|
char * line = reader.find_section_start(keyword);
|
||||||
|
|||||||
@ -27,8 +27,9 @@
|
|||||||
using namespace LAMMPS_NS;
|
using namespace LAMMPS_NS;
|
||||||
|
|
||||||
TableFileReader::TableFileReader(LAMMPS *lmp,
|
TableFileReader::TableFileReader(LAMMPS *lmp,
|
||||||
const std::string &filename) :
|
const std::string &filename,
|
||||||
PotentialFileReader(lmp, filename, "table")
|
const std::string &type) :
|
||||||
|
PotentialFileReader(lmp, filename, type + " table")
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ namespace LAMMPS_NS
|
|||||||
{
|
{
|
||||||
class TableFileReader : public PotentialFileReader {
|
class TableFileReader : public PotentialFileReader {
|
||||||
public:
|
public:
|
||||||
TableFileReader(class LAMMPS *lmp, const std::string &filename);
|
TableFileReader(class LAMMPS *lmp, const std::string &filename, const std::string & type);
|
||||||
virtual ~TableFileReader();
|
virtual ~TableFileReader();
|
||||||
|
|
||||||
char * find_section_start(const std::string & keyword);
|
char * find_section_start(const std::string & keyword);
|
||||||
|
|||||||
Reference in New Issue
Block a user