From 499f2ff38191c61f40a7a0d252f1af526fd8747a Mon Sep 17 00:00:00 2001 From: Amaury Johnan <amjohnen@gmail.com> Date: Mon, 2 Sep 2013 13:23:24 +0000 Subject: [PATCH] fix bug hex p3 (oversight in commit 15975) --- Geo/MHexahedron.cpp | 4 ++-- Geo/MHexahedron.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp index 93909ec0df..c204d9f390 100644 --- a/Geo/MHexahedron.cpp +++ b/Geo/MHexahedron.cpp @@ -201,7 +201,7 @@ const nodalBasis* MHexahedron::getFunctionSpace(int o) const case 0: return BasisFactory::getNodalBasis(MSH_HEX_1); case 1: return BasisFactory::getNodalBasis(MSH_HEX_8); case 2: return BasisFactory::getNodalBasis(MSH_HEX_20); - case 3: return BasisFactory::getNodalBasis(MSH_HEX_56); + case 3: return BasisFactory::getNodalBasis(MSH_HEX_32); case 4: return BasisFactory::getNodalBasis(MSH_HEX_44); case 5: return BasisFactory::getNodalBasis(MSH_HEX_56); case 6: return BasisFactory::getNodalBasis(MSH_HEX_68); @@ -240,7 +240,7 @@ const JacobianBasis* MHexahedron::getJacobianFuncSpace(int o) const case 0: return BasisFactory::getJacobianBasis(MSH_HEX_1); case 1: return BasisFactory::getJacobianBasis(MSH_HEX_8); case 2: return BasisFactory::getJacobianBasis(MSH_HEX_20); - case 3: return BasisFactory::getJacobianBasis(MSH_HEX_56); + case 3: return BasisFactory::getJacobianBasis(MSH_HEX_32); case 4: return BasisFactory::getJacobianBasis(MSH_HEX_44); case 5: return BasisFactory::getJacobianBasis(MSH_HEX_56); case 6: return BasisFactory::getJacobianBasis(MSH_HEX_68); diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h index c1802e03f4..e532e1fcaf 100644 --- a/Geo/MHexahedron.h +++ b/Geo/MHexahedron.h @@ -531,7 +531,7 @@ class MHexahedronN : public MHexahedron { if(_order == 9 && _vs.size() + 8 == 1000) return MSH_HEX_1000; if(_order == 2 && _vs.size() + 8 == 20) return MSH_HEX_20; - if(_order == 3 && _vs.size() + 8 == 56 ) return MSH_HEX_56; + if(_order == 3 && _vs.size() + 8 == 56 ) return MSH_HEX_32; if(_order == 4 && _vs.size() + 8 == 44) return MSH_HEX_44; if(_order == 5 && _vs.size() + 8 == 56) return MSH_HEX_56; if(_order == 6 && _vs.size() + 8 == 68) return MSH_HEX_68; -- GitLab