diff --git a/Adapt/Adapt.cpp b/Adapt/Adapt.cpp
index c397866c2db150e62d1b80a9268d41758bb5dbd6..b4a8569e2462625019f891e68f8f3636ed042678 100644
--- a/Adapt/Adapt.cpp
+++ b/Adapt/Adapt.cpp
@@ -1,4 +1,4 @@
-// $Id: Adapt.cpp,v 1.5 2001-01-12 13:28:51 geuzaine Exp $
+// $Id: Adapt.cpp,v 1.6 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Adapt.h"
@@ -184,7 +184,7 @@ double AdaptMesh (int N, /* Number of elements */
break;
default :
- Msg(GERROR, "Unknown Adaption Method");
+ Msg(GERROR, "Unknown adaption method");
}
return(contr) ;
diff --git a/Box/Main.cpp b/Box/Main.cpp
index 1c4965cabe5607232e864413b6a3dd9fbdcb0b4c..31f2592d50d29ece68e9fe023f6bb66fdbdcd2f6 100644
--- a/Box/Main.cpp
+++ b/Box/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.2 2001-02-20 18:32:58 geuzaine Exp $
+// $Id: Main.cpp,v 1.3 2001-04-08 20:36:49 geuzaine Exp $
#include <signal.h>
@@ -103,10 +103,10 @@ int main(int argc, char *argv[]){
void Signal (int sig_num){
switch (sig_num){
- case SIGSEGV : Msg(FATAL, "Segmentation Violation (Invalid Memory Reference)"); break;
- case SIGFPE : Msg(FATAL, "Floating Point Exception (Division by Zero?)"); break;
- case SIGINT : Msg(FATAL, "Interrupt (Generated from Terminal Special Char)"); break;
- default : Msg(FATAL, "Unknown Signal"); break;
+ case SIGSEGV : Msg(FATAL, "Segmentation violation (invalid memory reference)"); break;
+ case SIGFPE : Msg(FATAL, "Floating point exception (division by zero?)"); break;
+ case SIGINT : Msg(FATAL, "Interrupt (generated from terminal special char)"); break;
+ default : Msg(FATAL, "Unknown signal"); break;
}
}
diff --git a/Common/Options.cpp b/Common/Options.cpp
index c50492bf6a3910c625b3674c3b1d75820e434c9b..4ce1574df6f810077feac3d4543099cd077a253a 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.9 2001-04-08 12:49:31 geuzaine Exp $
+// $Id: Options.cpp,v 1.10 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -107,7 +107,7 @@ void Print_Options(int num, int level, char *filename){
if(filename){
file = fopen(filename,"w");
if(!file){
- Msg(WARNING, "Unable to Open File '%s'", filename);
+ Msg(WARNING, "Unable to open file '%s'", filename);
return;
}
}
@@ -169,7 +169,7 @@ void Print_Options(int num, int level, char *filename){
if(filename){
if((level & GMSH_OPTIONSRC) || (level & GMSH_FULLRC)){
- Msg(INFO, "Options Output Complete '%s'", filename);
+ Msg(INFO, "Options output complete '%s'", filename);
Msg(STATUS2, "Wrote '%s'", filename);
}
fclose(file);
@@ -683,11 +683,11 @@ double opt_general_double_buffer(OPT_ARGS_NUM){
#ifdef _FLTK
if(WID){
if(CTX.db){
- Msg(INFO, "Setting Opengl visual to double buffered");
+ Msg(INFO, "Setting OpenGL visual to double buffered");
WID->g_opengl_window->mode(FL_RGB | FL_DEPTH | FL_DOUBLE);
}
else{
- Msg(INFO, "Setting Opengl visual to single buffered");
+ Msg(INFO, "Setting OpenGL visual to single buffered");
WID->g_opengl_window->mode(FL_RGB | FL_DEPTH | FL_SINGLE);
}
}
diff --git a/Common/Views.cpp b/Common/Views.cpp
index 933e63f5981ae608d08bcd8cc2c08b064f4460e2..bc3f25fb13d74654e8efd01692ff380e38d4eccb 100644
--- a/Common/Views.cpp
+++ b/Common/Views.cpp
@@ -1,4 +1,4 @@
-// $Id: Views.cpp,v 1.33 2001-03-18 10:40:54 geuzaine Exp $
+// $Id: Views.cpp,v 1.34 2001-04-08 20:36:49 geuzaine Exp $
#include <set>
#include "Gmsh.h"
@@ -151,7 +151,7 @@ void Stat_VectorSimplex(int nbnod, int N, double *V){
}
void Stat_TensorSimplex(int nbnod, int N, double *v){
- Msg(GERROR, "Tensor Field Views not Implemented Yet");
+ Msg(GERROR, "Tensor field views not implemented yet");
}
@@ -404,15 +404,15 @@ void Read_View(FILE *file, char *filename){
if (!strncmp(&str[1], "PostFormat", 10)){
fscanf(file, "%lf %d %d\n", &version, &format, &size) ;
if(version < 1.0){
- Msg(GERROR, "The Version of this File is too old (%g < 1.0)", version);
+ Msg(GERROR, "The version of this post-processing file is too old (%g < 1.0)", version);
return;
}
if(size == sizeof(double))
- Msg(DEBUG, "Data is in Double Precision Format (size==%d)", size);
+ Msg(DEBUG, "Data is in double precision format (size==%d)", size);
else if(size == sizeof(float))
- Msg(DEBUG, "Data is in Single Precision Format (size==%d)", size);
+ Msg(DEBUG, "Data is in single precision format (size==%d)", size);
else{
- Msg(GERROR, "Unknown Type of Data (Size = %d) in Post-Processing File",
+ Msg(GERROR, "Unknown type of data (size = %d) in post-processing file",
size);
return;
}
@@ -421,7 +421,7 @@ void Read_View(FILE *file, char *filename){
else if(format == 1)
format = LIST_FORMAT_BINARY ;
else{
- Msg(GERROR, "Unknown Format for View");
+ Msg(GERROR, "Unknown format for view");
return ;
}
}
@@ -443,7 +443,7 @@ void Read_View(FILE *file, char *filename){
if(format == LIST_FORMAT_BINARY){
fread(&testone, sizeof(int), 1, file);
if(testone != 1){
- Msg(INFO, "Swapping Bytes from Binary File");
+ Msg(INFO, "Swapping bytes from binary file");
swap = 1;
}
}
@@ -511,7 +511,7 @@ void Read_View(FILE *file, char *filename){
do {
fgets(str, NAME_STR_L, file) ;
- if (feof(file)) Msg(GERROR,"Prematured End of File");
+ if (feof(file)) Msg(GERROR,"Prematured end of file");
} while (str[0] != '$') ;
} /* while 1 ... */
@@ -529,7 +529,7 @@ void Write_View(int Flag_BIN, Post_View *v, char *filename){
if(filename){
file = fopen(filename,"w");
if(!file){
- Msg(WARNING, "Unable to Open File '%s'", filename);
+ Msg(WARNING, "Unable to open file '%s'", filename);
return;
}
}
@@ -569,7 +569,7 @@ void Write_View(int Flag_BIN, Post_View *v, char *filename){
fprintf(file, "$EndView\n");
if(filename){
- Msg(INFO, "View Output Complete '%s'", filename);
+ Msg(INFO, "View output complete '%s'", filename);
Msg(STATUS2, "Wrote '%s'", filename);
fclose(file);
}
diff --git a/DataStr/List.cpp b/DataStr/List.cpp
index 58897c6e51f87d48f953f0405262866ce37b7745..4a9588dab1352559ffa6f6e8f4959ad89315f9a4 100644
--- a/DataStr/List.cpp
+++ b/DataStr/List.cpp
@@ -1,4 +1,4 @@
-// $Id: List.cpp,v 1.14 2001-02-12 17:38:02 geuzaine Exp $
+// $Id: List.cpp,v 1.15 2001-04-08 20:36:49 geuzaine Exp $
#include <stdlib.h>
#include <stdio.h>
@@ -97,14 +97,14 @@ int List_Replace(List_T *liste, void *data,
void List_Read(List_T *liste, int index, void *data)
{
if ((index < 0) || (index >= liste->n))
- Msg(FATAL, "Wrong List Index in List_Read");
+ Msg(FATAL, "Wrong list index (read)");
memcpy(data,&liste->array[index * liste->size],liste->size);
}
void List_Write(List_T *liste, int index, void *data)
{
if ((index < 0) || (index >= liste->n))
- Msg(GERROR, "Wrong List Index in List_Write");
+ Msg(GERROR, "Wrong list index (write)");
else{
liste->isorder = 0;
memcpy(&liste->array[index * liste->size],data,liste->size);
@@ -114,7 +114,7 @@ void List_Write(List_T *liste, int index, void *data)
void List_Put(List_T *liste, int index, void *data)
{
if (index < 0)
- Msg(GERROR, "Wrong List Index in List_Put");
+ Msg(GERROR, "Wrong list index (put)");
else{
if (index >= liste->n) {
liste->n = index + 1;
@@ -135,7 +135,7 @@ void List_Pop(List_T *liste)
void *List_Pointer(List_T *liste, int index)
{
if ((index < 0) || (index >= liste->n))
- Msg(FATAL, "Wrong List Index in List_Pointer");
+ Msg(FATAL, "Wrong list index (pointer)");
liste->isorder = 0;
return(&liste->array[index * liste->size]);
@@ -144,7 +144,7 @@ void *List_Pointer(List_T *liste, int index)
void *List_Pointer_NoChange(List_T *liste, int index)
{
if ((index < 0) || (index >= liste->n))
- Msg(FATAL, "Wrong List Index in List_Pointer_NoChange");
+ Msg(FATAL, "Wrong list index (pointer)");
return(&liste->array[index * liste->size]);
}
@@ -383,7 +383,7 @@ List_T *List_CreateFromFile(int n, int size, FILE *file, int format, int swap){
else if(size == sizeof(int))
for(i=0;i<n;i++) fscanf(file, "%d", (int*)&liste->array[i*size]) ;
else{
- Msg(GERROR, "Unknown Type of Data to Create List From");
+ Msg(GERROR, "Bad type of data to create list from (size = %d)", size);
return NULL;
}
return liste;
@@ -392,7 +392,7 @@ List_T *List_CreateFromFile(int n, int size, FILE *file, int format, int swap){
if(swap) swap_bytes(liste->array, size, n);
return liste;
default :
- Msg(GERROR, "Unknown List Format");
+ Msg(GERROR, "Unknown list format");
return NULL;
}
@@ -412,13 +412,13 @@ void List_WriteToFile(List_T *liste, FILE *file, int format){
else if(liste->size == sizeof(int))
for(i=0;i<n;i++) fprintf(file, "%d ", *((int*)&liste->array[i*liste->size])) ;
else
- Msg(GERROR, "Unknown Type of Data to Write List to File");
+ Msg(GERROR, "Bad type of data to write list to file (size = %d)", liste->size);
fprintf(file, "\n");
break;
case LIST_FORMAT_BINARY :
fwrite(liste->array, liste->size, n, file);
break;
default :
- Msg(GERROR, "Unknown List Format");
+ Msg(GERROR, "Unknown list format");
}
}
diff --git a/DataStr/Malloc.cpp b/DataStr/Malloc.cpp
index 5e1a32a0e735f1714363f00c0e1967ecc8c717fd..888dd01ffc0b32e8418c001a38f15f86ef159bdb 100644
--- a/DataStr/Malloc.cpp
+++ b/DataStr/Malloc.cpp
@@ -1,4 +1,4 @@
-// $Id: Malloc.cpp,v 1.6 2001-01-08 08:05:40 geuzaine Exp $
+// $Id: Malloc.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $
#include <stdio.h>
#include <stdlib.h>
#include <malloc.h>
@@ -13,7 +13,7 @@ void *Malloc(size_t size)
if (!size) return(NULL);
ptr = malloc(size);
if (ptr == NULL)
- Msg(FATAL, "Out of Memory in Malloc");
+ Msg(FATAL, "Out of memory (buy some more RAM!)");
return(ptr);
}
@@ -24,7 +24,7 @@ void *Calloc(size_t num, size_t size)
if (!size) return(NULL);
ptr = calloc(num, size);
if (ptr == NULL)
- Msg(FATAL, "Out of Memory in Calloc");
+ Msg(FATAL, "Out of memory (buy some more RAM!)");
return(ptr);
}
@@ -33,7 +33,7 @@ void *Realloc(void *ptr, size_t size)
if (!size) return(NULL);
ptr = realloc(ptr,size);
if (ptr == NULL)
- Msg(FATAL, "Out of Memory in Realloc");
+ Msg(FATAL, "Out of memory (buy some more RAM!)");
return(ptr);
}
diff --git a/DataStr/Tree.cpp b/DataStr/Tree.cpp
index ad2c5ebc7b7dd23d838a5e321de333f90a3d6264..091c60207763f8422efb4ac89bfdd03f8eb74df3 100644
--- a/DataStr/Tree.cpp
+++ b/DataStr/Tree.cpp
@@ -1,4 +1,4 @@
-// $Id: Tree.cpp,v 1.6 2001-01-09 19:40:56 remacle Exp $
+// $Id: Tree.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $
#include <stdlib.h>
#include <string.h>
@@ -31,7 +31,7 @@ void Tree_Add(Tree_T *tree, void *data)
void *ptr;
if(!tree)
- Msg(GERROR, "Impossible to Add in Unallocated Tree");
+ Msg(GERROR, "Impossible to add in unallocated tree");
else{
ptr = Malloc(tree->size);
memcpy(ptr,data,tree->size);
@@ -44,7 +44,7 @@ void * Tree_AddP(Tree_T *tree, void *data)
void *ptr;
if(!tree)
- Msg(FATAL, "Impossible to Add in Unallocated Tree");
+ Msg(FATAL, "Impossible to add in unallocated tree");
ptr = Malloc(tree->size);
memcpy(ptr,data,tree->size);
avl_insert(tree->root, ptr, ptr);
@@ -69,7 +69,7 @@ int Tree_Replace(Tree_T *tree, void *data)
int state;
if(!tree) {
- Msg(GERROR, "Impossible to Replace in Unallocated Tree");
+ Msg(GERROR, "Impossible to replace in unallocated tree");
return(0);
}
state = avl_lookup(tree->root, data, &ptr);
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 858cd96fe0beb419d4a8e17f7f9a270508578d70..5016616f1917993c8c09e531030b61c42038c0d5 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.41 2001-03-18 10:40:54 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.42 2001-04-08 20:36:49 geuzaine Exp $
#include <map>
#include "Gmsh.h"
@@ -619,9 +619,9 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS){
n=0;
while(1){
- if(n == 0) Msg(STATUS3N,"Select Center ('q'=quit)");
- if(n == 1) Msg(STATUS3N,"Select Starting Point ('q'=quit)");
- if(n == 2) Msg(STATUS3N,"Select Ending Point ('q'=quit)");
+ if(n == 0) Msg(STATUS3N,"Select center Point ('q'=quit)");
+ if(n == 1) Msg(STATUS3N,"Select start Point ('q'=quit)");
+ if(n == 2) Msg(STATUS3N,"Select end Point ('q'=quit)");
ib = SelectEntity(ENT_POINT, &v,&c,&s);
if(ib == 1) { /* left mouse butt */
p[n++] = v->Num;
@@ -655,10 +655,10 @@ void geometry_elementary_add_new_ellipsis_cb(CALLBACK_ARGS){
n=0;
while(1){
- if(n == 0) Msg(STATUS3N,"Select Center ('q'=quit)");
- if(n == 1) Msg(STATUS3N,"Select an Axis Point ('q'=quit)");
- if(n == 2) Msg(STATUS3N,"Select Starting Point ('q'=quit)");
- if(n == 3) Msg(STATUS3N,"Select Ending Point ('q'=quit)");
+ if(n == 0) Msg(STATUS3N,"Select center Point ('q'=quit)");
+ if(n == 1) Msg(STATUS3N,"Select axis Point ('q'=quit)");
+ if(n == 2) Msg(STATUS3N,"Select start Point ('q'=quit)");
+ if(n == 3) Msg(STATUS3N,"Select end Point ('q'=quit)");
ib = SelectEntity(ENT_POINT, &v,&c,&s);
if(ib == 1) { /* left mouse butt */
p[n++] = v->Num;
@@ -709,7 +709,7 @@ static void _new_surface_volume(int mode){
List_Reset(Liste2);
while(1) {
- Msg(STATUS3N,"Select Boundary ('q'=quit)");
+ Msg(STATUS3N,"Select boundary ('q'=quit)");
ib = SelectEntity(type, &v,&c,&s);
if(ib <= 0){
ZeroHighlight(&M);
@@ -724,7 +724,7 @@ static void _new_surface_volume(int mode){
List_Reset(Liste1);
List_Add(Liste2,&zone);
while(1){
- Msg(STATUS3N,"Select Holes ('q'=quit)");
+ Msg(STATUS3N,"Select holes ('q'=quit)");
ib = SelectEntity(type, &v,&c,&s);
if(ib <= 0){
ZeroHighlight(&M);
@@ -1024,8 +1024,8 @@ static void _add_physical(char *what){
}
}
else{
- Msg(GERROR, "Interactive Volume Selection not done: "
- "Please edit the input file manually");
+ Msg(GERROR, "Interactive volume selection not done "
+ "(you will have to edit the input file manually)");
if(!opt_geometry_volumes(0,GMSH_GET,0)){
opt_geometry_volumes(0,GMSH_SET|GMSH_GUI,1);
Draw();
@@ -1240,13 +1240,13 @@ static void _add_transfinite(int dim){
if(n == 3+1 || n == 4+1)
add_trsfsurf(n,p,CTX.filename);
else
- Msg(STATUS2, "Wrong Number of Points for Transfinite Surface");
+ Msg(STATUS2, "Wrong number of points for Transfinite Surface");
break;
case 3 :
if(n == 6 || n == 8)
add_trsfvol(n,p,CTX.filename);
else
- Msg(STATUS2, "Wrong Number of Points for Transfinite Volume");
+ Msg(STATUS2, "Wrong number of points for Transfinite Volume");
break;
}
n=0;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 3b46d6c728249ec9def635bd2ea5dedc68e207bf..d0b618fe0b5ec24cbeed4a37842d49d35015e2ee 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.59 2001-03-18 10:40:54 geuzaine Exp $
+// $Id: GUI.cpp,v 1.60 2001-04-08 20:36:49 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
@@ -683,7 +683,7 @@ void GUI::set_context(Context_Item *menu_asked, int flag){
else if(menu[0].label[0] == '1') m_module_butt->value(1);
else if(menu[0].label[0] == '2') m_module_butt->value(2);
else {
- Msg(WARNING, "Something Wrong in your Dynamic Context Definition");
+ Msg(WARNING, "Something is wrong in your dynamic context definition");
return;
}
@@ -755,7 +755,7 @@ void GUI::create_graphic_window(int argc, char **argv){
g_opengl_window = new Opengl_Window(0,0,width,glheight);
if(!opt_general_double_buffer(0,GMSH_GET,0)){
- Msg(INFO, "Setting Opengl visual to single buffered");
+ Msg(INFO, "Setting OpenGL visual to single buffered");
g_opengl_window->mode(FL_RGB | FL_DEPTH | FL_SINGLE);
}
g_opengl_window->end();
@@ -1666,7 +1666,7 @@ void GUI::save_message(char *filename){
FILE *fp;
if(!(fp = fopen(filename,"w"))) {
- Msg(WARNING, "Unable to Open File '%s'", filename);
+ Msg(WARNING, "Unable to open file '%s'", filename);
return;
}
for(int i = 1 ; i<=msg_browser->size() ; i++){
@@ -1675,7 +1675,7 @@ void GUI::save_message(char *filename){
else fprintf(fp, "%s\n", c);
}
- Msg(INFO, "Log Creation Complete '%s'", filename);
+ Msg(INFO, "Log creation complete '%s'", filename);
Msg(STATUS2, "Wrote '%s'", filename);
fclose(fp);
}
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index 887330ed407c426599f40d69658e367a3f56eddf..5b59f28d6c9e130ff5238747732f76696383c212 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.21 2001-04-06 12:29:32 geuzaine Exp $
+// $Id: Main.cpp,v 1.22 2001-04-08 20:36:49 geuzaine Exp $
#include <signal.h>
@@ -83,7 +83,7 @@ int main(int argc, char *argv[]){
if(List_Nbr(Post_ViewList))
BGMWithView((Post_View*)List_Pointer(Post_ViewList, List_Nbr(Post_ViewList)-1));
else
- Msg(GERROR, "Invalid Background Mesh (no View)");
+ Msg(GERROR, "Invalid background mesh (no view)");
}
if(CTX.batch > 0){
mai3d(THEM, CTX.batch);
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]){
if(List_Nbr(Post_ViewList))
BGMWithView((Post_View*)List_Pointer(Post_ViewList, List_Nbr(Post_ViewList)-1));
else
- Msg(GERROR, "Invalid Background Mesh (no View)");
+ Msg(GERROR, "Invalid background mesh (no view)");
}
// Draw the actual scene
diff --git a/Fltk/Message.cpp b/Fltk/Message.cpp
index 0bb7686aef3cae3de36b3ae65e90c6256816a258..34a11a7af838e00fcfad2b44f8af1a540ff9fe15 100644
--- a/Fltk/Message.cpp
+++ b/Fltk/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.17 2001-04-08 12:49:31 geuzaine Exp $
+// $Id: Message.cpp,v 1.18 2001-04-08 20:36:49 geuzaine Exp $
#include <signal.h>
#if !defined(WIN32) || defined(__CYGWIN__)
@@ -23,21 +23,21 @@ void Signal (int sig_num){
switch (sig_num){
case SIGSEGV :
- Msg(FATAL1, "Segmentation Violation (Invalid Memory Reference)");
+ Msg(FATAL1, "Segmentation violation (invalid memory reference)");
Msg(FATAL2, "------------------------------------------------------");
Msg(FATAL2, "You have discovered a bug in Gmsh! You may report it");
Msg(FATAL2, "by e-mail (together with any helpful data permitting to");
Msg(FATAL3, "reproduce it) to <gmsh@geuz.org>");
break;
case SIGFPE :
- Msg(FATAL, "Floating Point Exception (Division by Zero?)");
+ Msg(FATAL, "Floating point exception (division by zero?)");
break;
case SIGINT :
- Msg(INFO, "Interrupt (Generated from Terminal Special Character)");
+ Msg(INFO, "Interrupt (generated from terminal special character)");
Exit(1);
break;
default :
- Msg(FATAL, "Unknown Signal");
+ Msg(FATAL, "Unknown signal");
break;
}
}
diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index c17f47a6f945342d242a47a851a02b363365fc95..9928aff81946ee5e98dcda9954227a6be97dc33d 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.18 2001-04-07 07:20:22 geuzaine Exp $
+// $Id: CAD.cpp,v 1.19 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -1534,7 +1534,7 @@ void CopyShape(int Type, int Num, int *New){
*New = news->Num;
break;
default:
- Msg(GERROR, "Impossible to Copy the Entity %d (of Type %d)", Num, Type);
+ Msg(GERROR, "Impossible to copy entity %d (of type %d)", Num, Type);
break;
}
}
@@ -1610,7 +1610,7 @@ void DeleteShape(int Type, int Num){
DeleteSurf(Num);
break;
default:
- Msg(GERROR, "Impossible to Delete the Entity %d (of Type %d)", Num, Type);
+ Msg(GERROR, "Impossible to delete entity %d (of type %d)", Num, Type);
break;
}
}
diff --git a/Geo/DataBase.cpp b/Geo/DataBase.cpp
index 78ffb2379cc89d3174a36a0fde87e0eb6b52a3af..dcf429573a5198f92306cf5200c92c9f66a75616 100644
--- a/Geo/DataBase.cpp
+++ b/Geo/DataBase.cpp
@@ -1,4 +1,4 @@
-// $Id: DataBase.cpp,v 1.11 2001-04-08 12:49:31 geuzaine Exp $
+// $Id: DataBase.cpp,v 1.12 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -122,7 +122,7 @@ void AddQuadricSurfaceInDataBase (int Typ, int NumQuadric, double zaxis[3],
for(i=0;i<NbLoop;i++){
List_Read(loops,i,&iLoop);
if(!(el = FindEdgeLoop(iLoop,THEM))){
- Msg(GERROR, "Unknown Loop %d", iLoop);
+ Msg(GERROR, "Unknown Line Loop %d", iLoop);
List_Delete(s->s.Generatrices);
Free(s);
return;
@@ -290,7 +290,7 @@ void Cdbz101(int izon, int typzon,int o1, int o2, int nbu, int nbv,
}
List_Reset(templist);
- int j = 0;
+ int j = 0, k = 0;
c0 = c1 = *(Curve**)List_Pointer(curves, 0);
List_Add(templist, &c1->Num);
List_PSuppress(curves, 0);
@@ -303,7 +303,8 @@ void Cdbz101(int izon, int typzon,int o1, int o2, int nbu, int nbv,
c1 = c2 ;
if(c2->end == c0->beg){
if(List_Nbr(curves)){
- Msg(INFO, "Starting new sub loop in Line Loop %d: are you sure about this?", izon);
+ Msg(INFO, "Starting subloop %d in Line Loop %d (are you sure about this?)",
+ ++k, izon);
c0 = c1 = *(Curve**)List_Pointer(curves, 0);
List_Add(templist, &c1->Num);
List_PSuppress(curves, 0);
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index a7bde5ebb67bb80d4edf41c75fb11db1e72b989d..6671aed984cd5013dc9c6a7baff3f141c96271b4 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -1,4 +1,4 @@
-// $Id: Geo.cpp,v 1.18 2001-02-17 22:08:55 geuzaine Exp $
+// $Id: Geo.cpp,v 1.19 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -37,7 +37,7 @@ double evaluate_scalarfunction (char *var, double val, char *funct){
tempf = yyin;
if(!(yyin = fopen(CTX.tmp_filename,"w"))){
- Msg(GERROR, "Unable to Open Temporary File");
+ Msg(GERROR, "Unable to open temporary file '%s'", CTX.tmp_filename);
return 0.;
}
@@ -67,11 +67,11 @@ void add_infile(char *text, char *fich){
FILE *file;
if(!(yyin = fopen(CTX.tmp_filename,"w"))){
- Msg(GERROR, "Unable to Open Temporary File");
+ Msg(GERROR, "Unable to open temporary file '%s'", CTX.tmp_filename);
return;
}
if(!(file = fopen(fich,"a"))){
- Msg(GERROR, "Unable to Open File '%s'", fich);
+ Msg(GERROR, "Unable to open file '%s'", fich);
return;
}
fprintf(yyin,"%s\n",text);
diff --git a/Geo/Print_Geo.cpp b/Geo/Print_Geo.cpp
index c9fab281d07216e9bdaf596bead5f8f9a17a2263..0368f01c30780cce7d5064fbca3f4a3a7dc2e4e0 100644
--- a/Geo/Print_Geo.cpp
+++ b/Geo/Print_Geo.cpp
@@ -1,4 +1,4 @@
-// $Id: Print_Geo.cpp,v 1.14 2001-02-17 22:08:55 geuzaine Exp $
+// $Id: Print_Geo.cpp,v 1.15 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -67,7 +67,7 @@ void Print_Curve(void *a, void *b){
fprintf(FOUT,"CatmullRom (%d) = ",c->Num);
break;
default:
- Msg(GERROR, "Unknown Curve Type %d", c->Typ);
+ Msg(GERROR, "Unknown Curve type %d", c->Typ);
return;
}
@@ -225,7 +225,7 @@ void Print_Geo(Mesh *M, char *filename){
if(filename){
FOUT = fopen(filename,"w");
if(!FOUT){
- Msg(WARNING, "Unable to Open File '%s'", filename);
+ Msg(WARNING, "Unable to open file '%s'", filename);
return;
}
}
@@ -239,7 +239,7 @@ void Print_Geo(Mesh *M, char *filename){
List_Action(M->PhysicalGroups,Print_PhysicalGroups);
if(filename){
- Msg(INFO, "Geo Output Complete '%s'", filename);
+ Msg(INFO, "Geo output complete '%s'", filename);
Msg(STATUS2, "Wrote '%s'", filename);
fclose(FOUT);
}
diff --git a/Graphics/CreateFile.cpp b/Graphics/CreateFile.cpp
index 26aefea29b437b9539710170356a2acf40d0bd3d..4a0efade287f4c4006e95d1777dfb8f1583f139e 100644
--- a/Graphics/CreateFile.cpp
+++ b/Graphics/CreateFile.cpp
@@ -1,4 +1,4 @@
-// $Id: CreateFile.cpp,v 1.16 2001-02-17 22:08:56 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.17 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -51,7 +51,7 @@ void CreateOutputFile (char *name, int format) {
case FORMAT_AUTO :
if(strlen(name) < 4)
- Msg(GERROR, "Unknown Extension for Automatic Format Detection");
+ Msg(GERROR, "Unknown extension for automatic format detection");
else{
strcpy(ext,name+(strlen(name)-4));
if(!strcmp(ext,".geo")) CreateOutputFile(name, FORMAT_GEO);
@@ -65,14 +65,14 @@ void CreateOutputFile (char *name, int format) {
else if(!strcmp(ext,".yuv")) CreateOutputFile(name, FORMAT_YUV);
else {
if(strlen(name) < 5)
- Msg(GERROR, "Unknown Extension in \"%s\" for Automatic Format Detection",
+ Msg(GERROR, "Unknown extension in \"%s\" for automatic format detection",
name);
else{
strcpy(ext,name+(strlen(name)-5));
if(!strcmp(ext,".jpeg")) CreateOutputFile(name, FORMAT_JPEG);
else if(!strcmp(ext,".gref")) CreateOutputFile(name, FORMAT_GREF);
else if(!strcmp(ext,".Gref")) CreateOutputFile(name, FORMAT_GREF);
- else Msg(GERROR, "Unknown Extension in \"%s\" for Automatic Format Detection",
+ else Msg(GERROR, "Unknown extension in \"%s\" for automatic format detection",
name);
}
}
@@ -98,11 +98,11 @@ void CreateOutputFile (char *name, int format) {
#ifdef _XMOTIF
case FORMAT_XPM :
if(!(fp = fopen(name,"wb"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
Window_Dump(XCTX.display, XCTX.scrnum, XtWindow(WID.G.glw), fp);
- Msg(INFO, "XPM Creation Complete '%s'", name);
+ Msg(INFO, "XPM creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
@@ -110,21 +110,21 @@ void CreateOutputFile (char *name, int format) {
case FORMAT_JPEG :
if(!(fp = fopen(name,"wb"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
FillBuffer();
create_jpeg(fp, CTX.viewport[2]-CTX.viewport[0],
CTX.viewport[3]-CTX.viewport[1],
CTX.print.jpeg_quality);
- Msg(INFO, "JPEG Creation Complete '%s'", name);
+ Msg(INFO, "JPEG creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
case FORMAT_GIF :
if(!(fp = fopen(name,"wb"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
FillBuffer();
@@ -137,33 +137,33 @@ void CreateOutputFile (char *name, int format) {
UNPACK_RED(CTX.color.bg),
UNPACK_GREEN(CTX.color.bg),
UNPACK_BLUE(CTX.color.bg));
- Msg(INFO, "GIF Creation Complete '%s'", name);
+ Msg(INFO, "GIF creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
case FORMAT_PPM :
if(!(fp = fopen(name,"wb"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
FillBuffer();
create_ppm(fp, CTX.viewport[2]-CTX.viewport[0],
CTX.viewport[3]-CTX.viewport[1]);
- Msg(INFO, "PPM Creation Complete '%s'", name);
+ Msg(INFO, "PPM creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
case FORMAT_YUV :
if(!(fp = fopen(name,"wb"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
FillBuffer();
create_yuv(fp, CTX.viewport[2]-CTX.viewport[0],
CTX.viewport[3]-CTX.viewport[1]);
- Msg(INFO, "YUV Creation Complete '%s'", name);
+ Msg(INFO, "YUV creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
@@ -175,11 +175,11 @@ void CreateOutputFile (char *name, int format) {
#ifdef _XMOTIF
case 0 : // Bitmap EPS
if(!(fp = fopen(name,"w"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
if(!(tmp = fopen(tmpFileName,"w"))){
- Msg(WARNING, "Unable to Open File '%s'", tmpFileName);
+ Msg(WARNING, "Unable to open file '%s'", tmpFileName);
return;
}
Window_Dump(XCTX.display, XCTX.scrnum, XtWindow(WID.G.glw), tmp);
@@ -188,7 +188,7 @@ void CreateOutputFile (char *name, int format) {
Msg(INFO, "Executing '%s'", cmd);
system(cmd);
unlink(tmpFileName);
- Msg(INFO, "Bitmap EPS Creation Complete '%s'", name);
+ Msg(INFO, "Bitmap EPS creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
@@ -196,7 +196,7 @@ void CreateOutputFile (char *name, int format) {
default : // Vector EPS
if(!(fp = fopen(name,"w"))) {
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
CTX.print.gl_fonts = 0;
@@ -213,7 +213,7 @@ void CreateOutputFile (char *name, int format) {
CTX.stream = TO_SCREEN ;
res = gl2psEndPage();
}
- Msg(INFO, "EPS Creation Complete '%s'", name);
+ Msg(INFO, "EPS creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
CTX.print.gl_fonts = 1;
@@ -223,7 +223,7 @@ void CreateOutputFile (char *name, int format) {
break ;
default :
- Msg(WARNING, "Unknown Print Format");
+ Msg(WARNING, "Unknown print format");
break;
}
diff --git a/Graphics/Entity.cpp b/Graphics/Entity.cpp
index 682f8fe751263b28345c661b584577df576cdc5d..101ce39cd8e33e30a94b2c9f2ba7d67d786aade6 100644
--- a/Graphics/Entity.cpp
+++ b/Graphics/Entity.cpp
@@ -1,4 +1,4 @@
-// $Id: Entity.cpp,v 1.7 2001-01-29 22:33:41 remacle Exp $
+// $Id: Entity.cpp,v 1.8 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -378,7 +378,7 @@ void Draw_Vector (int Type, int Fill,
break ;
default :
- Msg(GERROR, "Unknown Type of Vector to Draw");
+ Msg(GERROR, "Unknown type of vector to draw");
break;
}
diff --git a/Graphics/gl2gif.cpp b/Graphics/gl2gif.cpp
index d1587a30c0f3f1cb29521f84989ca217f8b22599..58f86effb87f5d6466fbe7b24c58eea9ed5d0b5d 100644
--- a/Graphics/gl2gif.cpp
+++ b/Graphics/gl2gif.cpp
@@ -1,4 +1,4 @@
-// $Id: gl2gif.cpp,v 1.10 2001-02-09 14:51:31 geuzaine Exp $
+// $Id: gl2gif.cpp,v 1.11 2001-04-08 20:36:49 geuzaine Exp $
/*
* gl2gif: an OpenGL to GIF printing library
@@ -1160,7 +1160,7 @@ void create_gif(FILE *outfile, int width, int height,
if ( chv == (colorhist_vector) 0 ){
- Msg(DEBUG, "GIF: Too many colors in image");
+ Msg(DEBUG, "GIF: too many colors in image");
rows = height ;
cols = width ;
diff --git a/Makefile b/Makefile
index 0c33ed78ef514b5302d09c5a4b64f9c41dcb83a2..83f4c70fc751db13e6ee16aa8c9455b349f9b7de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-# $Id: Makefile,v 1.86 2001-04-08 12:49:31 geuzaine Exp $
+# $Id: Makefile,v 1.87 2001-04-08 20:36:49 geuzaine Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
- GMSH_RELEASE = 1.16
+ GMSH_RELEASE = 1.17
MAKE = make
CC = c++
diff --git a/Mesh/1D_Mesh.cpp b/Mesh/1D_Mesh.cpp
index f021d218b4cab8b2a76a79f69355f061b2dfe327..a2d82334c595993af1fd8d61d8df763fa80e64bf 100644
--- a/Mesh/1D_Mesh.cpp
+++ b/Mesh/1D_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 1D_Mesh.cpp,v 1.11 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 1D_Mesh.cpp,v 1.12 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -69,7 +69,7 @@ double F_Transfini (double t){
break ;
default:
- Msg(WARNING, "Unknown Case in Transfinite Mesh Line");
+ Msg(WARNING, "Unknown case in Transfinite Line mesh");
val = 1. ;
}
}
diff --git a/Mesh/2D_BGMesh.cpp b/Mesh/2D_BGMesh.cpp
index 446300dd97320b8303b2abb8d43a64088fa59d74..1460e04ff75b0eab74b5a500e00134519da200f3 100644
--- a/Mesh/2D_BGMesh.cpp
+++ b/Mesh/2D_BGMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_BGMesh.cpp,v 1.6 2001-01-09 19:40:56 remacle Exp $
+// $Id: 2D_BGMesh.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -20,7 +20,7 @@ double find_quality (MPoint center, DocRecord * BGMESH){
double Exp = 2., r, deno, nume;
if ((del = Find_Triangle (center, BGMESH, BOF)) == NULL){
- Msg(GERROR, "Exterior Point (%g,%g)", center.v, center.h);
+ Msg(GERROR, "Exterior point (%g,%g)", center.v, center.h);
return 1.e-15;
}
@@ -52,7 +52,7 @@ double find_quality (MPoint center, DocRecord * BGMESH){
v = ((X[2] - X[0]) * (Yp - Y[0]) - (Y[2] - Y[0]) * (Xp - X[0])) / det;
}
else{
- Msg(WARNING, "Degenerated Triangle (det=%g)", det);
+ Msg(WARNING, "Degenerated triangle (det=%g)", det);
u = v = 0.0;
}
diff --git a/Mesh/2D_Bowyer.cpp b/Mesh/2D_Bowyer.cpp
index c9a6b8bd77bdd53546e23dac863bb2dda3d080fb..c781205ae4d433b5ede1af4323a0425f948449cc 100644
--- a/Mesh/2D_Bowyer.cpp
+++ b/Mesh/2D_Bowyer.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Bowyer.cpp,v 1.6 2001-01-09 19:40:56 remacle Exp $
+// $Id: 2D_Bowyer.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $
/*
@@ -88,7 +88,7 @@ int PE_Del_Triangle (Delaunay *del , MPoint pt, DListPeek *ListEdges ,
rslt &= DListInsert(ListEdges,pt,b);
rslt &= DListInsert(ListEdges,pt,c);
if(!rslt)
- Msg(GERROR, "List Insert Failed in Boyer Watson");
+ Msg(GERROR, "List insert failed in Boyer Watson");
}
else {
@@ -148,21 +148,21 @@ int PE_Del_Triangle (Delaunay *del , MPoint pt, DListPeek *ListEdges ,
else if (de1->v.voisin2 == del )de1->v.voisin2 = NULL;
else if (de1->v.voisin3 == del )de1->v.voisin3 = NULL;
else
- Msg(GERROR, "Bad Link in Boyer Watson");
+ Msg(GERROR, "Bad link in Boyer Watson");
}
if(de2 != NULL){
if (de2->v.voisin1 == del )de2->v.voisin1 = NULL;
else if (de2->v.voisin2 == del )de2->v.voisin2 = NULL;
else if (de2->v.voisin3 == del )de2->v.voisin3 = NULL;
else
- Msg(GERROR, "Bad Link in Boyer Watson");
+ Msg(GERROR, "Bad link in Boyer Watson");
}
if(de3 != NULL){
if (de3->v.voisin1 == del )de3->v.voisin1 = NULL;
else if (de3->v.voisin2 == del )de3->v.voisin2 = NULL;
else if (de3->v.voisin3 == del )de3->v.voisin3 = NULL;
else
- Msg(GERROR, "Bad Link in Boyer Watson");
+ Msg(GERROR, "Bad link in Boyer Watson");
}
del->v.voisin1 = NULL ;
diff --git a/Mesh/2D_DivAndConq.cpp b/Mesh/2D_DivAndConq.cpp
index 9727e6a5f3e15968e90bf4eb7b5d41d8cc19987d..1f002b8ff1010193356165f157ed3599acbadfe5 100644
--- a/Mesh/2D_DivAndConq.cpp
+++ b/Mesh/2D_DivAndConq.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_DivAndConq.cpp,v 1.9 2001-01-09 19:40:56 remacle Exp $
+// $Id: 2D_DivAndConq.cpp,v 1.10 2001-04-08 20:36:49 geuzaine Exp $
/*
@@ -162,7 +162,7 @@ int Qtest(PointNumero h,PointNumero i,PointNumero j,PointNumero k){
double xc,yc,rcarre,distca;
if ((h == i) && (h == j) && (h == k)){
- Msg(GERROR, "3 Points Identical in Qtest");
+ Msg(GERROR, "3 identical points in Qtest");
return(0); /* returning 1 will cause looping for ever */
}
if (CircumCircle( (double) pPointArray[h].where.h,
@@ -342,7 +342,7 @@ int CircumCircle(double x1,double y1,double x2,double y2,double x3,double y3,
d = 2. * (double)(y1*(x2-x3)+y2*(x3-x1)+y3*(x1-x2));
if (d == 0.0){
- Msg(WARNING, "Colinear Points in CircumCircle");
+ Msg(WARNING, "Colinear points in circum circle computation");
*xc = *yc = -99999.;
return(0);
}
@@ -354,7 +354,7 @@ int CircumCircle(double x1,double y1,double x2,double y2,double x3,double y3,
*yc = (double) ((a1*(x2-x3) + a2*(x3-x1) + a3*(x1-x2)) / d);
if(fabs(d) < 1.e-12 * DSQR(LC2D))
- Msg(WARNING, "Points Almost Colinear in CircumCircle (d = %g)", d);
+ Msg(WARNING, "Almost colinear points in circum circle computation (d = %g)", d);
return(1);
}
diff --git a/Mesh/2D_InitMesh.cpp b/Mesh/2D_InitMesh.cpp
index b4f5ff8ed519ba71a1d8ec0a1a1fa8dd67352d12..34091d2c68fa58042b8cc81d5287efdad16e8404 100644
--- a/Mesh/2D_InitMesh.cpp
+++ b/Mesh/2D_InitMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_InitMesh.cpp,v 1.6 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 2D_InitMesh.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $
/*
@@ -234,7 +234,7 @@ void SwapED ( void *data , void *dummy){
void SuppressInETree( void *data , void *dummy){
if(!Tree_Suppress(ETree,data))
- Msg(WARNING, "Cannot Suppress in ETree");
+ Msg(WARNING, "Cannot suppress in ETree");
}
void AddInETree( void *data , void *dummy){
@@ -349,7 +349,7 @@ void verify_edges (List_T *ListDelaunay, ContourRecord **ListContour,
if(!ok){
return;
}
- Msg(INFO, "Swapping (%d Missing Edge(s))", ok);
+ Msg(INFO, "Swapping (%d missing edges)", ok);
EDToSwap = NULL;
if(EDToSwap)Tree_Delete(EDToSwap);
@@ -374,7 +374,7 @@ void verify_edges (List_T *ListDelaunay, ContourRecord **ListContour,
}
}
- Msg(INFO, "Elimination (%d Swaps)", Tree_Nbr(EDToSwap));
+ Msg(INFO, "Elimination (%d swaps)", Tree_Nbr(EDToSwap));
Tree_Action (EDToSwap , SuppressInETree);
Tree_Action (EDToSwap , SwapED);
diff --git a/Mesh/2D_Links.cpp b/Mesh/2D_Links.cpp
index 165b72e02ef8aeee93ffd76fca626bfe930ac08a..ad8f06a28571f60398e269347eb7fa6224286918 100644
--- a/Mesh/2D_Links.cpp
+++ b/Mesh/2D_Links.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Links.cpp,v 1.6 2001-01-09 19:40:56 remacle Exp $
+// $Id: 2D_Links.cpp,v 1.7 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -197,7 +197,7 @@ int CreateLinks(List_T * ListDelaunay , int NumDelaunay,
else if (del_Pi->v.voisin3 == NULL)
del_Pi->v.voisin3 = del_Pj;
else
- Msg(GERROR, "Bad Link in CreateLinks");
+ Msg(GERROR, "Bad link for triangle");
if (del_Pj->v.voisin1 == NULL)
del_Pj->v.voisin1 = del_Pi;
@@ -206,7 +206,7 @@ int CreateLinks(List_T * ListDelaunay , int NumDelaunay,
else if (del_Pj->v.voisin3 == NULL)
del_Pj->v.voisin3 = del_Pi;
else
- Msg(GERROR, "Bad Link in CreateLinks");
+ Msg(GERROR, "Bad link for triangle");
}
i+=2;
}
diff --git a/Mesh/2D_Mesh.cpp b/Mesh/2D_Mesh.cpp
index b00bc669dc9f57daf74bef850b3327f33172c6dd..c2a1b1c1d4bd3900e9d5f95e7f5efab31c374e14 100644
--- a/Mesh/2D_Mesh.cpp
+++ b/Mesh/2D_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Mesh.cpp,v 1.19 2001-02-17 22:08:58 geuzaine Exp $
+// $Id: 2D_Mesh.cpp,v 1.20 2001-04-08 20:36:49 geuzaine Exp $
/*
Maillage Delaunay d'une surface (Point insertion Technique)
@@ -146,7 +146,7 @@ void Plan_Moyen (void *data, void *dum){
s->d = X;
res[0] = 1.;
res[1] = res[2] = 0.0;
- Msg(DEBUG, "Mean Plane of Type 'x = c'");
+ Msg(DEBUG, "Mean plane of type 'x = c'");
}
/* y = Y */
@@ -155,7 +155,7 @@ void Plan_Moyen (void *data, void *dum){
s->d = Y;
res[1] = 1.;
res[0] = res[2] = 0.0;
- Msg(DEBUG, "Mean Plane of Type 'y = c'");
+ Msg(DEBUG, "Mean plane of type 'y = c'");
}
/* z = Z */
@@ -164,7 +164,7 @@ void Plan_Moyen (void *data, void *dum){
s->d = Z;
res[2] = 1.;
res[1] = res[0] = 0.0;
- Msg(DEBUG, "Mean Plane of Type 'y = c'");
+ Msg(DEBUG, "Mean plane of type 'y = c'");
}
/* by + cz = -x */
@@ -181,7 +181,7 @@ void Plan_Moyen (void *data, void *dum){
res[0] = 1.;
res[1] = r2[0];
res[2] = r2[1];
- Msg(DEBUG, "Mean Plane of Type 'by + cz = -x'");
+ Msg(DEBUG, "Mean plane of type 'by + cz = -x'");
}
/* ax + cz = -y */
@@ -198,7 +198,7 @@ void Plan_Moyen (void *data, void *dum){
res[0] = r2[0];
res[1] = 1.;
res[2] = r2[1];
- Msg(DEBUG, "Mean Plane of Type 'ax + cz = -y'");
+ Msg(DEBUG, "Mean plane of type 'ax + cz = -y'");
}
/* ax + by = -z */
@@ -215,10 +215,10 @@ void Plan_Moyen (void *data, void *dum){
res[0] = r2[0];
res[1] = r2[1];
res[2] = 1.;
- Msg(DEBUG, "Mean Plane of Type 'ax + by = -z'");
+ Msg(DEBUG, "Mean plane of type 'ax + by = -z'");
}
else{
- Msg(GERROR, "Problem in Mean Plane");
+ Msg(GERROR, "Problem in mean plane computation");
}
}
}
@@ -260,7 +260,7 @@ void Plan_Moyen (void *data, void *dum){
for (i = 0; i < 3; i++)
s->plan[2][i] = res[i];
- Msg(DEBUG1, "Plan : (%g x + %g y + %g z = %g)", s->a, s->b, s->c, s->d);
+ Msg(DEBUG1, "Plane : (%g x + %g y + %g z = %g)", s->a, s->b, s->c, s->d);
Msg(DEBUG2, "Normal : (%g , %g , %g )", res[0], res[1], res[2]);
Msg(DEBUG2, "t1 : (%g , %g , %g )", t1[0], t1[1], t1[2]);
Msg(DEBUG3, "t2 : (%g , %g , %g )", t2[0], t2[1], t2[2]);
@@ -466,7 +466,7 @@ int mesh_domain (ContourPeek * ListContours, int numcontours,
mai->numpoints = 0;
if (!numcontours){
- Msg(GERROR, "No Contour");
+ Msg(GERROR, "No contour");
return 0;
}
@@ -530,7 +530,7 @@ int mesh_domain (ContourPeek * ListContours, int numcontours,
if (doc->numTriangles == 1){
doc->delaunay[0].t.position = INTERN;
- Msg(INFO, "Only 1 triangle in initial mesh: skipping refinement");
+ Msg(INFO, "Only one triangle in initial mesh (skipping refinement)");
onlyinit = 1;
}
@@ -586,7 +586,7 @@ int mesh_domain (ContourPeek * ListContours, int numcontours,
list = NULL;
if (!PE_Del_Triangle (del, pt, &list, kill_L, del_L, &numlink, &numkil)){
- Msg(WARNING, "Triangle Non Deleted");
+ Msg(WARNING, "Triangle non deleted");
Delete_Triangle (root, del);
Delete_Triangle (root_w, del);
del->t.quality_value /= 10.;
@@ -645,7 +645,7 @@ int mesh_domain (ContourPeek * ListContours, int numcontours,
}
if ((volume_old - volume_new) / (volume_old + volume_new) > 1.e-6){
- Msg(WARNING, "Volume has Changed (%g->%g)", volume_old, volume_new);
+ Msg(WARNING, "Volume has changed (%g->%g)", volume_old, volume_new);
Delete_Triangle (root, del);
Delete_Triangle (root_w, del);
del->t.quality_value /= 10.;
@@ -922,7 +922,7 @@ void Maillage_Automatique_VieuxCode (Surface * pS, Mesh * m, int ori){
}
else{
err = 1;
- Msg(GERROR, "Unknown Vertex %d", ver[j]->Num);
+ Msg(GERROR, "Unknown vertex %d", ver[j]->Num);
}
}
if (ori && !err)
@@ -1091,7 +1091,7 @@ void Maillage_Surface (void *data, void *dum){
AlgorithmeMaillage2DAnisotropeModeJF (s);
if(CTX.mesh.nb_smoothing){
- Msg(STATUS3, "Mesh Smoothing");
+ Msg(STATUS3, "Mesh smoothing");
tnxe = Tree_Create (sizeof (NXE), compareNXE);
create_NXE (s->Vertices, s->Simplexes, tnxe);
for (int i = 0; i < CTX.mesh.nb_smoothing; i++)
diff --git a/Mesh/2D_Mesh_Aniso.cpp b/Mesh/2D_Mesh_Aniso.cpp
index bc64f08e97d3453a99dd3f08a59f41734c17e992..d38a9634ef6e75180e7fd888c2428ea6882e229d 100644
--- a/Mesh/2D_Mesh_Aniso.cpp
+++ b/Mesh/2D_Mesh_Aniso.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Mesh_Aniso.cpp,v 1.13 2001-02-23 00:07:51 remacle Exp $
+// $Id: 2D_Mesh_Aniso.cpp,v 1.14 2001-04-08 20:36:49 geuzaine Exp $
/*
Jean-Francois Remacle
@@ -301,11 +301,11 @@ void Recover_Edge (Surface * s, Edge * e, EdgesContainer & Edges){
coquille = List_Create (3, 3, sizeof (Edge *));
/*On cherche la coquille */
Tree_Action (Edges.AllEdges, putaindecoquille_2D);
- Msg(INFO, "Edge %d->%d, %d Intersections",
+ Msg(INFO, "Edge %d->%d, %d intersections",
e->V[0]->Num, e->V[1]->Num, List_Nbr (coquille));
if(List_Nbr(coquille)==1){
- Msg(WARNING, "Unable to Swap Edge");
+ Msg(WARNING, "Unable to swap edge");
List_Delete (coquille);
return;
}
@@ -330,7 +330,7 @@ void Recover_Edge (Surface * s, Edge * e, EdgesContainer & Edges){
List_Delete (coquille);
- Msg(INFO, "Edge Recovered");
+ Msg(INFO, "Edge recovered");
/*On swappe */
}
@@ -366,7 +366,7 @@ void missing_edges_2d (Surface * s){
e.V[0] = v1;
e.V[1] = v2;
if (!EdgesOnSurface.Search (v1, v2)) {
- Msg(INFO, "Missing Edge %d->%d", v1->Num, v2->Num);
+ Msg(INFO, "Missing edge %d->%d", v1->Num, v2->Num);
Recover_Edge (s, &e, EdgesOnSurface);
}
}
@@ -467,7 +467,7 @@ void NewSimplexes_2D (Surface * s, List_T * Sim, List_T * news){
ZONEELIMINEE = S->iEnt;
else{
if (S->iEnt != ZONEELIMINEE){
- Msg(WARNING, "Huh! The Elimination Failed %d %d",
+ Msg(WARNING, "Huh! The elimination failed %d %d",
S->iEnt, ZONEELIMINEE);
}
}
@@ -624,7 +624,7 @@ bool Bowyer_Watson_2D (Surface * sur, Vertex * v, Simplex * S, int force){
List_Read (Simplexes_Destroyed, i, &s);
draw_simplex2d (sur, s, 0);
if (!Tree_Suppress (sur->Simplexes, &s)){
- Msg(WARNING, "Failed to Suppress Simplex %d", s->Num);
+ Msg(WARNING, "Failed to suppress simplex %d", s->Num);
}
Free (s);
}
@@ -652,7 +652,7 @@ void Convex_Hull_Mesh_2D (List_T * Points, Surface * s){
N = List_Nbr (Points);
- Msg(STATUS2, "Mesh 2D... (Initial)");
+ Msg(STATUS2, "Mesh 2D... (initial)");
Box_2_Triangles (Points, s);
for (i = 0; i < N; i++){
@@ -667,7 +667,7 @@ void Convex_Hull_Mesh_2D (List_T * Points, Surface * s){
}
*/
if (!THES){
- Msg(GERROR, "Vertex (%g,%g,%g) in no Simplex",
+ Msg(GERROR, "Vertex (%g,%g,%g) in no simplex",
THEV->Pos.X, THEV->Pos.Y, THEV->Pos.Z);
THEV->Pos.X += CTX.mesh.rand_factor * LC2D * rand()/RAND_MAX;
THEV->Pos.Y += CTX.mesh.rand_factor * LC2D * rand()/RAND_MAX;
@@ -838,7 +838,7 @@ void Restore_Surface (Surface * s){
iSurface = isListaSurface (ListCurves, s);
N = Tree_Nbr (keep);
- Msg(INFO, "Initial Mesh of Surface %d: %d Simplices, %d/%d Curves, %d Faces",
+ Msg(INFO, "Initial mesh of Surface %d: %d simplices, %d/%d curves, %d faces",
iSurface, N, List_Nbr (ListCurves), List_Nbr (ListAllCurves),
Tree_Nbr (FacesTree));
@@ -1033,7 +1033,7 @@ int AlgorithmeMaillage2DAnisotropeModeJF (Surface * s){
List_Delete (Suppress);
if(!Tree_Right (s->Simplexes, &simp))
- Msg(WARNING, "No Simplex Left");
+ Msg(WARNING, "No simplex left");
else{
i = 0;
while ( simp->Quality > CONV_VALUE){
@@ -1100,7 +1100,7 @@ int AlgorithmeMaillage2DAnisotropeModeJF (Surface * s){
List_Delete (List);
if(!Tree_Nbr(s->Simplexes))
- Msg(GERROR, "No Triangles in surface %d", s->Num);
+ Msg(GERROR, "No triangles in surface %d", s->Num);
/*
RandomSwapEdges2d(s);
diff --git a/Mesh/2D_Util.cpp b/Mesh/2D_Util.cpp
index aeade8cbf6d562eda4a8614847f4398bd1576f11..8ed7476e3acdfa09f824aff3974cd2e3ecdbdf56 100644
--- a/Mesh/2D_Util.cpp
+++ b/Mesh/2D_Util.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Util.cpp,v 1.8 2001-01-09 19:40:56 remacle Exp $
+// $Id: 2D_Util.cpp,v 1.9 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -231,7 +231,7 @@ MPoint Localize (Delaunay * del , DocRecord *MESH) {
b = del->t.b;
}
else{
- Msg(GERROR, "Voronoi Insert 1");
+ Msg(GERROR, "Voronoi insert 1");
}
}
else if(v2 != NULL) {
@@ -248,7 +248,7 @@ MPoint Localize (Delaunay * del , DocRecord *MESH) {
b = del->t.c;
}
else {
- Msg(GERROR,"Voronoi Insert 2");
+ Msg(GERROR,"Voronoi insert 2");
}
}
else if(v3 != NULL) {
@@ -265,7 +265,7 @@ MPoint Localize (Delaunay * del , DocRecord *MESH) {
b = del->t.c;
}
else {
- Msg(GERROR, "Voronoi Insert 3");
+ Msg(GERROR, "Voronoi insert 3");
}
}
}
@@ -290,7 +290,7 @@ MPoint Localize (Delaunay * del , DocRecord *MESH) {
b = del->t.b;
}
else{
- Msg(GERROR,"Voronoi Insert");
+ Msg(GERROR,"Voronoi insert");
}
}
diff --git a/Mesh/3D_BGMesh.cpp b/Mesh/3D_BGMesh.cpp
index de84e5e40133b926c10a2e96eade299910ae29eb..d201d352e9b4d1c5a4d0d6370aeb6ad254acbad2 100644
--- a/Mesh/3D_BGMesh.cpp
+++ b/Mesh/3D_BGMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_BGMesh.cpp,v 1.15 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 3D_BGMesh.cpp,v 1.16 2001-04-08 20:36:49 geuzaine Exp $
#include "Gmsh.h"
#include "Mesh.h"
@@ -20,7 +20,7 @@ void ExportLcFieldOnVolume (Mesh * M){
FILE *f = fopen ("OutFile.pos", "w");
if(!f){
- Msg(GERROR, "Unable to Open File");
+ Msg(GERROR, "Unable to open file");
return;
}
@@ -46,7 +46,7 @@ void ExportLcFieldOnSurfaces (Mesh * M){
FILE *f = fopen ("OutFileS.pos", "w");
if(!f){
- Msg(GERROR, "Unable to Open File");
+ Msg(GERROR, "Unable to open file");
return;
}
@@ -225,7 +225,7 @@ int BGMWithView (Post_View * ErrView){
Tree_Action (m.Simplexes, AIG);
- Msg(INFO, "Background Mesh Loaded (%d Nodes, %d Elements)",
+ Msg(INFO, "Background mesh loaded (%d nodes, %d elements)",
Tree_Nbr(m.Vertices), Tree_Nbr(m.Simplexes));
return (1);
@@ -237,7 +237,7 @@ double ErrorInView (Post_View * ErrView, int *n){
int i, j=0, nb;
if(ErrView == NULL){
- Msg(WARNING, "Empty Error View");
+ Msg(WARNING, "Empty error view");
return 0.;
}
@@ -342,7 +342,7 @@ int CreateBGM (Post_View * ErrView, int OptiMethod, double Degree,
f = fopen (OutFile, "w");
if(!f){
- Msg(GERROR, "Unable to Open File '%s'", OutFile);
+ Msg(GERROR, "Unable to open file '%s'", OutFile);
return 0;
}
@@ -385,7 +385,7 @@ int CreateBGM (Post_View * ErrView, int OptiMethod, double Degree,
fprintf (f, "};\n");
fclose (f);
- Msg(INFO, "Background Mesh Wriiten in '%s'", OutFile);
+ Msg(INFO, "Background mesh written in '%s'", OutFile);
return 1;
diff --git a/Mesh/3D_Coherence.cpp b/Mesh/3D_Coherence.cpp
index 6102c11121148d2801d91211cfeb82302d008a3b..f8eac619c62ba47b5530f134768007ee1f35e82f 100644
--- a/Mesh/3D_Coherence.cpp
+++ b/Mesh/3D_Coherence.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Coherence.cpp,v 1.13 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 3D_Coherence.cpp,v 1.14 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -1159,14 +1159,14 @@ int Coherence (Volume * v, Mesh * m){
MissingFaces = Missing_Faces (v);
/* Edges Recovery */
- Msg(STATUS3, "Boundary Edges Recovery");
+ Msg(STATUS3, "Boundary edges recovery");
volume = 0;
Tree_Action (v->Simplexes, VSIM);
Msg(INFO, "Volume = %g", volume);
Msg(INFO1, "===================================================");
- Msg(INFO2, "(1) Number of Missing Edges = %d", List_Nbr (Missing));
+ Msg(INFO2, "Number of missing edges = %d", List_Nbr (Missing));
Msg(INFO3, "===================================================");
for (i = 0; i < List_Nbr (Missing); i++){
@@ -1197,17 +1197,17 @@ int Coherence (Volume * v, Mesh * m){
}
}
*/
- Msg(INFO, "Edge %d->%d => %d Division(s)",
+ Msg(INFO, "Edge %d->%d => %d division(s)",
pE1->V[0]->Num, pE1->V[1]->Num, List_Nbr(NewPoints));
if (!List_Nbr (NewPoints))
- Msg(GERROR, "Missing Edge Without Any Intersection (%g,%g,%g) (%g,%g,%g)",
+ Msg(GERROR, "Missing edge without any intersection (%g,%g,%g) (%g,%g,%g)",
pE1->V[0]->Pos.X, pE1->V[0]->Pos.Y, pE1->V[0]->Pos.Z,
pE1->V[1]->Pos.X, pE1->V[1]->Pos.Y, pE1->V[1]->Pos.Z);
}
- Msg(STATUS3, "Boundary Faces Recovery");
+ Msg(STATUS3, "Boundary faces recovery");
volume = 0;
Tree_Action (v->Simplexes, VSIM);
Msg(INFO, "Volume = %g", volume);
@@ -1215,7 +1215,7 @@ int Coherence (Volume * v, Mesh * m){
/* Missing Faces */
Msg(INFO1, "===================================================");
- Msg(INFO2, "(1) Number of Missing Faces = %d", List_Nbr (MissingFaces));
+ Msg(INFO2, "Number of missing faces = %d", List_Nbr (MissingFaces));
Msg(INFO3, "===================================================");
for (i = 0; i < List_Nbr (MissingS); i++){
@@ -1280,7 +1280,7 @@ int Coherence (Volume * v, Mesh * m){
if (1 || List_Nbr (ListFaces) == 2 * (Np - 1) - Nh){
- Msg(INFO, "Recoverable Face (%d <--> %d=2*(%d-1)-%d)",
+ 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++){
@@ -1302,7 +1302,7 @@ int Coherence (Volume * v, Mesh * m){
}
}
else{
- Msg(GERROR, "*Unrecoverable* Face (%d <--> %d=2*(%d-1)-%d)",
+ Msg(GERROR, "*Unrecoverable* face (%d <--> %d=2*(%d-1)-%d)",
List_Nbr (ListFaces), 2 * (Np - 1) - Nh, Np, Nh);
for (k = 0; k < List_Nbr (ListFaces); k++){
List_Read (ListFaces, k, &Face);
@@ -1314,7 +1314,7 @@ int Coherence (Volume * v, Mesh * m){
volume = 0;
Tree_Action (v->Simplexes, VSIM);
- Msg(INFO, "Volume after Edge/Face Recovering = %g", volume);
+ Msg(INFO, "Volume after edge/face recovery = %g", volume);
/* Missing Edges */
create_Edges (v);
@@ -1324,18 +1324,18 @@ int Coherence (Volume * v, Mesh * m){
create_Faces (v);
MissingFaces = Missing_Faces (v);
- Msg(INFO, "Final Check : Missing %d Edges, %d Faces",
+ Msg(INFO, "Final check: %d missing edges, %d missing faces",
List_Nbr(MissingEdges), List_Nbr(MissingFaces));
Impression_Resultats ();
if (List_Nbr (MissingFaces) || List_Nbr (MissingEdges)){
- Msg(GERROR, "Could not Restore all Edges/Faces");
+ Msg(GERROR, "Could not restore all edges/faces");
return 0;
}
Link_Simplexes (NULL, v->Simplexes);
- Msg(STATUS3, "Volume Recovery");
+ Msg(STATUS3, "Volume recovery");
Restore_Volume (v);
return 1;
@@ -1523,7 +1523,7 @@ void Restore_Volume (Volume * v){
}
N = Tree_Nbr (keep);
- Msg(INFO, "Initial Mesh of Volume %d: %d Simplices", iVolume, N);
+ Msg(INFO, "Initial mesh of volume %d: %d simplices", iVolume, N);
Tree_Action (keep, attribueVolume);
Tree_Delete (keep);
List_Reset (ListSurfaces);
diff --git a/Mesh/3D_Divide.cpp b/Mesh/3D_Divide.cpp
index 99788963356d8c3c5211dc5ac344eaf2c15585fb..0b893eeeb3b88410a57851f387a88b45479e84ab 100644
--- a/Mesh/3D_Divide.cpp
+++ b/Mesh/3D_Divide.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Divide.cpp,v 1.10 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 3D_Divide.cpp,v 1.11 2001-04-08 20:36:50 geuzaine Exp $
/* Routine de division des elements tetraedriques
ou triangulaires
@@ -57,7 +57,7 @@ void Remise_A_Zero (void){
void Impression_Resultats (void){
Msg(INFO1, "===================================================");
- Msg(INFO2, "Surface Coherence Results (Number of Intersections)");
+ Msg(INFO2, "Surface coherence results (number of intersections)");
Msg(INFO2, "%d EV, %d EE, %d FV, %d FF, %d FE, %d EEE, %d EEEE",
EV, EE, FV, FF, FE, EEE, EEEE);
Msg(INFO3, "===================================================");
@@ -73,7 +73,7 @@ void cut_prism (Vertex * v1, Vertex * v2, Vertex * v3,
Simplex *news;
Vertex *e1;
- Msg(INFO, "Prism Cut");
+ Msg(INFO, "Prism cut");
/* test des meilleures aretes a creer */
/*
@@ -213,7 +213,7 @@ void cut_prism (Vertex * v1, Vertex * v2, Vertex * v3,
else if (are_exists (v6, v1) &&
are_exists (v5, v3) &&
are_exists (v4, v2)) {
- Msg(INFO, "Found Steiner Prism 1!");
+ Msg(INFO, "Found steiner prism 1!");
e1 = Create_Vertex
(++CurrentNodeNumber,
@@ -246,7 +246,7 @@ void cut_prism (Vertex * v1, Vertex * v2, Vertex * v3,
else if (are_exists (v4, v3) &&
are_exists (v6, v2) &&
are_exists (v5, v1)){
- Msg(INFO, "Found Steiner Prism 2!");
+ Msg(INFO, "Found steiner prism 2!");
e1 = Create_Vertex
(++CurrentNodeNumber,
@@ -277,7 +277,7 @@ void cut_prism (Vertex * v1, Vertex * v2, Vertex * v3,
}
else{
- Msg(GERROR, "Uncoherent Prism");
+ Msg(GERROR, "Uncoherent prism");
}
}
@@ -455,7 +455,7 @@ void cut_tetraedre (Intersection * pI, Tree_T * AddedTet, Tree_T * TetDel,
v7 = pI->s->V[3];
}
else{
- Msg(GERROR, "Three Edges Cut Without Common Point!");
+ Msg(GERROR, "Three edges cut without common point!");
return;
}
@@ -720,14 +720,14 @@ void cut_tetraedre (Intersection * pI, Tree_T * AddedTet, Tree_T * TetDel,
v8 = pI->VE[3];
}
else{
- Msg(GERROR, "Incoherent 4 Edges Intersection");
+ Msg(GERROR, "Incoherent 4 edges intersection");
return;
}
cut_prism (v8, v4, v6, v7, v3, v5, newpoints, AddedTet);
cut_prism (v2, v8, v7, v1, v6, v5, newpoints, AddedTet);
}
else{
- Msg(GERROR, "Error On Cut %d %d %d", pI->NbVertex, pI->NbEdge, pI->NbFace);
+ Msg(GERROR, "Error on cut %d %d %d", pI->NbVertex, pI->NbEdge, pI->NbFace);
}
}
diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp
index 9cb38afc57de5b137501c72d696a205acb605d0d..6c9a7d3424e9ecc7b95d9bbbb7765b3f29e57633 100644
--- a/Mesh/3D_Mesh.cpp
+++ b/Mesh/3D_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Mesh.cpp,v 1.15 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 3D_Mesh.cpp,v 1.16 2001-04-08 20:36:50 geuzaine Exp $
/*
@@ -417,7 +417,7 @@ void NewSimplexes (Mesh * m, List_T * Sim, List_T * news){
ZONEELIMINEE = S->iEnt;
else {
if (S->iEnt != ZONEELIMINEE){
- Msg(WARNING, "Huh! The Elimination Failed %d %d",
+ Msg(WARNING, "Huh! The elimination failed %d %d",
S->iEnt, ZONEELIMINEE);
}
}
@@ -457,7 +457,7 @@ int recur_bowyer (Simplex * s){
}
else{
if (s->iEnt != s->S[i]->iEnt){
- //Msg(WARNING, "Point Scabreux %d", s->S[i]->Num);
+ //Msg(WARNING, "Point scabreux %d", s->S[i]->Num);
Alerte_Point_Scabreux = 1;
}
Tree_Insert (Sim_Sur_Le_Bord, &s->S[i]);
@@ -551,7 +551,7 @@ bool Bowyer_Watson (Mesh * m, Vertex * v, Simplex * S, int force){
for (i = 0; i < List_Nbr (Simplexes_Destroyed); i++){
List_Read (Simplexes_Destroyed, i, &s);
if (!Tree_Suppress (m->Simplexes, &s))
- Msg(GERROR, "Impossible to Delete Simplex");
+ Msg(GERROR, "Impossible to delete simplex");
Free (s);
}
@@ -578,7 +578,7 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
N = List_Nbr (Points);
n = IMAX (N / 20, 1);
- Msg(STATUS2, "Mesh 3D... (Initial)");
+ Msg(STATUS2, "Mesh 3D... (initial)");
Box_6_Tetraedron (Points, m);
// List_Sort (Points, comparePosition);
@@ -606,7 +606,7 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
Msg(STATUS1, "Vol=%g",volume);
}
if (!THES){
- Msg(WARNING, "Vertex (%g,%g,%g) in no Simplex",
+ Msg(WARNING, "Vertex (%g,%g,%g) in no simplex",
THEV->Pos.X,THEV->Pos.Y,THEV->Pos.Z);
THEV->Pos.X += 10 * CTX.mesh.rand_factor * LC3D * (double)rand()/(double)RAND_MAX;
THEV->Pos.Y += 10 * CTX.mesh.rand_factor * LC3D * (double)rand()/(double)RAND_MAX;
@@ -616,7 +616,7 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
bool ca_marche = Bowyer_Watson (m, THEV, THES, 1);
int count = 0;
while(!ca_marche){
- //Msg(INFO, "Unable to Add Point %d (%g,%g,%g)",
+ //Msg(INFO, "Unable to add point %d (%g,%g,%g)",
// THEV->Num, THEV->Pos.X,THEV->Pos.Y,THEV->Pos.Z );
count ++;
double dx = rand_sign() * 1000 * CTX.mesh.rand_factor * LC3D *
@@ -637,7 +637,7 @@ void Convex_Hull_Mesh (List_T * Points, Mesh * m){
if(count > 5){
N++;
List_Add(POINTS,&THEV);
- Msg(WARNING, "Unable to Add Point %d (Will do it Later)",
+ Msg(WARNING, "Unable to add point %d (will do it later)",
THEV->Num);
break;
}
@@ -790,7 +790,7 @@ void Maillage_Volume (void *data, void *dum){
Bgm_With_Points (THEM, LOCAL);
POINTS_TREE = THEM->Simplexes;
- Msg(STATUS2, "Mesh 3D... (Final)");
+ Msg(STATUS2, "Mesh 3D... (final)");
Tree_Right (LOCAL->Simplexes, &simp);
i = 0;
@@ -842,23 +842,23 @@ void Maillage_Volume (void *data, void *dum){
if (CTX.mesh.quality){
extern void SwapEdges3D (Mesh * M, Volume * v, double GammaPrescribed, bool order);
- Msg(STATUS3, "Swapping Edges (1st pass)");
+ Msg(STATUS3, "Swapping edges (1st pass)");
SwapEdges3D (THEM, v, CTX.mesh.quality, true);
- Msg(STATUS3, "Swapping Edges (2nd pass)");
+ Msg(STATUS3, "Swapping edges (2nd pass)");
SwapEdges3D (THEM, v, CTX.mesh.quality, false);
- Msg(STATUS3, "Swapping Edges (last pass)");
+ Msg(STATUS3, "Swapping edges (last pass)");
SwapEdges3D (THEM, v, CTX.mesh.quality, true);
}
if (CTX.mesh.nb_smoothing){
/*
- Msg(STATUS3, "Laplacian Smoothing");
+ Msg(STATUS3, "Laplacian smoothing");
tnxe = Tree_Create (sizeof (NXE), compareNXE);
create_NXE (v->Vertices, v->Simplexes, tnxe);
for (int i = 0; i < CTX.mesh.nb_smoothing; i++)
Tree_Action (tnxe, ActionLiss);
Tree_Delete (tnxe);
- Msg(STATUS3, "Swapping Edges (last pass)");
+ Msg(STATUS3, "Swapping edges (last pass)");
SwapEdges3D (THEM, v, 0.5, true);
*/
}
diff --git a/Mesh/3D_SMesh.cpp b/Mesh/3D_SMesh.cpp
index b55ec060657e69869581b38182addd2b5a4f11b3..bec4a0e7941267c14640c65f197c7f334bcd9a98 100644
--- a/Mesh/3D_SMesh.cpp
+++ b/Mesh/3D_SMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_SMesh.cpp,v 1.7 2001-01-11 22:27:55 geuzaine Exp $
+// $Id: 3D_SMesh.cpp,v 1.8 2001-04-08 20:36:50 geuzaine Exp $
/*
Maillage transfini volumique
@@ -143,7 +143,7 @@ int MeshTransfiniteVolume (Volume *vol) {
V.Num = vol->ipar[i];
pV = &V;
if((vexist = (Vertex**)Tree_PQuery(THEM->Vertices,&pV)) == NULL) {
- Msg(WARNING, "Unknown Control Point %d in Transfinite Volume %d",
+ Msg(WARNING, "Unknown control point %d in Transfinite Volume %d",
V.Num,vol->Num);
return(0);
}
@@ -177,7 +177,7 @@ int MeshTransfiniteVolume (Volume *vol) {
V.Num = GG[i]->ipar[j];
pV = &V;
if((vexist = (Vertex**)Tree_PQuery(THEM->Vertices,&pV)) == NULL) {
- Msg(WARNING, "Unknown Control Point %d in Transfinite Surface %d",
+ Msg(WARNING, "Unknown control point %d in Transfinite Surface %d",
V.Num,GG[i]->Num);
return(0);
}
@@ -211,13 +211,13 @@ int MeshTransfiniteVolume (Volume *vol) {
}
if(nbs == 6 && NbFacesFound != 6) {
- Msg(WARNING, "Wrong Definition of Hexahedric Transfinite Volume %d",
+ Msg(WARNING, "Wrong definition of hexahedric Transfinite Volume %d",
vol->Num);
return(0);
}
if(nbs == 5 && NbFacesFound != 5) {
- Msg(WARNING1, "Wrong Definition of Prismatic Transfinite Volume %d", vol->Num);
+ Msg(WARNING1, "Wrong definition of prismatic Transfinite Volume %d", vol->Num);
Msg(WARNING2, "Possibly because the first and fourth points are not the");
Msg(WARNING3, "degenerated ones");
return(0);
@@ -226,7 +226,7 @@ int MeshTransfiniteVolume (Volume *vol) {
if(nbs == 6){
for(i=0;i<6;i++){
if(G[i] == NULL) {
- Msg(WARNING, "Wrong Definition of Hexahedric Transfinite Volume %d",
+ Msg(WARNING, "Wrong definition of hexahedric Transfinite Volume %d",
vol->Num);
return(0);
}
@@ -236,7 +236,7 @@ int MeshTransfiniteVolume (Volume *vol) {
for(i=0;i<6;i++){
if(i != 3) {
if(G[i] == NULL) {
- Msg(WARNING1, "Wrong Definition of Prismatic Transfinite Volume %d", vol->Num);
+ Msg(WARNING1, "Wrong definition of prismatic Transfinite Volume %d", vol->Num);
Msg(WARNING2, "Possibly because the first and fourth points are not the");
Msg(WARNING3, "degenerated ones");
return(0);
@@ -410,7 +410,7 @@ int MeshTransfiniteVolume (Volume *vol) {
nbtet += 6;
}
else{
- Msg(WARNING, "Wrong Surface Recombining in Transfinite Volume %d",
+ Msg(WARNING, "Wrong surface recombining in Transfinite Volume %d",
vol->Num);
return(0);
}
@@ -462,7 +462,7 @@ int MeshTransfiniteVolume (Volume *vol) {
nbtet += 2;
}
else{
- Msg(WARNING, "Wrong Surface Recombining in Transfinite Volume %d",
+ Msg(WARNING, "Wrong surface recombining in Transfinite Volume %d",
vol->Num);
return(0);
}
@@ -496,7 +496,7 @@ int MeshTransfiniteVolume (Volume *vol) {
nbtet += 6;
}
else{
- Msg(WARNING, "Wrong Surface Recombining in Transfinite Volume %d",
+ Msg(WARNING, "Wrong surface recombining in Transfinite Volume %d",
vol->Num);
return(0);
}
diff --git a/Mesh/Create.cpp b/Mesh/Create.cpp
index 345e1256e76965d031aa3b988c07ea5dd638606a..a3c4be4bb9c7bca9918b514142a04fb2fb53200f 100644
--- a/Mesh/Create.cpp
+++ b/Mesh/Create.cpp
@@ -1,4 +1,4 @@
-// $Id: Create.cpp,v 1.11 2001-04-07 07:20:22 geuzaine Exp $
+// $Id: Create.cpp,v 1.12 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -474,7 +474,7 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
if ((v = FindPoint (iPnt, THEM)))
List_Add (pC->Control_Points, &v);
else
- Msg(GERROR, "Unknown Control Point %d in Curve %d", iPnt, pC->Num);
+ Msg(GERROR, "Unknown control point %d in Curve %d", iPnt, pC->Num);
}
}
else {
@@ -490,19 +490,19 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
else {
if ((v = FindPoint (p1, THEM))){
pC->beg = v;
- Msg(INFO, "Curve %d First Control Point %d ", pC->Num, v->Num);
+ Msg(INFO, "Curve %d first control point %d ", pC->Num, v->Num);
}
else{
List_Read (pC->Control_Points, 0, &pC->beg);
- Msg(FATAL, "Unknown Control Point %d in Curve %d", p1, pC->Num);
+ Msg(FATAL, "Unknown control point %d in Curve %d", p1, pC->Num);
}
if ((v = FindPoint (p2, THEM))){
pC->end = v;
- Msg(INFO, "Curve %d First Control Point %d ", pC->Num, v->Num);
+ Msg(INFO, "Curve %d first control point %d ", pC->Num, v->Num);
}
else{
List_Read (pC->Control_Points, List_Nbr (pC->Control_Points) - 1, &pC->end);
- Msg(FATAL, "Unknown Control Point %d in Curve %d", p2, pC->Num);
+ Msg(FATAL, "Unknown control point %d in Curve %d", p2, pC->Num);
}
}
End_Curve (pC);
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index ad5647cd262f40d03f21626db669182079993d0e..340782d82a75883282b390cbc8e4718750244fc1 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.11 2001-03-14 12:04:25 geuzaine Exp $
+// $Id: Generator.cpp,v 1.12 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -25,7 +25,7 @@ void GetStatistics (double s[50]){
void ApplyLcFactor_Point(void *a, void *b){
Vertex *v = *(Vertex**)a;
if(v->lc <= 0.0){
- Msg(GERROR, "Wrong characteristic Length (%g <= 0) for Point %d (defaulting to 1.0)",
+ Msg(GERROR, "Wrong characteristic length (%g <= 0) for Point %d (defaulting to 1.0)",
v->lc, v->Num);
v->lc = 1.0 ;
}
@@ -81,7 +81,7 @@ void Maillage_Dimension_2 (Mesh * M){
}
List_Delete (Curves);
- Msg(DEBUG, "Shortest Curve has Length %g", shortest);
+ Msg(DEBUG, "Shortest curve has length %g", shortest);
Tree_Action (M->Surfaces, Maillage_Surface);
diff --git a/Mesh/Interpolation.cpp b/Mesh/Interpolation.cpp
index 14d6645bddae7458dacdce6e69f6fb5b98d11dc6..9f0d57585d0c4afeee961ddd7f6cf6405a96f794 100644
--- a/Mesh/Interpolation.cpp
+++ b/Mesh/Interpolation.cpp
@@ -1,4 +1,4 @@
-// $Id: Interpolation.cpp,v 1.7 2001-01-08 08:05:45 geuzaine Exp $
+// $Id: Interpolation.cpp,v 1.8 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -234,7 +234,7 @@ Vertex InterpolateCurve (Curve * Curve, double u, int derivee){
return V;
default :
- Msg(FATAL, "Unknown Curve Type in Interpolation");
+ Msg(FATAL, "Unknown curve type in interpolation");
return V;
}
@@ -337,7 +337,7 @@ Vertex InterpolateSurface (Surface * s, double u, double v,
}
}
else{
- Msg(WARNING, "Arbitrary InterpolateSurface for Derivative not Done");
+ Msg(WARNING, "Arbitrary InterpolateSurface for derivative not done");
/*
double epsc = eps * cos (t);
double epss = eps * sin (t);
@@ -461,7 +461,7 @@ Vertex InterpolateSurface (Surface * s, double u, double v,
return (T);
default :
- Msg(FATAL, "Unknown Surface Type in Interpolation");
+ Msg(FATAL, "Unknown surface type in interpolation");
return T;
}
diff --git a/Mesh/Numeric.cpp b/Mesh/Numeric.cpp
index e5f21226bdbbcf847030533826a74ffeb7e8a1b3..59a7a5b26f611d692db403728c88d685ce3a311a 100644
--- a/Mesh/Numeric.cpp
+++ b/Mesh/Numeric.cpp
@@ -1,4 +1,4 @@
-// $Id: Numeric.cpp,v 1.13 2001-01-08 08:05:46 geuzaine Exp $
+// $Id: Numeric.cpp,v 1.14 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -120,7 +120,7 @@ int sys3x3_with_tol (double mat[3][3], double b[3], double res[3], double *det){
out = sys3x3(mat,b,res,det);
if (fabs(*det) < 1.e-12){
- Msg(DEBUG, "Assuming 3x3 Matrix is Singular (Is this OK?)");
+ Msg(DEBUG, "Assuming 3x3 matrix is singular (is this OK?)");
res[0] = res[1] = res[2] = 0.0 ;
return (0);
}
@@ -238,9 +238,9 @@ void XYZtoUV (Surface *s, double X, double Y, double Z, double *U, double *V) {
*V = Vnew;
}
- if(iter == MaxIter) Msg(WARNING, "Could not Converge in XYZtoUV");
+ if(iter == MaxIter) Msg(WARNING, "Could not converge in XYZtoUV");
- if(iter > 10) Msg(WARNING, "Many (%d) Iterations in XYZtoUV", iter);
+ if(iter > 10) Msg(WARNING, "Many (%d) iterations in XYZtoUV", iter);
free_dmatrix(mat,1,3,1,3);
free_dmatrix(jac,1,3,1,3);
diff --git a/Mesh/Print_Mesh.cpp b/Mesh/Print_Mesh.cpp
index 7885a4a0f7aeb6b7c5b1a570c59331afcf7c4287..06873c6149964e1ceed7e6c96f31b5071228c216 100644
--- a/Mesh/Print_Mesh.cpp
+++ b/Mesh/Print_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Print_Mesh.cpp,v 1.17 2001-02-26 10:46:53 geuzaine Exp $
+// $Id: Print_Mesh.cpp,v 1.18 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -135,7 +135,7 @@ void add_msh_simplex (void *a, void *b){
(*S)->V[0] = (*S)->V[1];
(*S)->V[1] = temp;
// if ((*S)->Volume_Simplexe () < 0)
- Msg(WARNING, "Negative Volume for Simplex %d", (*S)->Num);
+ Msg(WARNING, "Negative volume for simplex %d", (*S)->Num);
}
}
#endif
@@ -304,7 +304,7 @@ void add_msh_elements (Mesh * M){
break;
default :
- Msg(GERROR, "Unknown Type of Physical Group");
+ Msg(GERROR, "Unknown type of Physical group");
break;
}
@@ -320,7 +320,7 @@ void process_msh_elements (Mesh * M){
fprintf (mshfile, "%d\n", MSH_ELEMENT_NUM - 1);
if (MSH_ELEMENT_NUM == 1)
- Msg (WARNING, "No Elements (Did You Forget to Define Physical Entities?)");
+ Msg (WARNING, "No elements (did You forget to define Physical entities?)");
MSH_ADD = 1;
MSH_ELEMENT_NUM = 1;
@@ -574,7 +574,7 @@ int process_3D_elements (FILE * funv, Mesh * m){
sx->V[0] = sx->V[1];
sx->V[1] = temp;
if (sx->Volume_Simplexe () < 0)
- Msg(WARNING, "Negative Volume for Simplex %d", sx->Num);
+ Msg(WARNING, "Negative volume for simplex %d", sx->Num);
}
geo = v->Num;
fprintf (funv, "%10d%10d%10d%10d%10d%10d\n",
@@ -1060,13 +1060,13 @@ void Print_Mesh (Mesh * M, char *c, int Type){
c ? strcpy (name, c) : strcat (name, ".msh");
mshfile = fopen (name, "w");
if (!mshfile){
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
- Msg(INFO, "Writing File '%s'", name);
+ Msg(INFO, "Writing file '%s'", name);
process_msh_nodes (M);
process_msh_elements (M);
- Msg(INFO, "Msh Ouput Complete '%s' (%d Nodes, %d Elements)",
+ Msg(INFO, "Msh ouput complete '%s' (%d Nodes, %d Elements)",
name, MSH_NODE_NUM, MSH_ELEMENT_NUM - 1);
Msg(STATUS2, "Wrote '%s'", name);
fclose (mshfile);
@@ -1075,10 +1075,10 @@ void Print_Mesh (Mesh * M, char *c, int Type){
c ? strcpy (name, c) : strcat (name, ".unv");
unvfile = fopen (name, "w");
if (!unvfile){
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
- Msg(INFO, "Writing File '%s'", name);
+ Msg(INFO, "Writing file '%s'", name);
process_nodes (unvfile, M);
fprintf (unvfile, "%6d\n", -1);
fprintf (unvfile, "%6d\n", ELEMENTS);
@@ -1089,7 +1089,7 @@ void Print_Mesh (Mesh * M, char *c, int Type){
fprintf (unvfile, "%6d\n", -1);
PrintGroups (M);
fclose (unvfile);
- Msg(INFO, "Unv Ouput Complete '%s'", name);
+ Msg(INFO, "Unv ouput complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
}
else if (Type == FORMAT_GREF){
@@ -1098,10 +1098,10 @@ void Print_Mesh (Mesh * M, char *c, int Type){
Tree_T *TRE = Tree_Create (sizeof (Vertex *), compareFrozen);
Greffile = fopen (name, "w");
if (!Greffile){
- Msg(WARNING, "Unable to Open File '%s'", name);
+ Msg(WARNING, "Unable to open file '%s'", name);
return;
}
- Msg(INFO, "Writing File '%s'", name);
+ Msg(INFO, "Writing file '%s'", name);
process_Gref_nodes (Greffile, M, TRN, TRE);
process_Gref_elements (Greffile, M, Tree_Nbr (TRN));
process_Gref_poundarybonditions (Greffile, M, TRN, TRE);
@@ -1109,7 +1109,7 @@ void Print_Mesh (Mesh * M, char *c, int Type){
Tree_Delete (TRN);
Tree_Delete (TRE);
EndConsecutiveNodes (M);
- Msg(INFO, "Gref Ouput Complete '%s'", name);
+ Msg(INFO, "Gref ouput complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
}
}
diff --git a/Mesh/Read_Mesh.cpp b/Mesh/Read_Mesh.cpp
index fa9d577419f4f3ac6815f340f2d875c01de88d9c..091107b9eb8210a08118c0454248d24ac8101f7e 100644
--- a/Mesh/Read_Mesh.cpp
+++ b/Mesh/Read_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Read_Mesh.cpp,v 1.9 2001-02-23 00:07:51 remacle Exp $
+// $Id: Read_Mesh.cpp,v 1.10 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -133,7 +133,7 @@ void Read_Mesh_MSH (Mesh *M, FILE *File_GEO){
for(i=0 ; i<Nbr_Nodes ; i++) {
vertsp[i] = &verts[i];
if(!(vertspp = (Vertex**)Tree_PQuery(M->Vertices, &vertsp[i])))
- Msg(GERROR, "Unknown Vertex %d in Element %d", verts[i].Num, Num);
+ Msg(GERROR, "Unknown vertex %d in element %d", verts[i].Num, Num);
else
vertsp[i] = *vertspp;
}
@@ -184,7 +184,7 @@ void Read_Mesh_MSH (Mesh *M, FILE *File_GEO){
case PNT:
break;
default :
- Msg(WARNING, "Unknown Type of Element in Read_Mesh");
+ Msg(WARNING, "Unknown type of element in Read_Mesh");
break;
}
}
@@ -194,7 +194,7 @@ void Read_Mesh_MSH (Mesh *M, FILE *File_GEO){
do {
fgets(String, 256, File_GEO) ;
- if (feof(File_GEO)) Msg(GERROR, "Prematured End of Mesh File");
+ if (feof(File_GEO)) Msg(GERROR, "Prematured end of mesh file");
} while (String[0] != '$') ;
}
@@ -224,7 +224,7 @@ void Read_Mesh (Mesh *M, FILE *File_GEO, int type){
switch(type){
case FORMAT_MSH : Read_Mesh_MSH(M,File_GEO); break;
case FORMAT_SMS : Read_Mesh_SMS(M,File_GEO); break;
- default : Msg(WARNING, "Unkown Mesh File Format to Read"); break;
+ default : Msg(WARNING, "Unkown mesh file format to read"); break;
}
}
diff --git a/Mesh/Simplex.cpp b/Mesh/Simplex.cpp
index 989774b9da27fce8c4d89c4f588f9a805d2023da..b5654d71d99c58304e496a4cf84164cf25031aa0 100644
--- a/Mesh/Simplex.cpp
+++ b/Mesh/Simplex.cpp
@@ -1,4 +1,4 @@
-// $Id: Simplex.cpp,v 1.10 2001-01-08 08:05:46 geuzaine Exp $
+// $Id: Simplex.cpp,v 1.11 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -49,7 +49,7 @@ int Simplex:: CircumCircle (double x1, double y1,
d = 2. * (double) (y1 * (x2 - x3) + y2 * (x3 - x1) + y3 * (x1 - x2));
if (d == 0.0){
*xc = *yc = -99999.;
- Msg(WARNING, "Deganarated Simplex");
+ Msg(WARNING, "Degenerated simplex");
return 0;
}
@@ -162,7 +162,7 @@ void Simplex::center_tet (double X[4], double Y[4], double Z[4], double res[3]){
mat[2][2] = Z[3] - Z[2];
if (!sys3x3 (mat, b, res, &dum)){
- Msg(WARNING, "Coplanar Points in Circum Sphere");
+ Msg(WARNING, "Coplanar points in circum sphere computation");
Msg(WARNING, "(%g,%g,%g) (%g,%g,%g) (%g,%g,%g) (%g,%g,%g)",
X[0],Y[0],Z[0], X[1],Y[1],Z[1], X[2],Y[2],Z[2], X[3],Y[3],Z[3] );
res[0] = res[1] = res[2] = 10.0e10;
diff --git a/Mesh/SwapEdge.cpp b/Mesh/SwapEdge.cpp
index 42e012d043875e0e7ae2a6812892c6d8b96b5d80..24095611ec98f0fa2270448e8a15f8fe4d442e32 100644
--- a/Mesh/SwapEdge.cpp
+++ b/Mesh/SwapEdge.cpp
@@ -1,4 +1,4 @@
-// $Id: SwapEdge.cpp,v 1.5 2001-01-08 08:05:46 geuzaine Exp $
+// $Id: SwapEdge.cpp,v 1.6 2001-04-08 20:36:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -157,7 +157,7 @@ bool FindBestPattern (int N, Vertex * Contour[100], Vertex * Ed[2],
worst_tet_new = DMIN (worst_tet_new, s->GammaShapeMeasure ());
}
if (fabs (new_volume - old_volume) > 1.e-5 * fabs (new_volume + old_volume))
- Msg(WARNING, "Edge Swapping Failed");
+ Msg(WARNING, "Edge swapping failed");
if (fabs (new_volume - old_volume) > 1.e-5 * fabs (new_volume + old_volume)
|| worst_tet_new < worst_tet_old){
for (k = 0; k < 2 * sp->GetNbTriangles (); k++){
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index aca86280ca9d6ead91dc9523db33ef75ee23b929..ecbdceed6ff6eef78404ec56f2e9db2afcbcde64 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -169,7 +169,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.82 2001-03-26 14:15:04 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.83 2001-04-08 20:36:50 geuzaine Exp $
#include <stdarg.h>
@@ -2985,7 +2985,7 @@ case 6:
case 7:
#line 168 "Gmsh.y"
{
- Msg(PARSER_INFO,"STL File Format");
+ Msg(PARSER_INFO,"STL file format");
STL_Surf = Create_Surface(1,MSH_SURF_STL,1);
STL_Surf->STL = new STL_Data;
return 1;
@@ -3003,7 +3003,7 @@ case 8:
case 9:
#line 189 "Gmsh.y"
{
- Msg(PARSER_INFO,"STL File Format Read");
+ Msg(PARSER_INFO,"STL file format read");
Tree_Add(THEM->Surfaces, &STL_Surf);
return 1;
;
@@ -3023,14 +3023,14 @@ case 14:
case 15:
#line 213 "Gmsh.y"
{
- Msg(PARSER_INFO,"Step Iso-10303-21 File Format");
+ Msg(PARSER_INFO,"Step Iso-10303-21 file format");
Create_Step_Solid_BRep();
;
break;}
case 16:
#line 218 "Gmsh.y"
{
- Msg(PARSER_INFO,"Step Iso-10303-21 File Format Read");
+ Msg(PARSER_INFO,"Step Iso-10303-21 file format read");
Resolve_BREP ();
;
break;}
@@ -3084,7 +3084,7 @@ case 28:
#line 269 "Gmsh.y"
{
/* La je dois voir la norme ! Face_Bound : trou externe a la surface ! */
- Msg(PARSER_INFO,"Found a Face Bound");
+ Msg(PARSER_INFO,"Found a face bound");
Add_Face_Outer_Bound((int)yyvsp[-10].d,yyvsp[-6].c,(int)yyvsp[-4].d,yyvsp[-2].i,0);
;
break;}
@@ -3144,7 +3144,7 @@ case 37:
case 38:
#line 313 "Gmsh.y"
{
- Msg(PARSER_INFO,"Found a Closed shell");
+ Msg(PARSER_INFO,"Found a closed shell");
Add_Closed_Shell((int)yyvsp[-8].d, yyvsp[-4].c , yyvsp[-2].l);
;
break;}
@@ -3231,7 +3231,7 @@ case 53:
case 54:
#line 379 "Gmsh.y"
{
- Msg(PARSER_INFO,"Gmsh File Format Read");
+ Msg(PARSER_INFO,"Gmsh file format read");
;
break;}
case 55:
@@ -4396,7 +4396,7 @@ case 196:
}
else if(!strcmp(yyvsp[-2].c, "System")){
- Msg(PARSER_INFO, "Executing System Call \"%s\"", yyvsp[-1].c);
+ Msg(PARSER_INFO, "Executing system call \"%s\"", yyvsp[-1].c);
system(yyvsp[-1].c);
}
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 6bc4736b91e71ab818f3b9595ddd587291f511fd..fca83100d966c9a556cff6c0948c337cfb6c3579 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,6 +1,6 @@
%{
-// $Id: Gmsh.y,v 1.72 2001-03-26 14:15:05 geuzaine Exp $
+// $Id: Gmsh.y,v 1.73 2001-04-08 20:36:50 geuzaine Exp $
#include <stdarg.h>
@@ -166,7 +166,7 @@ SignedDouble :
STLFormatItem :
tSolid
{
- Msg(PARSER_INFO,"STL File Format");
+ Msg(PARSER_INFO,"STL file format");
STL_Surf = Create_Surface(1,MSH_SURF_STL,1);
STL_Surf->STL = new STL_Data;
return 1;
@@ -187,7 +187,7 @@ STLFormatItem :
}
| tEndSolid
{
- Msg(PARSER_INFO,"STL File Format Read");
+ Msg(PARSER_INFO,"STL file format read");
Tree_Add(THEM->Surfaces, &STL_Surf);
return 1;
}
@@ -211,12 +211,12 @@ StepFormatItem :
StepSpecial :
tISO tEND
{
- Msg(PARSER_INFO,"Step Iso-10303-21 File Format");
+ Msg(PARSER_INFO,"Step Iso-10303-21 file format");
Create_Step_Solid_BRep();
}
| tENDISO tEND
{
- Msg(PARSER_INFO,"Step Iso-10303-21 File Format Read");
+ Msg(PARSER_INFO,"Step Iso-10303-21 file format read");
Resolve_BREP ();
}
| tDATA tEND
@@ -268,7 +268,7 @@ StepDataItem :
| tDOUBLE tAFFECT tFACE_BOUND '(' tBIGSTR ',' tDOUBLE ',' BoolExpr ')' tEND
{
/* La je dois voir la norme ! Face_Bound : trou externe a la surface ! */
- Msg(PARSER_INFO,"Found a Face Bound");
+ Msg(PARSER_INFO,"Found a face bound");
Add_Face_Outer_Bound((int)$1,$5,(int)$7,$9,0);
}
| tDOUBLE tAFFECT tORIENTED_EDGE '(' tBIGSTR ',' '*' ',' '*' ',' FExpr ','
@@ -311,7 +311,7 @@ StepDataItem :
}
| tDOUBLE tAFFECT tCLOSED_SHELL '(' tBIGSTR ',' ListOfDouble ')' tEND
{
- Msg(PARSER_INFO,"Found a Closed shell");
+ Msg(PARSER_INFO,"Found a closed shell");
Add_Closed_Shell((int)$1, $5 , $7);
}
| tDOUBLE tAFFECT tADVANCED_BREP_SHAPE_REPRESENTATION
@@ -377,7 +377,7 @@ GeomFormatList :
}
| GeomFormatList GeomFormat
{
- Msg(PARSER_INFO,"Gmsh File Format Read");
+ Msg(PARSER_INFO,"Gmsh file format read");
}
;
@@ -1479,7 +1479,7 @@ Command :
}
else if(!strcmp($1, "System")){
- Msg(PARSER_INFO, "Executing System Call \"%s\"", $2);
+ Msg(PARSER_INFO, "Executing system call \"%s\"", $2);
system($2);
}
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 96b539aeb98df50ab28de12a1e156fc4ff3c697e..ab0de752b40a553ef08008cc38eaed02b61ea86e 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.82 2001-03-26 14:15:05 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.83 2001-04-08 20:36:50 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -978,7 +978,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.82 2001-03-26 14:15:05 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.83 2001-04-08 20:36:50 geuzaine Exp $
#include <stdio.h>
#include <stdlib.h>
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index 8fac5a2006977a8a585900c4a488cce680da7b7b..6f9fa2c819d9e6d47208e5a1b25993cc7fd754e7 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -5,7 +5,7 @@
.\" Copyright (c) 2000-2001 J.-F. Remacle, C. Geuzaine
.\"
.\" ======================================================================
-.TH Gmsh 1 "15 February 2001" "Version 1.16" "Gmsh Manual Pages"
+.TH Gmsh 1 "15 February 2001" "Version 1.17" "Gmsh Manual Pages"
.UC 4
.\" ======================================================================
.SH NAME
@@ -215,7 +215,7 @@ Remacle (Remacle@scorec.rpi.edu).
.SH SEE ALSO
Gmsh homepage at \fIhttp://www.geuz.org/gmsh/\fR
.PP
-Gmsh example files in \fI/usr/doc/gmsh-1.16/\fR
+Gmsh example files in \fI/usr/doc/gmsh-1.17/\fR
.PP
GetDP (a scientific computation software for the numerical solution of
integro-differential equations, using finite element and integral type
diff --git a/utils/gmsh_fltk.spec b/utils/gmsh_fltk.spec
index 574d01b4aea66059e051ecb626412113ed027b19..e3c948eef38b4bb42fb16c45b9b7b344e1549eb0 100644
--- a/utils/gmsh_fltk.spec
+++ b/utils/gmsh_fltk.spec
@@ -1,7 +1,7 @@
Summary: A 3D mesh generator with pre- and post-processing facilities
Name: gmsh
-Version: 1.16
-Source: gmsh-1.16.tar.gz
+Version: 1.17
+Source: gmsh-1.17.tar.gz
Release: 1
Copyright: distributable
Group: Applications/Engineering