From b2594a52dfe04e34469bc25c8d69270fdc41c291 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Wed, 3 Oct 2001 06:59:37 +0000 Subject: [PATCH] Suppressed reorientation of triangles in Create_Simplex + suppressed 'ori' check in old 2D algo. --- Mesh/2D_Mesh.cpp | 13 ++++++++++++- Mesh/Simplex.cpp | 7 +------ Plugin/Skin.cpp | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Mesh/2D_Mesh.cpp b/Mesh/2D_Mesh.cpp index 59944931c5..85ed6f432a 100644 --- a/Mesh/2D_Mesh.cpp +++ b/Mesh/2D_Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: 2D_Mesh.cpp,v 1.35 2001-09-05 09:06:36 geuzaine Exp $ +// $Id: 2D_Mesh.cpp,v 1.36 2001-10-03 06:59:37 geuzaine Exp $ /* Maillage Delaunay d'une surface (Point insertion Technique) @@ -743,6 +743,10 @@ void Maillage_Automatique_VieuxCode (Surface * pS, Mesh * m, int ori){ Msg(GERROR, "Unknown vertex %d", ver[j]->Num); } } + + /* + Je n'ai pas l'impression que ceci fonctionne comme voulu (essaie + e.g. avec demos/machine.geo)... if (ori && !err) s = Create_Simplex (*pp[0], *pp[1], *pp[2], NULL); else if (!err) @@ -750,7 +754,14 @@ void Maillage_Automatique_VieuxCode (Surface * pS, Mesh * m, int ori){ if (!err){ s->iEnt = pS->Num; Tree_Insert (pS->Simplexes, &s); + } + */ + if (!err){ + s = Create_Simplex (*pp[0], *pp[2], *pp[1], NULL); + s->iEnt = pS->Num; + Tree_Insert (pS->Simplexes, &s); } + // MEMORY LEAK (JF) // Free(M.listdel[i]); } diff --git a/Mesh/Simplex.cpp b/Mesh/Simplex.cpp index bbef22c3de..df9fd88999 100644 --- a/Mesh/Simplex.cpp +++ b/Mesh/Simplex.cpp @@ -1,4 +1,4 @@ -// $Id: Simplex.cpp,v 1.17 2001-08-20 07:38:30 geuzaine Exp $ +// $Id: Simplex.cpp,v 1.18 2001-10-03 06:59:37 geuzaine Exp $ #include "Gmsh.h" #include "Numeric.h" @@ -302,11 +302,6 @@ void Simplex::Fourre_Simplexe (Vertex * v1, Vertex * v2, Vertex * v3, Vertex * v } if (!v4){ N = 3; - if (Volume_Simplexe2D () < 0.0){ - V[0] = v1; - V[1] = v3; - V[2] = v2; - } if (FACE_DIMENSION == 1){ //qsort(F[0].V,3,sizeof(Vertex*),compareVertex); Center_Circum (); diff --git a/Plugin/Skin.cpp b/Plugin/Skin.cpp index 8b0a64c358..653d4661fe 100644 --- a/Plugin/Skin.cpp +++ b/Plugin/Skin.cpp @@ -1,4 +1,4 @@ -// $Id: Skin.cpp,v 1.9 2001-08-28 15:09:31 geuzaine Exp $ +// $Id: Skin.cpp,v 1.10 2001-10-03 06:59:37 geuzaine Exp $ #include "Plugin.h" #include "Skin.h" @@ -37,7 +37,7 @@ void GMSH_SkinPlugin::getInfos(char *author, char *copyright, char *help_text) c strcpy(copyright, "DGR (www.multiphysics.com)"); strcpy(help_text, "Gets the skin (i.e. the boundary) of a view,\n" - "eliminating all interior drawing).\n" + "eliminating all interior drawing.\n" "Script name: Plugin(Skin).\n"); } -- GitLab