From eadb897727a869bcfd853b3b4201ad3e3726b48d Mon Sep 17 00:00:00 2001
From: Amaury Johnen <amaury.johnen@uclouvain.be>
Date: Fri, 17 Nov 2017 09:37:41 +0100
Subject: [PATCH] fix bug sampleIGEMeasure
---
Mesh/qualityMeasuresJacobian.cpp | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/Mesh/qualityMeasuresJacobian.cpp b/Mesh/qualityMeasuresJacobian.cpp
index 97eb1da16e..cbc5d6b0d9 100644
--- a/Mesh/qualityMeasuresJacobian.cpp
+++ b/Mesh/qualityMeasuresJacobian.cpp
@@ -48,29 +48,27 @@ static inline void computeCoeffLengthVectors_(const fullMatrix<double> &mat,
pow_int(mat(i, 4), 2) +
pow_int(mat(i, 5), 2) );
}
- if (mat.size2() > 6) { // if 3D
+ if (type == TYPE_TRI) {
+ for (int i = 0; i < sz1; i++) {
+ coeff(i, 2) = std::sqrt(pow_int(mat(i, 3) - mat(i, 0), 2) +
+ pow_int(mat(i, 4) - mat(i, 1), 2) +
+ pow_int(mat(i, 5) - mat(i, 2), 2) );
+ }
+ }
+ else if (type != TYPE_QUA) { // if 3D
for (int i = 0; i < sz1; i++) {
coeff(i, 2) = std::sqrt(pow_int(mat(i, 6), 2) +
pow_int(mat(i, 7), 2) +
pow_int(mat(i, 8), 2) );
}
}
- else if (type == TYPE_TRI) {
+ if (type == TYPE_TET || type == TYPE_PRI) {
for (int i = 0; i < sz1; i++) {
- coeff(i, 2) = std::sqrt(pow_int(mat(i, 3) - mat(i, 0), 2) +
+ coeff(i, 3) = std::sqrt(pow_int(mat(i, 3) - mat(i, 0), 2) +
pow_int(mat(i, 4) - mat(i, 1), 2) +
pow_int(mat(i, 5) - mat(i, 2), 2) );
}
}
- switch (type) {
- case TYPE_TET:
- case TYPE_PRI:
- for (int i = 0; i < sz1; i++) {
- coeff(i, 3) = std::sqrt(pow_int(mat(i, 3) - mat(i, 0), 2) +
- pow_int(mat(i, 4) - mat(i, 1), 2) +
- pow_int(mat(i, 5) - mat(i, 2), 2) );
- }
- }
if (type == TYPE_TET) {
for (int i = 0; i < sz1; i++) {
coeff(i, 4) = std::sqrt(pow_int(mat(i, 6) - mat(i, 0), 2) +
--
GitLab