From e11d03788929a2df1a9c43e5bf467f67cff5c9da Mon Sep 17 00:00:00 2001
From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be>
Date: Fri, 23 Oct 2015 15:18:24 +0000
Subject: [PATCH] fix pyramid integration weights
---
Numeric/GaussQuadraturePyr.cpp | 2 +-
wrappers/gmshpy/gmshGeo.i | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Numeric/GaussQuadraturePyr.cpp b/Numeric/GaussQuadraturePyr.cpp
index dc1401745c..91cd1b3982 100644
--- a/Numeric/GaussQuadraturePyr.cpp
+++ b/Numeric/GaussQuadraturePyr.cpp
@@ -48,7 +48,7 @@ IntPt *getGQPyrPts(int order)
// std::cout << "Points " << iU << " " << iV << " " << iW << std::endl;
- int wt = linWt[iU]*linWt[iV]*GJ20Wt[iW];
+ double wt = linWt[iU]*linWt[iV]*GJ20Wt[iW];
double up = linPt[iU];
double vp = linPt[iV];
diff --git a/wrappers/gmshpy/gmshGeo.i b/wrappers/gmshpy/gmshGeo.i
index 454361a278..fc54a5d28d 100644
--- a/wrappers/gmshpy/gmshGeo.i
+++ b/wrappers/gmshpy/gmshGeo.i
@@ -30,6 +30,7 @@
#include "MTriangle.h"
#include "MTetrahedron.h"
#include "MPrism.h"
+ #include "MPyramid.h"
#include "MHexahedron.h"
#include "MQuadrangle.h"
#include "MLine.h"
@@ -122,6 +123,7 @@ namespace std {
%include "MTriangle.h"
%include "MTetrahedron.h"
%include "MPrism.h"
+%include "MPyramid.h"
%include "MHexahedron.h"
%include "MQuadrangle.h"
%include "MLine.h"
--
GitLab