Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/fe/fe_hierarchic_shape_3D.C
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,10 @@ Real FE<3,SIDE_HIERARCHIC>::shape_deriv(const Elem * elem,
{
case HEX27:
{
// I need to debug the p>2 case here...
if (totalorder > 2)
return fe_fdm_deriv(elem, order, i, j, p, add_p_level, FE<3,SIDE_HIERARCHIC>::shape);

const unsigned int dofs_per_side = (totalorder+1u)*(totalorder+1u);
libmesh_assert_less(i, 6*dofs_per_side);

Expand Down Expand Up @@ -1486,6 +1490,11 @@ Real FE<3,SIDE_HIERARCHIC>::shape_second_deriv(const Elem * elem,
{
case HEX27:
{
// I need to debug the p>2 case here...
if (totalorder > 2)
return fe_fdm_second_deriv(elem, order, i, j, p, add_p_level,
FE<3,SIDE_HIERARCHIC>::shape_deriv);

const unsigned int dofs_per_side = (totalorder+1u)*(totalorder+1u);
libmesh_assert_less(i, 6*dofs_per_side);

Expand Down
3 changes: 1 addition & 2 deletions src/fe/fe_interface.C
Original file line number Diff line number Diff line change
Expand Up @@ -2676,8 +2676,7 @@ unsigned int FEInterface::max_order(const FEType & fe_t,
case HEX20:
return 0;
case HEX27:
return 2; // p=3+ is still buggy in 3D
// return unlimited;
return unlimited;
case PRISM6:
case PRISM15:
case PRISM18:
Expand Down
4 changes: 2 additions & 2 deletions tests/fe/fe_side_test.C
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ INSTANTIATE_FESIDETEST(FOURTH, SIDE_HIERARCHIC, TRI7);
INSTANTIATE_FESIDETEST(CONSTANT, SIDE_HIERARCHIC, HEX27);
INSTANTIATE_FESIDETEST(FIRST, SIDE_HIERARCHIC, HEX27);
INSTANTIATE_FESIDETEST(SECOND, SIDE_HIERARCHIC, HEX27);
//INSTANTIATE_FESIDETEST(THIRD, SIDE_HIERARCHIC, HEX27);
//INSTANTIATE_FESIDETEST(FOURTH, SIDE_HIERARCHIC, HEX27);
INSTANTIATE_FESIDETEST(THIRD, SIDE_HIERARCHIC, HEX27);
INSTANTIATE_FESIDETEST(FOURTH, SIDE_HIERARCHIC, HEX27);
//
INSTANTIATE_FESIDETEST(CONSTANT, SIDE_HIERARCHIC, TET14);
INSTANTIATE_FESIDETEST(FIRST, SIDE_HIERARCHIC, TET14);
Expand Down