From 1e6331a3cad716c57cfbee0d9d992acdea09bb6e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 14 Aug 2001 16:25:11 +0000
Subject: [PATCH] Removed useless mesh.Simplex
---
Geo/ExtrudeParams.cpp | 3 +--
Geo/ExtrudeParams.h | 2 +-
Mesh/3D_Extrude.cpp | 22 ++++++++--------------
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/Geo/ExtrudeParams.cpp b/Geo/ExtrudeParams.cpp
index a3404cab8e..ec6af7258e 100644
--- a/Geo/ExtrudeParams.cpp
+++ b/Geo/ExtrudeParams.cpp
@@ -1,4 +1,4 @@
-// $Id: ExtrudeParams.cpp,v 1.4 2001-01-08 08:05:42 geuzaine Exp $
+// $Id: ExtrudeParams.cpp,v 1.5 2001-08-14 16:25:11 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -19,7 +19,6 @@ void Projette (double p[3],double mat[3][3]) {
ExtrudeParams :: ExtrudeParams (int ModeEx){
mesh.ExtrudeMesh = false;
geo.Mode = ModeEx;
- mesh.Simplexes = true;
mesh.Recombine = false;
}
diff --git a/Geo/ExtrudeParams.h b/Geo/ExtrudeParams.h
index faabfcf88c..90f28a2f63 100644
--- a/Geo/ExtrudeParams.h
+++ b/Geo/ExtrudeParams.h
@@ -18,7 +18,7 @@ public :
void Rotate(double matr[3][3]);
struct{
bool ExtrudeMesh;
- bool Simplexes, Recombine;
+ bool Recombine;
int NbLayer;
int NbElmLayer [NB_LAYER_MAX];
int ZonLayer [NB_LAYER_MAX];
diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp
index 65aad8bbdf..30ca5b0ecd 100644
--- a/Mesh/3D_Extrude.cpp
+++ b/Mesh/3D_Extrude.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Extrude.cpp,v 1.32 2001-08-14 16:10:47 geuzaine Exp $
+// $Id: 3D_Extrude.cpp,v 1.33 2001-08-14 16:25:11 geuzaine Exp $
#include "Gmsh.h"
#include "Numeric.h"
@@ -106,19 +106,13 @@ void Extrude_Simplex_Phase1 (void *data, void *dum){
List_Read (s->V[0]->Extruded_Points, k + 1, &v4);
List_Read (s->V[1]->Extruded_Points, k + 1, &v5);
List_Read (s->V[2]->Extruded_Points, k + 1, &v6);
- if (ep->mesh.Simplexes){
- k++;
- if (!are_exist (v1, v5, Tree_Ares))
- are_cree (v2, v4, Tree_Ares);
- if (!are_exist (v5, v3, Tree_Ares))
- are_cree (v2, v6, Tree_Ares);
- if (!are_exist (v4, v3, Tree_Ares))
- are_cree (v1, v6, Tree_Ares);
- }
- else if (!s->V[3]){
- }
- else{
- }
+ k++;
+ if (!are_exist (v1, v5, Tree_Ares))
+ are_cree (v2, v4, Tree_Ares);
+ if (!are_exist (v5, v3, Tree_Ares))
+ are_cree (v2, v6, Tree_Ares);
+ if (!are_exist (v4, v3, Tree_Ares))
+ are_cree (v1, v6, Tree_Ares);
}
}
}
--
GitLab