diff --git a/Mesh/3D_Coherence.cpp b/Mesh/3D_Coherence.cpp index b660744757992b1050153ec9400f0020e4bec453..6797cc2a8e7a5b5c0ec38e99deb8ba5e4f910180 100644 --- a/Mesh/3D_Coherence.cpp +++ b/Mesh/3D_Coherence.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Coherence.cpp,v 1.19 2001-08-28 22:15:15 geuzaine Exp $ +// $Id: 3D_Coherence.cpp,v 1.20 2001-08-29 07:27:51 geuzaine Exp $ #include "Gmsh.h" #include "Numeric.h" @@ -1233,19 +1233,18 @@ int Coherence (Volume * v, Mesh * m){ Nh = List_Nbr (NewPoints); /* il reste des intersections */ - + if (List_Nbr (ListFaces) != Nh - 2){ - Msg(INFO, "Intersections left"); - Msg(INFO, " Initial face contains %d existing faces", List_Nbr(ListFaces)); - Msg(INFO, " Face divided in %d points",List_Nbr(NewPoints)); + Msg(INFO, "Intersections left (the face contains %d initial faces, divided in %d points)", + List_Nbr(ListFaces), List_Nbr(NewPoints)); TreexNewv = Tree_Create (sizeof (xNewv), compxNewv); TetAdd = Tree_Create (sizeof (Simplex *), compareSimplex); TetDel = Tree_Create (sizeof (Simplex *), compareSimplex); Tree_Action (v->Simplexes, Recover_Face); - Msg(INFO, "The face is divided in %d points %d %d", + Msg(INFO, "The face is divided in %d points (simplexes added=%d, deleted=%d)", List_Nbr(NewPoints),Tree_Nbr(TetAdd),Tree_Nbr(TetDel)); Actual_Tree = v->Simplexes; @@ -1258,10 +1257,15 @@ int Coherence (Volume * v, Mesh * m){ Np = List_Nbr (NewPoints); if (1 || List_Nbr (ListFaces) == 2 * (Np - 1) - Nh){ - // on passe tjs ici pour le moment, meme si ca ne marche pas... - - Msg(INFO, "Recoverable face (%d <--> %d=2*(%d-1)-%d)", - List_Nbr (ListFaces), 2 * (Np - 1) - Nh, Np, Nh); + + // provisoire!!! + if (List_Nbr (ListFaces) != 2 * (Np - 1) - Nh){ + Msg(WARNING, "*Unrecoverable* face (%d <--> %d=2*(%d-1)-%d)", + List_Nbr(ListFaces), 2 * (Np - 1) - Nh, Np, Nh); + } + else + Msg(INFO, "Recoverable face (%d <--> %d=2*(%d-1)-%d)", + List_Nbr(ListFaces), 2 * (Np - 1) - Nh, Np, Nh); for (j = 0; j < List_Nbr (v->Surfaces); j++){ List_Read (v->Surfaces, j, &s); diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp index 8820140ff79e51a77ad6f2d11bca5b1a106e3d49..2824f44fc723a11c20c2285705a27e9523c2c2df 100644 --- a/Mesh/3D_Extrude.cpp +++ b/Mesh/3D_Extrude.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Extrude.cpp,v 1.43 2001-08-28 20:40:21 geuzaine Exp $ +// $Id: 3D_Extrude.cpp,v 1.44 2001-08-29 07:27:51 geuzaine Exp $ #include "Gmsh.h" #include "Numeric.h" @@ -303,7 +303,7 @@ void Create_PriPyrTet(int iEnt, Vertex *v[6]){ newp->iEnt = iEnt; Tree_Add(THEV->Prisms,&newp); if(j) - Msg(GERROR, "Degenerated prism %d (nodes %d %d %d %d %d %d %d %d)", + Msg(GERROR, "Degenerated prism %d (nodes %d %d %d %d %d %d)", newp->Num,v[0],v[1],v[2],v[3],v[4],v[5]); } diff --git a/utils/gmsh_fltk.spec b/utils/gmsh_fltk.spec index fd39e6839eefa8b1edce0e3cba9e8178748df9d3..d63950feec858529616c46526d758bc4b68782b6 100644 --- a/utils/gmsh_fltk.spec +++ b/utils/gmsh_fltk.spec @@ -20,8 +20,8 @@ a characteristic length field for the generation of adapted meshes on lines, surfaces and volumes. Gmsh requires OpenGL (or Mesa) to be installed on your system. -Install Gmsh if you need a 3D finite element mesh generator and/or -post-processor. +Install Gmsh if you need a simple 3D finite element mesh generator +and/or post-processor. %prep diff --git a/utils/gmsh_motif.spec b/utils/gmsh_motif.spec index 92e9357233c79781649f788b8634d15aa3ac388a..7f5a497eb8e6fd9df6d65345f25afc7657b820b8 100644 --- a/utils/gmsh_motif.spec +++ b/utils/gmsh_motif.spec @@ -20,8 +20,8 @@ a characteristic length field for the generation of adapted meshes on lines, surfaces and volumes. Gmsh requires the Mesa and Lesstif libraries to be installed on your system. -Install Gmsh if you need a 3D finite element mesh generator and/or -post-processor. +Install Gmsh if you need a simple 3D finite element mesh generator +and/or post-processor. %prep