[Getfem-commits] (no subject)

[Konstantinos Poulios]

branch: serendipity-elements
commit 5c0761293efee7248e810c0b4ba28b84b51a50bb
Author: Konstantinos Poulios <address@hidden>
Date:   Fri Sep 15 12:46:58 2017 +0200

    account for pyramid elements in classic integration methods
---
 src/getfem_integration.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/getfem_integration.cc b/src/getfem_integration.cc
index 4d5f9e3..6eba855 100644
--- a/src/getfem_integration.cc
+++ b/src/getfem_integration.cc
@@ -19,7 +19,7 @@
 
 ===========================================================================*/
 
-#include "getfem/bgeot_torus.h"
+
 #include "getfem/dal_singleton.h"
 #include "getfem/getfem_integration.h"
 #include "gmm/gmm_dense_lu.h"
@@ -1260,6 +1260,9 @@ namespace getfem {
       }
       GMM_ASSERT1(false, "could not find an " << name.str()
                   << " of degree >= " << int(degree));
+    } else if (bgeot::basic_structure(cvs) == bgeot::pyramid_QK_structure(1)) {
+      GMM_ASSERT1(n == 3, "Wrong dimension");
+      name << "IM_PYRAMID(IM_GAUSS_PARALLELEPIPED(3," << degree << "))";
     } else if (cvs->is_product(&a,&b) ||
                (bgeot::basic_structure(cvs).get() &&
                 bgeot::basic_structure(cvs)->is_product(&a,&b))) {