From d8c2e61e8b3274989f15882fce9a3e6031e0a79d Mon Sep 17 00:00:00 2001
From: Thomas Toulorge <thomas.toulorge@mines-paristech.fr>
Date: Tue, 4 Nov 2014 14:49:00 +0000
Subject: [PATCH] Lowered order of CondNumBasis (now order of mapping at most).
---
Numeric/CondNumBasis.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Numeric/CondNumBasis.cpp b/Numeric/CondNumBasis.cpp
index 67cd3253c7..28bfb13c07 100644
--- a/Numeric/CondNumBasis.cpp
+++ b/Numeric/CondNumBasis.cpp
@@ -376,12 +376,12 @@ int CondNumBasis::condNumOrder(int parentType, int order)
switch (parentType) {
case TYPE_PNT : return 0;
case TYPE_LIN : return order - 1;
- case TYPE_TRI : return 2*order - 2;
- case TYPE_QUA : return 2*order - 1;
- case TYPE_TET : return 3*order - 3;
- case TYPE_PRI : return 3*order - 1;
- case TYPE_HEX : return 3*order - 1;
- case TYPE_PYR : return 3*order - 3;
+ case TYPE_TRI : return (order == 1) ? 0 : order;
+ case TYPE_QUA : return order;
+ case TYPE_TET : return (order == 1) ? 0 : order;
+ case TYPE_PRI : return order;
+ case TYPE_HEX : return order;
+ case TYPE_PYR : return (order == 1) ? 0 : order;
default :
Msg::Error("Unknown element type %d, return order 0", parentType);
return 0;
--
GitLab