From c0a5bc7aee4854aabbe9af4f7726e806601eb2d6 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 13 Aug 2001 09:38:14 +0000
Subject: [PATCH] nicer STATUS messages for mesh
---
Mesh/2D_InitMesh.cpp | 4 ++--
Mesh/2D_Mesh_Aniso.cpp | 12 +++++++-----
Mesh/3D_Extrude.cpp | 4 +++-
Mesh/3D_Mesh.cpp | 11 ++++-------
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Mesh/2D_InitMesh.cpp b/Mesh/2D_InitMesh.cpp
index 0302675ce4..90450b828c 100644
--- a/Mesh/2D_InitMesh.cpp
+++ b/Mesh/2D_InitMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_InitMesh.cpp,v 1.8 2001-08-11 23:28:32 geuzaine Exp $
+// $Id: 2D_InitMesh.cpp,v 1.9 2001-08-13 09:38:14 geuzaine Exp $
/*
@@ -173,7 +173,7 @@ void Print ( void *data , void *dummy){
ED *e;
e = (ED*)data;
- Msg(STATUS2,"%d %d",e->from,e->to);
+ Msg(INFO,"%d %d",e->from,e->to);
}
void SwapED ( void *data , void *dummy){
diff --git a/Mesh/2D_Mesh_Aniso.cpp b/Mesh/2D_Mesh_Aniso.cpp
index 78e3c31543..83982b2fee 100644
--- a/Mesh/2D_Mesh_Aniso.cpp
+++ b/Mesh/2D_Mesh_Aniso.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Mesh_Aniso.cpp,v 1.18 2001-08-11 23:28:32 geuzaine Exp $
+// $Id: 2D_Mesh_Aniso.cpp,v 1.19 2001-08-13 09:38:14 geuzaine Exp $
/*
Jean-Francois Remacle
@@ -654,8 +654,6 @@ void Convex_Hull_Mesh_2D (List_T * Points, Surface * s){
N = List_Nbr (Points);
- Msg(STATUS2, "Mesh 2D... (initial)");
-
Box_2_Triangles (Points, s);
for (i = 0; i < N; i++){
THES = NULL;
@@ -995,6 +993,8 @@ int AlgorithmeMaillage2DAnisotropeModeJF (Surface * s){
N = List_Nbr (Points);
n = N + 100;
+ Msg(STATUS2, "Mesh 2D... (initial)");
+
Convex_Hull_Mesh_2D (Points, s);
List_Reset (Points);
Link_Simplexes (NULL, s->Simplexes);
@@ -1041,6 +1041,8 @@ int AlgorithmeMaillage2DAnisotropeModeJF (Surface * s){
Tree_Suppress (s->Simplexes, List_Pointer (Suppress, i));
}
+ Msg(STATUS2, "Mesh 2D... (final)");
+
if(!Tree_Right (s->Simplexes, &simp))
Msg(WARNING, "No simplex left");
else{
@@ -1052,8 +1054,8 @@ int AlgorithmeMaillage2DAnisotropeModeJF (Surface * s){
(simp->S[1] == &MyNewBoundary || !simp->S[1]->Pt_In_Simplex_2D (newv)) &&
(simp->S[2] == &MyNewBoundary || !simp->S[2]->Pt_In_Simplex_2D (newv))){
/*
- Msg(STATUS2,"pt : %12.5E %12.5E",newv->Pos.X,newv->Pos.Y);
- Msg(STATUS2,"not in : (%12.5E %12.5E) (%12.5E %12.5E) (%12.5E %12.5E)",
+ Msg(INFO,"pt : %12.5E %12.5E",newv->Pos.X,newv->Pos.Y);
+ Msg(INFO,"not in : (%12.5E %12.5E) (%12.5E %12.5E) (%12.5E %12.5E)",
simp->V[0]->Pos.X,simp->V[0]->Pos.Y,simp->V[1]->Pos.X,
simp->V[1]->Pos.Y,simp->V[2]->Pos.X,simp->V[2]->Pos.Y);
*/
diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp
index 61508db1a3..df1dc1225c 100644
--- a/Mesh/3D_Extrude.cpp
+++ b/Mesh/3D_Extrude.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Extrude.cpp,v 1.26 2001-08-12 12:30:48 geuzaine Exp $
+// $Id: 3D_Extrude.cpp,v 1.27 2001-08-13 09:38:14 geuzaine Exp $
#include "Gmsh.h"
#include "Numeric.h"
@@ -695,6 +695,8 @@ int Extrude_Mesh (Volume * v){
if (!v->Extrude || !v->Extrude->mesh.ExtrudeMesh) return false;
+ Msg(STATUS3, "Meshing Volume %d", v->Num);
+
ep = v->Extrude;
THEV = v;
if (ep->geo.Mode == EXTRUDED_ENTITY){
diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp
index 74a17c376a..56960c597f 100644
--- a/Mesh/3D_Mesh.cpp
+++ b/Mesh/3D_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Mesh.cpp,v 1.24 2001-08-11 23:28:32 geuzaine Exp $
+// $Id: 3D_Mesh.cpp,v 1.25 2001-08-13 09:38:14 geuzaine Exp $
/*
@@ -577,8 +577,6 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
N = List_Nbr (Points);
n = IMAX (N / 20, 1);
- Msg(STATUS2, "Mesh 3D... (initial)");
-
Box_6_Tetraedron (Points, m);
// List_Sort (Points, comparePosition);
@@ -731,12 +729,11 @@ void Maillage_Volume (void *data, void *dum){
if (Extrude_Mesh (v)){
}
-
- if (v->Method == TRANSFINI){
- MeshTransfiniteVolume (v);
+ else if (MeshTransfiniteVolume (v)){
}
else if (v->Typ == 99999){
- Msg(STATUS3, "Nod=0 Elm=0");
+
+ Msg(STATUS2, "Mesh 3D... (initial)");
LOCAL = &M;
Create_BgMesh (THEM->BGM.Typ, .2, LOCAL);
--
GitLab