From 01c3518503c96295779cb155a9339a3cd866a769 Mon Sep 17 00:00:00 2001
From: Amaury Johnan <amjohnen@gmail.com>
Date: Mon, 7 Apr 2014 10:24:51 +0000
Subject: [PATCH] fix Jacobian of pyramids
---
Mesh/meshGFaceRecombine.cpp | 4 ++--
Numeric/JacobianBasis.cpp | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Mesh/meshGFaceRecombine.cpp b/Mesh/meshGFaceRecombine.cpp
index 718e413b0a..72078265a9 100644
--- a/Mesh/meshGFaceRecombine.cpp
+++ b/Mesh/meshGFaceRecombine.cpp
@@ -228,7 +228,7 @@ Recombine2D::~Recombine2D()
bool Recombine2D::construct()
{
if (!_iamCurrent()) {
- Msg::Warning("[Recombine2D] I can't construct u_u");
+ Msg::Warning("[Recombine2D] I can't construct...");
return false;
}
if (Rec2DData::hasInstance()) {
@@ -4204,7 +4204,7 @@ double Rec2DVertex::getGainRecomb(/*Rec2DQualCrit crit,*/
static_cast<int>(_elements.size())-1/*, crit*/)
- getQual(/*crit*/);
- //FIX v�rifier que c''est bien ce qui est demand� ! (renvoie bien ce que veux apply, compute reward, ...)
+ //FIX verifier que c'est bien ce qui est demande ! (renvoie bien ce que veux apply, compute reward, ...)
}
void Rec2DVertex::/*vertQual_*/addEdgeQual(double val, int num)
diff --git a/Numeric/JacobianBasis.cpp b/Numeric/JacobianBasis.cpp
index cba205218d..24157004cc 100644
--- a/Numeric/JacobianBasis.cpp
+++ b/Numeric/JacobianBasis.cpp
@@ -52,8 +52,7 @@ GradientBasis::GradientBasis(int tag, int order)
samplingPoints = gmshGeneratePointsHexahedron(order,false);
break;
case TYPE_PYR :
- Msg::Error("not sure if pyramidal metric space = jacobian space");
- //samplingPoints = JacobianBasis::generateJacPointsPyramid(order);
+ samplingPoints = JacobianBasis::generateJacPointsPyramid(order);
break;
default :
Msg::Error("Unknown Jacobian function space for element tag %d", tag);
@@ -198,7 +197,6 @@ JacobianBasis::JacobianBasis(int tag)
gradShapeMatZFast(i, j) = allDPsiFast(j, 3*i+2);
}
}
-
}
// Computes (unit) normals to straight line element at barycenter (with norm of gradient as return value)
--
GitLab