From cf4d8fcb69f511eb48a2fe0412c8a76d40180ecd Mon Sep 17 00:00:00 2001 From: Nuno Nobre Date: Sat, 23 Sep 2023 17:05:44 +0100 Subject: [PATCH 1/2] Fix embedding for TET14 child 4 --- src/geom/cell_tet14.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/geom/cell_tet14.C b/src/geom/cell_tet14.C index 6ce9a8f4a4f..be7fd9fe0d3 100644 --- a/src/geom/cell_tet14.C +++ b/src/geom/cell_tet14.C @@ -586,7 +586,7 @@ const Real Tet14::_embedding_matrix[Tet14::num_children][Tet14::num_nodes][Tet14 { 0., 0., 0., 0., 0., 0., 1., 0., 0., 0., 0., 0., 0., 0.}, // 2 { 0., 0., 0., 0., 0., 0., 0., 1., 0., 0., 0., 0., 0., 0.}, // 3 {-.03125,.09375, 0.,-.03125,0.125, 0., 0.,-0.125, 0.125, 0., 0.,.84375, 0., 0.}, // 4 - {-.03125,.09375, 0.,-.03125,0.125, 0., 0.,-0.125, 0.125, 0., 0.,.84375, 0., 0.}, // 5 + { 1/r64, 1/r64, 1/r64, 1/r64,-0.125,-0.125,-0.125,-0.125,-0.125,-0.125,27/r64,27/r64,27/r64,27/r64}, // 5 {.09375,-.03125,-.03125, 0., 0.125,-0.125, 0.125, 0., 0., 0.,.84375, 0., 0., 0.}, // 6 {.09375,-.03125, 0.,-.03125,0.125, 0., 0., 0.125,-0.125, 0., 0.,.84375, 0., 0.}, // 7 {-.03125,-.03125, 0.,.09375,-0.125, 0., 0., 0.125, 0.125, 0., 0.,.84375, 0., 0.}, // 8 @@ -594,7 +594,7 @@ const Real Tet14::_embedding_matrix[Tet14::num_children][Tet14::num_nodes][Tet14 { 2/r72, 2/r72, 0., 0., 0.,-2/r18,-2/r18,-2/r18,-2/r18,-2/r18, 0.5, 0.5, 0.25, 0.25}, // 10 { 0., 0, 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 0., 0.}, // 11 { 2/r72, 0., 0., 2/r72,-2/r18,-2/r18,-2/r18, 0.,-2/r18,-2/r18, 0.25, 0.5, 0.25, 0.5}, // 12 - { 5/r18, 0.,-1/r18,-1/r18, 0., 0., 4/r18, 4/r18, 0.,-2/r18, 0., 0., 0., 0.5} // 13 + { 0.125,-1/r72,-1/r72,-1/r72, 0.,-2/r18, 0., 0.,-2/r18,-2/r18, 0.375, 0.375, 0.125, 0.375} // 13 }, // embedding matrix for child 5? @@ -727,8 +727,8 @@ const std::vector> // Child 3 { {{0,3}},{{1,3}},{{2,3}}, {{}},{{7,8}},{{8,9}},{{7,9}},{{3,7}},{{3,8}},{{3,9}},{{3,10}},{{3,11}},{{3,12}},{{3,13}} }, // Child 4 - { {{0,1}},{{1,3}},{{0,2}},{{0,3}},{{4,8}},{{4,8}},{{4,6}},{{4,7}},{{7,8}},{{6,7}}, - {{10,11}},{{0,8},{1,7},{3,4}}, {{11,13}}, {{0,13}} }, + { {{0,1}},{{1,3}},{{0,2}},{{0,3}},{{4,8}},{{6,8}},{{4,6}},{{4,7}},{{7,8}},{{6,7}}, + {{10,11}},{{0,8},{1,7},{3,4}}, {{11,13}}, {{0,12}} }, // Child 5 { {{0,1}},{{1,2}},{{0,2}},{{1,3}},{{4,5}},{{5,6}},{{4,6}},{{4,8}},{{5,8}},{{6,8}}, {{0,5},{1,6},{2,4}}, {{1,13}}, {{10,12}}, {{10,11}} }, From 82332c18b295313ff91f664c36d99db71ca8d6ba Mon Sep 17 00:00:00 2001 From: Nuno Nobre Date: Sat, 23 Sep 2023 23:21:13 +0100 Subject: [PATCH 2/2] Fix embedding for TET14 child 7 --- src/geom/cell_tet14.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/geom/cell_tet14.C b/src/geom/cell_tet14.C index be7fd9fe0d3..a89725a02f7 100644 --- a/src/geom/cell_tet14.C +++ b/src/geom/cell_tet14.C @@ -643,10 +643,10 @@ const Real Tet14::_embedding_matrix[Tet14::num_children][Tet14::num_nodes][Tet14 { 0., 0., 0., 0., 0., 0., 0., 0., 0., 1., 0., 0., 0., 0.}, // 2 { 0., 0., 0., 0., 0., 0., 0., 1., 0., 0., 0., 0., 0., 0.}, // 3 { 1/r64, 1/r64, 1/r64, 1/r64,-0.125,-0.125,-0.125,-0.125,-0.125,-0.125,27/r64,27/r64,27/r64,27/r64}, // 4 - {-.03125,-.03125, 0.,.09375,-0.125, 0., 0., 0.125, 0.125, 0., 0.,.84375, 0., 0.}, // 5 - {.09375, 0.,-.03125,-.03125, 0., 0., 0.125, 0.125, 0.,-0.125, 0., 0., 0.,.84375}, // 6 - {-.03125, 0.,.09375,-.03125, 0., 0., 0.125,-0.125, 0., 0.125, 0., 0., 0.,.84375}, // 7 - { 0.,-.03125,-.03125,.09375, 0.,-0.125, 0., 0., 0.125, 0.125, 0., 0.,.84375, 0.}, // 8 + { 0.,-.03125,-.03125,.09375, 0.,-0.125, 0., 0., 0.125, 0.125, 0., 0.,.84375, 0.}, // 5 + {-.03125, 0.,.09375,-.03125, 0., 0., 0.125,-0.125, 0., 0.125, 0., 0., 0.,.84375}, // 6 + {.09375, 0.,-.03125,-.03125, 0., 0., 0.125, 0.125, 0.,-0.125, 0., 0., 0.,.84375}, // 7 + {-.03125,-.03125, 0.,.09375,-0.125, 0., 0., 0.125, 0.125, 0., 0.,.84375, 0., 0.}, // 8 {-.03125, 0.,-.03125,.09375, 0., 0.,-0.125, 0.125, 0., 0.125, 0., 0., 0.,.84375}, // 9 { 0., 0., 2/r72, 2/r72,-2/r18,-2/r18,-2/r18,-2/r18,-2/r18, 0., 0.25, 0.25, 0.5, 0.5}, // 10 { 2/r72, 0., 0., 2/r72,-2/r18,-2/r18,-2/r18, 0.,-2/r18,-2/r18, 0.25, 0.5, 0.25, 0.5}, // 11 @@ -736,7 +736,7 @@ const std::vector> { {{0,2}},{{1,2}},{{2,3}},{{1,3}},{{5,6}},{{5,9}},{{6,9}},{{6,8}},{{5,8}},{{8,9}}, {{2,11}}, {{10,12}},{{1,9},{2,8},{3,5}}, {{12,13}} }, // Child 7 - { {{0,2}},{{1,3}},{{2,3}},{{0,3}},{{6,8}},{{7,8}},{{6,7}},{{6,9}},{{8,9}},{{7,9}}, + { {{0,2}},{{1,3}},{{2,3}},{{0,3}},{{6,8}},{{8,9}},{{6,9}},{{6,7}},{{7,8}},{{7,9}}, {{12,13}}, {{11,13}}, {{3,10}},{{0,9},{2,7},{3,6}} } };