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

Remove another unneeded class

Browse Source
This commit is contained in:
Richard Berger
2020-05-20 01:30:34 -04:00
parent 50d4cf210c
commit 73e766b933
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
unittest/force-styles/pair_style.cpp
View File

@ -192,24 +192,11 @@ void data_lammps(LAMMPS_NS::LAMMPS *lmp, const TestConfig &cfg)
lmp->input->one("run 0 post no"); lmp->input->one("run 0 post no");
} }
class PairConfigReader : public TestConfigReader
{
public:
PairConfigReader(TestConfig &config) : TestConfigReader(config) {
consumers["pair_style"] = &TestConfigReader::pair_style;
consumers["pair_coeff"] = &TestConfigReader::pair_coeff;
consumers["init_vdwl"] = &TestConfigReader::init_vdwl;
consumers["init_coul"] = &TestConfigReader::init_coul;
consumers["run_vdwl"] = &TestConfigReader::run_vdwl;
consumers["run_coul"] = &TestConfigReader::run_coul;
}
};
// read/parse yaml file // read/parse yaml file
bool read_yaml_file(const char *infile, TestConfig &config) bool read_yaml_file(const char *infile, TestConfig &config)
{ {
auto reader = PairConfigReader(config); auto reader = TestConfigReader(config);
if (reader.parse_file(infile)) if (reader.parse_file(infile))
return false; return false;

7
unittest/force-styles/test_config_reader.cpp
View File

@ -41,6 +41,13 @@ TestConfigReader::TestConfigReader(TestConfig & config)
consumers["init_forces"] = &TestConfigReader::init_forces; consumers["init_forces"] = &TestConfigReader::init_forces;
consumers["run_forces"] = &TestConfigReader::run_forces; consumers["run_forces"] = &TestConfigReader::run_forces;
consumers["pair_style"] = &TestConfigReader::pair_style;
consumers["pair_coeff"] = &TestConfigReader::pair_coeff;
consumers["init_vdwl"] = &TestConfigReader::init_vdwl;
consumers["init_coul"] = &TestConfigReader::init_coul;
consumers["run_vdwl"] = &TestConfigReader::run_vdwl;
consumers["run_coul"] = &TestConfigReader::run_coul;
consumers["bond_style"] = &TestConfigReader::bond_style; consumers["bond_style"] = &TestConfigReader::bond_style;
consumers["bond_coeff"] = &TestConfigReader::bond_coeff; consumers["bond_coeff"] = &TestConfigReader::bond_coeff;
consumers["init_energy"] = &TestConfigReader::init_energy; consumers["init_energy"] = &TestConfigReader::init_energy;