Skip to content
Snippets Groups Projects
Commit 3d3c3635 authored by Sebastien Blaise's avatar Sebastien Blaise
Browse files

Added order 0 hexahedrons

parent 7ec0647a
Branches
Tags
No related merge requests found
...@@ -1508,6 +1508,7 @@ int MElement::OrderFromTag(int tag) ...@@ -1508,6 +1508,7 @@ int MElement::OrderFromTag(int tag)
case MSH_PRI_198 : return 7; case MSH_PRI_198 : return 7;
case MSH_PRI_258 : return 8; case MSH_PRI_258 : return 8;
case MSH_PRI_326 : return 9; case MSH_PRI_326 : return 9;
case MSH_HEX_1 : return 0;
case MSH_HEX_8 : return 1; case MSH_HEX_8 : return 1;
case MSH_HEX_27 : return 2; case MSH_HEX_27 : return 2;
case MSH_HEX_64 : return 3; case MSH_HEX_64 : return 3;
......
...@@ -213,6 +213,7 @@ const JacobianBasis* MHexahedron::getJacobianFuncSpace(int o) const ...@@ -213,6 +213,7 @@ const JacobianBasis* MHexahedron::getJacobianFuncSpace(int o) const
if ((nv == 0) && (o == -1)) { if ((nv == 0) && (o == -1)) {
switch (order) { switch (order) {
case 0: return JacobianBasis::find(MSH_HEX_1);
case 1: return JacobianBasis::find(MSH_HEX_8); case 1: return JacobianBasis::find(MSH_HEX_8);
case 2: return JacobianBasis::find(MSH_HEX_20); case 2: return JacobianBasis::find(MSH_HEX_20);
case 3: return JacobianBasis::find(MSH_HEX_56); case 3: return JacobianBasis::find(MSH_HEX_56);
...@@ -227,6 +228,7 @@ const JacobianBasis* MHexahedron::getJacobianFuncSpace(int o) const ...@@ -227,6 +228,7 @@ const JacobianBasis* MHexahedron::getJacobianFuncSpace(int o) const
} }
else { else {
switch (order) { switch (order) {
case 0: return JacobianBasis::find(MSH_HEX_1);
case 1: return JacobianBasis::find(MSH_HEX_8); case 1: return JacobianBasis::find(MSH_HEX_8);
case 2: return JacobianBasis::find(MSH_HEX_27); case 2: return JacobianBasis::find(MSH_HEX_27);
case 3: return JacobianBasis::find(MSH_HEX_64); case 3: return JacobianBasis::find(MSH_HEX_64);
......
...@@ -1463,6 +1463,7 @@ nodalBasis::nodalBasis(int tag) ...@@ -1463,6 +1463,7 @@ nodalBasis::nodalBasis(int tag)
case MSH_PRI_198 : parentType = TYPE_PRI; order = 7; serendip = true; break; case MSH_PRI_198 : parentType = TYPE_PRI; order = 7; serendip = true; break;
case MSH_PRI_258 : parentType = TYPE_PRI; order = 8; serendip = true; break; case MSH_PRI_258 : parentType = TYPE_PRI; order = 8; serendip = true; break;
case MSH_PRI_326 : parentType = TYPE_PRI; order = 9; serendip = true; break; case MSH_PRI_326 : parentType = TYPE_PRI; order = 9; serendip = true; break;
case MSH_HEX_1 : parentType = TYPE_HEX; order = 0; serendip = false; break;
case MSH_HEX_8 : parentType = TYPE_HEX; order = 1; serendip = false; break; case MSH_HEX_8 : parentType = TYPE_HEX; order = 1; serendip = false; break;
case MSH_HEX_27 : parentType = TYPE_HEX; order = 2; serendip = false; break; case MSH_HEX_27 : parentType = TYPE_HEX; order = 2; serendip = false; break;
case MSH_HEX_64 : parentType = TYPE_HEX; order = 3; serendip = false; break; case MSH_HEX_64 : parentType = TYPE_HEX; order = 3; serendip = false; break;
......
...@@ -150,6 +150,7 @@ inline int nodalBasis::getTag(int parentTag, int order, bool serendip) ...@@ -150,6 +150,7 @@ inline int nodalBasis::getTag(int parentTag, int order, bool serendip)
break; break;
case TYPE_HEX : case TYPE_HEX :
switch(order) { switch(order) {
case 0 : return MSH_HEX_1;
case 1 : return MSH_HEX_8; case 1 : return MSH_HEX_8;
case 2 : return serendip ? MSH_HEX_20 : MSH_HEX_27; case 2 : return serendip ? MSH_HEX_20 : MSH_HEX_27;
case 3 : return serendip ? MSH_HEX_56 : MSH_HEX_64; case 3 : return serendip ? MSH_HEX_56 : MSH_HEX_64;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment