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

Merge branch 'develop' into refactor-find-xxx

Browse Source 
# Conflicts:
#	src/atom.h
#	src/compute_centroid_stress_atom.cpp
This commit is contained in:
Axel Kohlmeyer
2022-08-17 15:48:26 -04:00
parent 6973b80343 20b87d3cd4
commit 92c9614429
104 changed files with 799 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
unittest/commands/test_regions.cpp
View File

@ -77,9 +77,10 @@ TEST_F(RegionTest, NoBox)
command("region reg6 union 3 reg1 reg2 reg3");
command("region reg7 intersect 3 reg1 reg2 reg4");
command("region reg8 ellipsoid 0 0 0 2 1 2");
command("region reg9 cylinder y 0 0 1 0 1 open 1 units box");
END_HIDE_OUTPUT();
list = domain->get_region_list();
EXPECT_EQ(list.size(), 8);
EXPECT_EQ(list.size(), 9);
auto reg = domain->get_region_by_id("reg1");
EXPECT_EQ(reg->interior, 1);
@ -161,21 +162,50 @@ TEST_F(RegionTest, NoBox)
EXPECT_EQ(reg->rotateflag, 0);
EXPECT_EQ(reg->openflag, 0);
reg = domain->get_region_by_id("reg9");
EXPECT_EQ(reg->interior, 1);
EXPECT_EQ(reg->scaleflag, 0);
EXPECT_EQ(reg->bboxflag, 1);
EXPECT_EQ(reg->varshape, 0);
EXPECT_EQ(reg->dynamic, 0);
EXPECT_EQ(reg->moveflag, 0);
EXPECT_EQ(reg->rotateflag, 0);
EXPECT_EQ(reg->openflag, 1);
BEGIN_HIDE_OUTPUT();
command("region reg3 delete");
command("region reg5 delete");
command("region reg6 delete");
command("region reg1 delete");
command("region reg9 delete");
END_HIDE_OUTPUT();
list = domain->get_region_list();
EXPECT_EQ(list.size(), 4);
reg = domain->get_region_by_id("reg7");
TEST_FAILURE(".*ERROR: Region intersect region reg1 does not exist.*", reg->init(););
TEST_FAILURE(".*ERROR: Delete region reg3 does not exist.*", command("region reg3 delete"););
}
TEST_F(RegionTest, DeathTests)
{
atomic_system();
auto list = domain->get_region_list();
ASSERT_EQ(list.size(), 1);
TEST_FAILURE(".*ERROR: Illegal region block xlo: 1 >= xhi: 0.*", command("region reg1 block 1 0 0 1 0 1"););
TEST_FAILURE(".*ERROR: Illegal region cone open face: 4.*", command("region reg2 cone x 0 0 2 1 0 1 open 4"););
TEST_FAILURE(".*ERROR: Illegal region plane normal vector: 0 0 0.*", command("region reg3 plane 0 0 0 0 0 0 side out"););
TEST_FAILURE(".*ERROR: Illegal region prism non-zero xy tilt with infinite x size.*", command("region reg4 prism INF INF 0 1 0 1 0.1 0.2 0.3"););
TEST_FAILURE(".*ERROR: Illegal region sphere radius: -1.*", command("region reg5 sphere 0 0 0 -1"););
TEST_FAILURE(".*ERROR: Illegal region ellipsoid c: -2.*", command("region reg8 ellipsoid 0 0 0 2 1 -2"););
TEST_FAILURE(".*ERROR: Illegal region cylinder axis: xx.*", command("region reg9 cylinder xx 0 0 1 0 1 open 1 units box"););
TEST_FAILURE(".*ERROR: Unrecognized region style 'xxx'.*", command("region new1 xxx"););
TEST_FAILURE(".*ERROR: Illegal region command.*", command("region new1 block 0 1"););
TEST_FAILURE(".*ERROR: Delete region reg3 does not exist.*", command("region reg3 delete"););
//TEST_FAILURE(".*ERROR: Illegal region command.*", command("region new1 block 0 1"););
TEST_FAILURE(".*ERROR: Illegal region command: missing argument\\(s\\).*", command("region new1 block 0 1"););
TEST_FAILURE(".*ERROR: Delete region new3 does not exist.*", command("region new3 delete"););
}
TEST_F(RegionTest, Counts)