From 904a56f3d4347fa1b906b1c3de083449e6e0a903 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 13 Mar 2015 18:37:35 +0000
Subject: [PATCH] pp
---
Geo/MHexahedron.h | 12 ++++++------
Geo/MQuadrangle.h | 2 +-
Geo/MTetrahedron.h | 4 ++--
Geo/MTriangle.h | 5 ++++-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index ce71e918c7..7fa2f57ac7 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -269,9 +269,9 @@ class MHexahedron20 : public MHexahedron {
}
virtual MVertex *getVertexVTK(int num)
{
- static const int map[20] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 11, 13,
- 9, 16, 18, 19, 17, 10, 12, 14, 15 };
- return getVertex(map[num]);
+ static const int map[20] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 11, 13,
+ 9, 16, 18, 19, 17, 10, 12, 14, 15};
+ return getVertex(map[num]);
}
virtual int getNumEdgeVertices() const { return 12; }
virtual int getNumEdgesRep(bool curved);
@@ -380,9 +380,9 @@ class MHexahedron27 : public MHexahedron {
}
virtual MVertex *getVertexVTK(int num)
{
- static const int map[27] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 11, 13, 9, 16, 18, 19, 17, 10, 12, 14,15, 22,
- 23, 21, 24, 20, 25, 26};
- return getVertex(map[num]);
+ static const int map[27] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 11, 13, 9, 16, 18, 19,
+ 17, 10, 12, 14,15, 22, 23, 21, 24, 20, 25, 26};
+ return getVertex(map[num]);
}
virtual int getNumEdgeVertices() const { return 12; }
virtual int getNumFaceVertices() const { return 6; }
diff --git a/Geo/MQuadrangle.h b/Geo/MQuadrangle.h
index e906007750..c0c27727d4 100644
--- a/Geo/MQuadrangle.h
+++ b/Geo/MQuadrangle.h
@@ -432,7 +432,7 @@ class MQuadrangleN : public MQuadrangle {
virtual int getTypeForVTK() const
{
if(_order== 2 && _vs.size() + 4 == 9) return 28;
- if(_order== 2 && _vs.size() + 4 == 8) return 23;
+ if(_order== 2 && _vs.size() + 4 == 8) return 23;
return MQuadrangle::getTypeForVTK();
}
virtual void reverse()
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index 537a094922..f5884bae2b 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -241,8 +241,8 @@ class MTetrahedron10 : public MTetrahedron {
}
virtual MVertex *getVertexVTK(int num)
{
- static const int map[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 9, 8};
- return getVertex(map[num]);
+ static const int map[10] = {0, 1, 2, 3, 4, 5, 6, 7, 9, 8};
+ return getVertex(map[num]);
}
virtual MVertex *getVertexDIFF(int num){ return getVertexBDF(num); }
virtual MVertex *getVertexINP(int num){ return getVertexBDF(num); }
diff --git a/Geo/MTriangle.h b/Geo/MTriangle.h
index ff94dd4d87..5f7874839a 100644
--- a/Geo/MTriangle.h
+++ b/Geo/MTriangle.h
@@ -327,7 +327,10 @@ class MTriangleN : public MTriangle {
Msg::Error("no tag matches a p%d triangle with %d vertices", _order, 3+_vs.size());
return 0;
}
- virtual int getTypeForVTK() const { return (_order==2) ? 22 : MTriangle::getTypeForVTK(); }
+ virtual int getTypeForVTK() const
+ {
+ return (_order == 2) ? 22 : MTriangle::getTypeForVTK();
+ }
virtual void reverse()
{
MVertex *tmp;
--
GitLab