From de9fb44dcec00fa25b85be40246c63e05cc0c6b2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 13 Aug 2001 09:42:02 +0000
Subject: [PATCH] nicer STATUS messages for mesh
---
Mesh/3D_Mesh.cpp | 17 ++++++++---------
Mesh/3D_SMesh.cpp | 4 +++-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp
index 56960c597f..d42bab8891 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 b10f6ef3bd..77d893b492 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++){
--
GitLab