diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp index 56960c597ffa133bf01c8eecb5b86bc0cf7b07c1..d42bab8891cb2064ad8a65709f4057fa6d9c1c9e 100644 --- a/Mesh/3D_Mesh.cpp +++ b/Mesh/3D_Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Mesh.cpp,v 1.25 2001-08-13 09:38:14 geuzaine Exp $ +// $Id: 3D_Mesh.cpp,v 1.26 2001-08-13 09:42:02 geuzaine Exp $ /* @@ -319,7 +319,7 @@ void Box_6_Tetraedron (List_T * P, Mesh * m){ | /| /| | / | / | | / | / | - 5|/___|________/6 | + 5|/___|________/6 | | 4|________|___|3 | / | / | / Y | / @@ -733,8 +733,6 @@ void Maillage_Volume (void *data, void *dum){ } else if (v->Typ == 99999){ - Msg(STATUS2, "Mesh 3D... (initial)"); - LOCAL = &M; Create_BgMesh (THEM->BGM.Typ, .2, LOCAL); s = &S; @@ -753,10 +751,12 @@ void Maillage_Volume (void *data, void *dum){ N = List_Nbr (POINTS); n = N / 30 + 1; + + if(!N) return; /* Creation d'un maillage initial respectant la frontiere */ - if(!List_Nbr(POINTS))return; + Msg(STATUS2, "Mesh 3D... (initial)"); Convex_Hull_Mesh (POINTS, LOCAL); @@ -784,18 +784,17 @@ void Maillage_Volume (void *data, void *dum){ List_Delete (Suppress); - if (Tree_Nbr (LOCAL->Simplexes) == 0) - return; + if (Tree_Nbr (LOCAL->Simplexes) == 0) return; /* Si il reste quelque chose a mailler en volume : */ + + Msg(STATUS2, "Mesh 3D... (final)"); v->Simplexes = LOCAL->Simplexes; Bgm_With_Points (LOCAL); POINTS_TREE = THEM->Simplexes; - Msg(STATUS2, "Mesh 3D... (final)"); - Tree_Right (LOCAL->Simplexes, &simp); i = 0; Progress (102); diff --git a/Mesh/3D_SMesh.cpp b/Mesh/3D_SMesh.cpp index b10f6ef3bdd1e7e24e7f50d4d53478d4331aefe9..77d893b4925f25eef2f5297f7b03597115c7f9d9 100644 --- a/Mesh/3D_SMesh.cpp +++ b/Mesh/3D_SMesh.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_SMesh.cpp,v 1.9 2001-06-02 16:24:51 geuzaine Exp $ +// $Id: 3D_SMesh.cpp,v 1.10 2001-08-13 09:38:14 geuzaine Exp $ /* Maillage transfini volumique @@ -137,6 +137,8 @@ int MeshTransfiniteVolume (Volume *vol) { else if(nbs == 6) nbp = 8; else return(0); + Msg(STATUS3, "Meshing Volume %d", vol->Num); + for(i=0;i<6;i++) G[i] = NULL ; for(i=0;i<nbp;i++){