From 83ce4e5cff176921ff394394b15aa6a93037e50f Mon Sep 17 00:00:00 2001
From: Amaury Johnan <amjohnen@gmail.com>
Date: Mon, 17 Jun 2013 14:35:08 +0000
Subject: [PATCH] clean up
---
Common/GmshDefines.h | 26 +++++++++++++-------------
Geo/MHexahedron.h | 15 ++++++++-------
Geo/MPyramid.h | 14 +++++++-------
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index fd80245b71..5217a9215f 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -161,10 +161,10 @@
// HEXES INCOMPLETE (3->9)
#define MSH_HEX_32 99
#define MSH_HEX_44 100
-#define MSH_HEX_56 101
-#define MSH_HEX_68 102
-#define MSH_HEX_80 103
-#define MSH_HEX_92 104
+#define MSH_HEX_56 101
+#define MSH_HEX_68 102
+#define MSH_HEX_80 103
+#define MSH_HEX_92 104
#define MSH_HEX_104 105
// PRISMS COMPLETE (5->9)
#define MSH_PRI_126 106
@@ -175,11 +175,11 @@
// PRISMS INCOMPLETE (3->9)
#define MSH_PRI_24 111
#define MSH_PRI_33 112
-#define MSH_PRI_42 113
-#define MSH_PRI_51 114
-#define MSH_PRI_60 115
-#define MSH_PRI_69 116
-#define MSH_PRI_78 117
+#define MSH_PRI_42 113
+#define MSH_PRI_51 114
+#define MSH_PRI_60 115
+#define MSH_PRI_69 116
+#define MSH_PRI_78 117
// PYRAMIDS COMPLETE (3->9)
#define MSH_PYR_30 118
#define MSH_PYR_55 119
@@ -192,10 +192,10 @@
#define MSH_PYR_21 125
#define MSH_PYR_29 126
#define MSH_PYR_37 127
-#define MSH_PYR_45 128
-#define MSH_PYR_53 129
-#define MSH_PYR_61 130
-#define MSH_PYR_69 131
+#define MSH_PYR_45 128
+#define MSH_PYR_53 129
+#define MSH_PYR_61 130
+#define MSH_PYR_69 131
// Additional types
#define MSH_PYR_1 132
#define MSH_PNT_SUB 133
diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index e4596d809e..ca1d221024 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -516,7 +516,6 @@ class MHexahedronN : public MHexahedron {
{
// (p+1)^3
if(_order == 1 && _vs.size() + 8 == 8) return MSH_HEX_8;
- if(_order == 2 && _vs.size() + 8 == 20) return MSH_HEX_20;
if(_order == 2 && _vs.size() + 8 == 27) return MSH_HEX_27;
if(_order == 3 && _vs.size() + 8 == 64 ) return MSH_HEX_64;
if(_order == 4 && _vs.size() + 8 == 125) return MSH_HEX_125;
@@ -525,13 +524,15 @@ class MHexahedronN : public MHexahedron {
if(_order == 7 && _vs.size() + 8 == 512) return MSH_HEX_512;
if(_order == 8 && _vs.size() + 8 == 729) return MSH_HEX_729;
if(_order == 9 && _vs.size() + 8 == 1000) return MSH_HEX_1000;
+
+ if(_order == 2 && _vs.size() + 8 == 20) return MSH_HEX_20;
if(_order == 3 && _vs.size() + 8 == 56 ) return MSH_HEX_56;
- if(_order == 4 && _vs.size() + 8 == 98) return MSH_HEX_44;
- if(_order == 5 && _vs.size() + 8 == 152) return MSH_HEX_56;
- if(_order == 6 && _vs.size() + 8 == 222) return MSH_HEX_68;
- if(_order == 7 && _vs.size() + 8 == 296) return MSH_HEX_80;
- if(_order == 8 && _vs.size() + 8 == 386) return MSH_HEX_92;
- if(_order == 9 && _vs.size() + 8 == 488) return MSH_HEX_104;
+ if(_order == 4 && _vs.size() + 8 == 44) return MSH_HEX_44;
+ if(_order == 5 && _vs.size() + 8 == 56) return MSH_HEX_56;
+ if(_order == 6 && _vs.size() + 8 == 68) return MSH_HEX_68;
+ if(_order == 7 && _vs.size() + 8 == 80) return MSH_HEX_80;
+ if(_order == 8 && _vs.size() + 8 == 92) return MSH_HEX_92;
+ if(_order == 9 && _vs.size() + 8 == 104) return MSH_HEX_104;
return 0;
}
virtual int getNumFacesRep();
diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h
index ce640721f5..bad11f2bea 100644
--- a/Geo/MPyramid.h
+++ b/Geo/MPyramid.h
@@ -293,19 +293,19 @@ class MPyramidN : public MPyramid {
{
if(_order == 2 && _vs.size() + 5 == 13) return MSH_PYR_13;
if(_order == 2 && _vs.size() + 5 == 14) return MSH_PYR_14;
- if(_order == 3 && _vs.size() + 5 == 29) return MSH_PYR_21;
+ if(_order == 3 && _vs.size() + 5 == 21) return MSH_PYR_21;
if(_order == 3 && _vs.size() + 5 == 30) return MSH_PYR_30;
- if(_order == 4 && _vs.size() + 5 == 50) return MSH_PYR_29;
+ if(_order == 4 && _vs.size() + 5 == 29) return MSH_PYR_29;
if(_order == 4 && _vs.size() + 5 == 55) return MSH_PYR_55;
- if(_order == 5 && _vs.size() + 5 == 77) return MSH_PYR_37;
+ if(_order == 5 && _vs.size() + 5 == 37) return MSH_PYR_37;
if(_order == 5 && _vs.size() + 5 == 91) return MSH_PYR_91;
- if(_order == 6 && _vs.size() + 5 == 110) return MSH_PYR_45;
+ if(_order == 6 && _vs.size() + 5 == 45) return MSH_PYR_45;
if(_order == 6 && _vs.size() + 5 == 140) return MSH_PYR_140;
- if(_order == 7 && _vs.size() + 5 == 149) return MSH_PYR_53;
+ if(_order == 7 && _vs.size() + 5 == 53) return MSH_PYR_53;
if(_order == 7 && _vs.size() + 5 == 204) return MSH_PYR_204;
- if(_order == 8 && _vs.size() + 5 == 194) return MSH_PYR_61;
+ if(_order == 8 && _vs.size() + 5 == 61) return MSH_PYR_61;
if(_order == 8 && _vs.size() + 5 == 285) return MSH_PYR_285;
- if(_order == 9 && _vs.size() + 5 == 245) return MSH_PYR_69;
+ if(_order == 9 && _vs.size() + 5 == 69) return MSH_PYR_69;
if(_order == 9 && _vs.size() + 5 == 385) return MSH_PYR_385;
return 0;
}
--
GitLab