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

replace redundant functions to handle constants with (unordered) map

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-03-23 17:48:47 -04:00
parent 1efd72eb58
commit 346c36e227
3 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unittest/commands/test_variables.cpp
View File

@ -211,14 +211,17 @@ TEST_F(VariableTest, AtomicSystem)
TEST_F(VariableTest, Expressions)
{
atomic_system();
ASSERT_EQ(variable->nvar, 0);
if (!verbose) ::testing::internal::CaptureStdout();
command("variable one index 1");
command("variable two equal 2");
command("variable three equal v_one+v_two");
command("variable four equal PI");
command("variable five equal version");
command("variable six equal XXX");
if (!verbose) ::testing::internal::GetCapturedStdout();
ASSERT_EQ(variable->nvar, 4);
ASSERT_EQ(variable->nvar, 6);
int ivar = variable->find("one");
ASSERT_FALSE(variable->equalstyle(ivar));
@ -229,11 +232,18 @@ TEST_F(VariableTest, Expressions)
ASSERT_DOUBLE_EQ(variable->compute_equal(ivar),3.0);
ivar = variable->find("four");
ASSERT_DOUBLE_EQ(variable->compute_equal(ivar),MY_PI);
ivar = variable->find("five");
ASSERT_GE(variable->compute_equal(ivar),20210310);
TEST_FAILURE(".*ERROR: Variable six: Invalid thermo keyword 'XXX' in variable formula.*",
command("print \"${six}\""););
}
TEST_F(VariableTest, Functions)
{
atomic_system();
file_vars();
ASSERT_EQ(variable->nvar, 0);
if (!verbose) ::testing::internal::CaptureStdout();
command("variable one index 1");