From c23cc8bfc3ff77b100be268c35b85f4217a43833 Mon Sep 17 00:00:00 2001
From: Amaury Johnan <amjohnen@gmail.com>
Date: Thu, 20 Jun 2013 21:28:21 +0000
Subject: [PATCH] corr nbMonomials of tetrahedron

---
 Numeric/pointsGenerators.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Numeric/pointsGenerators.cpp b/Numeric/pointsGenerators.cpp
index 3c8de9f689..324ace50ca 100644
--- a/Numeric/pointsGenerators.cpp
+++ b/Numeric/pointsGenerators.cpp
@@ -245,11 +245,7 @@ fullMatrix<double> gmshGenerateMonomialsQuadSerendipity(int order)
 //              to numbering of principal vertices of face !!!!
 fullMatrix<double> gmshGenerateMonomialsTetrahedron(int order, bool serendip)
 {
-  int nbMonomials =
-    (serendip ?
-     4 +  6 * std::max(0, order - 1) + 4 * std::max(0, (order - 2) * (order - 1) / 2) :
-     (order + 1) * (order + 2) * (order + 3) / 6);
-
+  int nbMonomials = serendip ? 4 + (order - 1)*6 : (order + 1)*(order + 2)*(order + 3)/6;
   if (serendip && !order) nbMonomials = 1;
   fullMatrix<double> monomials(nbMonomials, 3);
 
@@ -329,7 +325,7 @@ fullMatrix<double> gmshGenerateMonomialsTetrahedron(int order, bool serendip)
 fullMatrix<double> gmshGenerateMonomialsPrism(int order, bool forSerendipPoints)
 {
   int nbMonomials = forSerendipPoints ? 6 + (order-1)*9 :
-                                        (order + 1) * (order + 1)*(order + 2)/2;
+                                        (order + 1)*(order + 1)*(order + 2)/2;
   if (forSerendipPoints && !order) nbMonomials = 1;
   fullMatrix<double> monomials(nbMonomials, 3);
 
-- 
GitLab