parse_gridid was renamed to parse_grid_id

This commit is contained in:
Axel Kohlmeyer
2022-12-01 10:12:39 -05:00
parent 87a0833edd
commit 6d4cb38d1f
2 changed files with 9 additions and 9 deletions

View File

@ -211,7 +211,7 @@ Argument processing
.. doxygenfunction:: expand_args .. doxygenfunction:: expand_args
:project: progguide :project: progguide
.. doxygenfunction:: parse_gridid .. doxygenfunction:: parse_grid_id
:project: progguide :project: progguide
.. doxygenfunction:: expand_type .. doxygenfunction:: expand_type

View File

@ -844,39 +844,39 @@ TEST(Utils, boundsbig_case3)
ASSERT_EQ(nhi, -1); ASSERT_EQ(nhi, -1);
} }
TEST(Utils, parse_gridid) TEST(Utils, parse_grid_id)
{ {
auto words = utils::parse_gridid(FLERR, "c_1:full:density", nullptr); auto words = utils::parse_grid_id(FLERR, "c_1:full:density", nullptr);
ASSERT_THAT(words[0], StrEq("c_1")); ASSERT_THAT(words[0], StrEq("c_1"));
ASSERT_THAT(words[1], StrEq("full")); ASSERT_THAT(words[1], StrEq("full"));
ASSERT_THAT(words[2], StrEq("density")); ASSERT_THAT(words[2], StrEq("density"));
words = utils::parse_gridid(FLERR, "c_1:full:density[1]", nullptr); words = utils::parse_grid_id(FLERR, "c_1:full:density[1]", nullptr);
ASSERT_THAT(words[0], StrEq("c_1")); ASSERT_THAT(words[0], StrEq("c_1"));
ASSERT_THAT(words[1], StrEq("full")); ASSERT_THAT(words[1], StrEq("full"));
ASSERT_THAT(words[2], StrEq("density[1]")); ASSERT_THAT(words[2], StrEq("density[1]"));
words = utils::parse_gridid(FLERR, "c_1:full:density[*]", nullptr); words = utils::parse_grid_id(FLERR, "c_1:full:density[*]", nullptr);
ASSERT_THAT(words[0], StrEq("c_1")); ASSERT_THAT(words[0], StrEq("c_1"));
ASSERT_THAT(words[1], StrEq("full")); ASSERT_THAT(words[1], StrEq("full"));
ASSERT_THAT(words[2], StrEq("density[*]")); ASSERT_THAT(words[2], StrEq("density[*]"));
words = utils::parse_gridid(FLERR, "c_1_full_density", nullptr); words = utils::parse_grid_id(FLERR, "c_1_full_density", nullptr);
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
ASSERT_THAT(words[1], StrEq("")); ASSERT_THAT(words[1], StrEq(""));
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
words = utils::parse_gridid(FLERR, "c_1:full:", nullptr); words = utils::parse_grid_id(FLERR, "c_1:full:", nullptr);
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
ASSERT_THAT(words[1], StrEq("")); ASSERT_THAT(words[1], StrEq(""));
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
words = utils::parse_gridid(FLERR, ":full:density", nullptr); words = utils::parse_grid_id(FLERR, ":full:density", nullptr);
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
ASSERT_THAT(words[1], StrEq("")); ASSERT_THAT(words[1], StrEq(""));
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
words = utils::parse_gridid(FLERR, "c_1:full", nullptr); words = utils::parse_grid_id(FLERR, "c_1:full", nullptr);
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));
ASSERT_THAT(words[1], StrEq("")); ASSERT_THAT(words[1], StrEq(""));
ASSERT_THAT(words[0], StrEq("")); ASSERT_THAT(words[0], StrEq(""));