diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h index 7512cf32d62fee5e5e862188e5c5039561a678ef..21a22b81e358f0e8a9fe0ae2665237b0f6a92caf 100644 --- a/Common/GmshDefines.h +++ b/Common/GmshDefines.h @@ -161,7 +161,7 @@ #define MSH_HEX_56 99 #define MSH_HEX_98 100 #define MSH_HEX_152 101 -#define MSH_HEX_222 102 +#define MSH_HEX_218 102 #define MSH_HEX_296 103 #define MSH_HEX_386 104 #define MSH_HEX_488 105 diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp index 9abdea3f1f9ae709a8b7663f939f1db46a63390f..75acc04a63d7e807aeacb933a44fb6acd9516f99 100644 --- a/Geo/MElement.cpp +++ b/Geo/MElement.cpp @@ -1238,7 +1238,7 @@ int MElement::getInfoMSH(const int typeMSH, const char **const name) case MSH_HEX_56 : if(name) *name = "Hexahedron 56"; return 56; case MSH_HEX_98 : if(name) *name = "Hexahedron 98"; return 98; case MSH_HEX_152 : if(name) *name = "Hexahedron 152"; return 152; - case MSH_HEX_222 : if(name) *name = "Hexahedron 222"; return 222; + case MSH_HEX_218 : if(name) *name = "Hexahedron 218"; return 218; case MSH_HEX_296 : if(name) *name = "Hexahedron 296"; return 296; case MSH_HEX_386 : if(name) *name = "Hexahedron 386"; return 386; case MSH_HEX_488 : if(name) *name = "Hexahedron 488"; return 488; @@ -1420,7 +1420,7 @@ int MElement::ParentTypeFromTag(int tag) case(MSH_HEX_512): case(MSH_HEX_729): case(MSH_HEX_1000): case(MSH_HEX_56): case(MSH_HEX_98): case(MSH_HEX_152): - case(MSH_HEX_222): case(MSH_HEX_296): + case(MSH_HEX_218): case(MSH_HEX_296): case(MSH_HEX_386): case(MSH_HEX_488): return TYPE_HEX; case(MSH_POLYG_): case(MSH_POLYG_B): @@ -1539,7 +1539,7 @@ int MElement::OrderFromTag(int tag) case MSH_HEX_56 : return 3; case MSH_HEX_98 : return 4; case MSH_HEX_152 : return 5; - case MSH_HEX_222 : return 6; + case MSH_HEX_218 : return 6; case MSH_HEX_296 : return 7; case MSH_HEX_386 : return 8; case MSH_HEX_488 : return 9; diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp index 37158d41dacda09b9444f8518fea5ac2c229004c..86d2cddd81c6380b1e5e37311f8e230462e616fc 100644 --- a/Geo/MHexahedron.cpp +++ b/Geo/MHexahedron.cpp @@ -180,7 +180,7 @@ const nodalBasis* MHexahedron::getFunctionSpace(int o) const case 3: return BasisFactory::create(MSH_HEX_56); case 4: return BasisFactory::create(MSH_HEX_98); case 5: return BasisFactory::create(MSH_HEX_152); - case 6: return BasisFactory::create(MSH_HEX_222); + case 6: return BasisFactory::create(MSH_HEX_218); case 7: return BasisFactory::create(MSH_HEX_296); case 8: return BasisFactory::create(MSH_HEX_386); case 9: return BasisFactory::create(MSH_HEX_488); @@ -219,7 +219,7 @@ const JacobianBasis* MHexahedron::getJacobianFuncSpace(int o) const case 3: return JacobianBasis::find(MSH_HEX_56); case 4: return JacobianBasis::find(MSH_HEX_98); case 5: return JacobianBasis::find(MSH_HEX_152); - case 6: return JacobianBasis::find(MSH_HEX_222); + case 6: return JacobianBasis::find(MSH_HEX_218); case 7: return JacobianBasis::find(MSH_HEX_296); case 8: return JacobianBasis::find(MSH_HEX_386); case 9: return JacobianBasis::find(MSH_HEX_488); diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h index d5984c1ef576f87da06504d1a9baa291aa999ea9..3b7790646e329b9217d9189461d784715e95695e 100644 --- a/Geo/MHexahedron.h +++ b/Geo/MHexahedron.h @@ -587,7 +587,7 @@ class MHexahedronN : public MHexahedron { if(_order == 3 && _vs.size() + 8 == 56 ) return MSH_HEX_56; if(_order == 4 && _vs.size() + 8 == 98) return MSH_HEX_98; if(_order == 5 && _vs.size() + 8 == 152) return MSH_HEX_152; - if(_order == 6 && _vs.size() + 8 == 222) return MSH_HEX_222; + if(_order == 6 && _vs.size() + 8 == 222) return MSH_HEX_218; if(_order == 7 && _vs.size() + 8 == 296) return MSH_HEX_296; if(_order == 8 && _vs.size() + 8 == 386) return MSH_HEX_386; if(_order == 9 && _vs.size() + 8 == 488) return MSH_HEX_488; diff --git a/Numeric/nodalBasis.cpp b/Numeric/nodalBasis.cpp index 1065e813f2f1abfdc94f2155e0c03bcc12ce6547..6896be21c9ede3c45b5fe300880b359814240f00 100644 --- a/Numeric/nodalBasis.cpp +++ b/Numeric/nodalBasis.cpp @@ -1477,7 +1477,7 @@ nodalBasis::nodalBasis(int tag) case MSH_HEX_56 : parentType = TYPE_HEX; order = 3; serendip = true; break; case MSH_HEX_98 : parentType = TYPE_HEX; order = 4; serendip = true; break; case MSH_HEX_152 : parentType = TYPE_HEX; order = 5; serendip = true; break; - case MSH_HEX_222 : parentType = TYPE_HEX; order = 6; serendip = true; break; + case MSH_HEX_218 : parentType = TYPE_HEX; order = 6; serendip = true; break; case MSH_HEX_296 : parentType = TYPE_HEX; order = 7; serendip = true; break; case MSH_HEX_386 : parentType = TYPE_HEX; order = 8; serendip = true; break; case MSH_HEX_488 : parentType = TYPE_HEX; order = 9; serendip = true; break; diff --git a/Numeric/nodalBasis.h b/Numeric/nodalBasis.h index 19b45a7ad8145d92081d6654120e55c08519d968..83250db0e0e8cbef87344983818c27371ca91120 100644 --- a/Numeric/nodalBasis.h +++ b/Numeric/nodalBasis.h @@ -156,7 +156,7 @@ inline int nodalBasis::getTag(int parentTag, int order, bool serendip) case 3 : return serendip ? MSH_HEX_56 : MSH_HEX_64; case 4 : return serendip ? MSH_HEX_98 : MSH_HEX_125; case 5 : return serendip ? MSH_HEX_152: MSH_HEX_216; - case 6 : return serendip ? MSH_HEX_222: MSH_HEX_343; + case 6 : return serendip ? MSH_HEX_218: MSH_HEX_343; case 7 : return serendip ? MSH_HEX_296: MSH_HEX_512; case 8 : return serendip ? MSH_HEX_386: MSH_HEX_729; case 9 : return serendip ? MSH_HEX_488: MSH_HEX_1000;