From 7ac6675459f0597fc32cbcd4d07948b598c8fd17 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 2 Jun 2001 16:24:51 +0000
Subject: [PATCH] typos
---
Geo/CAD.cpp | 68 ++++++++++++++++++++---------------------
Geo/DataBase.cpp | 20 ++++++------
Geo/Print_Geo.cpp | 6 ++--
Geo/Verif.cpp | 10 +++---
Geo/Visibility.cpp | 4 +--
Graphics/Geom.cpp | 18 +++++------
Mesh/2D_Cylindrical.cpp | 6 ++--
Mesh/2D_Elliptic.cpp | 6 ++--
Mesh/2D_Mesh.cpp | 10 +++---
Mesh/2D_Mesh_Aniso.cpp | 18 +++++------
Mesh/2D_Parametric.cpp | 8 ++---
Mesh/2D_SMesh.cpp | 6 ++--
Mesh/3D_Extrude.cpp | 6 ++--
Mesh/3D_SMesh.cpp | 4 +--
Mesh/Create.cpp | 15 +++++----
Mesh/Interpolation.cpp | 6 ++--
Mesh/Mesh.h | 6 +---
Mesh/Print_Mesh.cpp | 6 ++--
Mesh/SMS.cpp | 12 ++++----
examples/bug_ruled.geo | 3 ++
20 files changed, 118 insertions(+), 120 deletions(-)
diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index a7253116ea..87ffd4c76b 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.21 2001-05-22 07:11:14 geuzaine Exp $
+// $Id: CAD.cpp,v 1.22 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -550,8 +550,8 @@ void CopySurface (Surface *s, Surface *ss){
ss->a = s->a;ss->b = s->b;ss->c = s->c; ss->d = s->d;
for(i=0;i<3;i++)for(j=0;j<3;j++)ss->plan[i][j] = s->plan[i][j];
for(i=0;i<3;i++)for(j=0;j<3;j++)ss->invplan[i][j] = s->invplan[i][j];
- ss->s.Generatrices = List_Create(List_Nbr(s->s.Generatrices),1,sizeof(Curve*));
- List_Copy(s->s.Generatrices,ss->s.Generatrices);
+ ss->Generatrices = List_Create(List_Nbr(s->Generatrices),1,sizeof(Curve*));
+ List_Copy(s->Generatrices,ss->Generatrices);
if( s->Control_Points ){
ss->Control_Points = List_Create(List_Nbr(s->Control_Points),1,sizeof(Vertex*));
List_Copy(s->Control_Points,ss->Control_Points);
@@ -568,10 +568,10 @@ Surface *DuplicateSurface (Surface *s, int addthesurf){
ps = Create_Surface(addthesurf?MAXREG++:-MAXREG,0,0);
CopySurface(s,ps);
- for(i=0;i<List_Nbr(ps->s.Generatrices);i++){
- List_Read(ps->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(ps->Generatrices);i++){
+ List_Read(ps->Generatrices,i,&c);
newc = DuplicateCurve(c);
- List_Write(ps->s.Generatrices,i,&newc);
+ List_Write(ps->Generatrices,i,&newc);
}
for(i=0;i<List_Nbr(ps->Control_Points);i++){
@@ -806,11 +806,11 @@ void printCurve(Curve *c){
void printSurface(Surface*s){
Curve *c;
- int N = List_Nbr(s->s.Generatrices);
+ int N = List_Nbr(s->Generatrices);
Msg(DEBUG,"Surface %d, %d generatrices",s->Num,N);
for(int i=0;i<N;i++){
- List_Read(s->s.Generatrices,i,&c);
+ List_Read(s->Generatrices,i,&c);
printCurve(c);
}
}
@@ -821,8 +821,8 @@ void ApplyTransformationToSurface (double matrix[4][4],Surface *s){
Vertex *v;
int i;
- for(i=0;i<List_Nbr(s->s.Generatrices);i++){
- List_Read(s->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(s->Generatrices);i++){
+ List_Read(s->Generatrices,i,&c);
ApplyTransformationToCurve (matrix,c);
}
for(i=0;i<List_Nbr(s->Control_Points);i++){
@@ -994,7 +994,7 @@ Surface *Extrude_ProtudeCurve(int ep, int ic,
if(!CurveBeg && !CurveEnd) return NULL;
s = Create_Surface(MAXREG++,MSH_SURF_REGL,0);
- s->s.Generatrices = List_Create(4,1,sizeof(Curve*));
+ s->Generatrices = List_Create(4,1,sizeof(Curve*));
// je me souviens
s->Extrude = new ExtrudeParams;
@@ -1005,20 +1005,20 @@ Surface *Extrude_ProtudeCurve(int ep, int ic,
ReverseChapeau = FindCurve(-chapeau->Num,THEM);
if(!CurveBeg){
- List_Add(s->s.Generatrices,&pc);
- List_Add(s->s.Generatrices,&CurveEnd);
- List_Add(s->s.Generatrices,&ReverseChapeau);
+ List_Add(s->Generatrices,&pc);
+ List_Add(s->Generatrices,&CurveEnd);
+ List_Add(s->Generatrices,&ReverseChapeau);
}
else if(!CurveEnd){
- List_Add(s->s.Generatrices,&ReverseChapeau);
- List_Add(s->s.Generatrices,&ReverseBeg);
- List_Add(s->s.Generatrices,&pc);
+ List_Add(s->Generatrices,&ReverseChapeau);
+ List_Add(s->Generatrices,&ReverseBeg);
+ List_Add(s->Generatrices,&pc);
}
else{
- List_Add(s->s.Generatrices,&pc);
- List_Add(s->s.Generatrices,&CurveEnd);
- List_Add(s->s.Generatrices,&ReverseChapeau);
- List_Add(s->s.Generatrices,&ReverseBeg);
+ List_Add(s->Generatrices,&pc);
+ List_Add(s->Generatrices,&CurveEnd);
+ List_Add(s->Generatrices,&ReverseChapeau);
+ List_Add(s->Generatrices,&ReverseBeg);
}
End_Surface(s);
@@ -1059,9 +1059,9 @@ void Extrude_ProtudeSurface(int ep, int is,
chapeau->Extrude->geo.Source = ps->Num;
if(e) chapeau->Extrude->mesh = e->mesh;
- for(i=0;i<List_Nbr(chapeau->s.Generatrices);i++) {
- List_Read(ps->s.Generatrices,i,&c2);
- List_Read(chapeau->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(chapeau->Generatrices);i++) {
+ List_Read(ps->Generatrices,i,&c2);
+ List_Read(chapeau->Generatrices,i,&c);
if(c->Num<0)
if(!(c = FindCurve(-c->Num,THEM))){
Msg(GERROR, "Unknown Curve %d", -c->Num);
@@ -1077,8 +1077,8 @@ void Extrude_ProtudeSurface(int ep, int is,
// filling extrude params
- for(i=0;i<List_Nbr(ps->s.Generatrices);i++){
- List_Read(ps->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(ps->Generatrices);i++){
+ List_Read(ps->Generatrices,i,&c);
s = Extrude_ProtudeCurve(ep,c->Num,A,B,C,X,Y,Z,alpha,e);
if(pv && s)List_Add(pv->Surfaces,&s);
//printSurface(s);
@@ -1236,8 +1236,8 @@ int compareTwoSurfaces (const void *a, const void *b){
Surface *s1, *s2;
s1 = *(Surface**)a;
s2 = *(Surface**)b;
- return compare2Lists(s1->s.Generatrices,
- s2->s.Generatrices,
+ return compare2Lists(s1->Generatrices,
+ s2->Generatrices,
compareAbsCurve);
}
@@ -1351,13 +1351,13 @@ void ReplaceAllDuplicates ( Mesh *m ){
All = Tree2List(m->Surfaces);
for(i=0;i<List_Nbr(All);i++){
List_Read(All,i,&s);
- for(j=0;j<List_Nbr(s->s.Generatrices);j++){
- List_Write(s->s.Generatrices,j,
+ for(j=0;j<List_Nbr(s->Generatrices);j++){
+ List_Write(s->Generatrices,j,
Tree_PQuery( allNonDulpicatedCurves,
- List_Pointer(s->s.Generatrices,j)));
+ List_Pointer(s->Generatrices,j)));
// Arghhh. Revoir compareTwoCurves !
- End_Curve(*(Curve**)List_Pointer(s->s.Generatrices,j));
+ End_Curve(*(Curve**)List_Pointer(s->Generatrices,j));
}
}
@@ -1562,8 +1562,8 @@ void DeleteCurve(int ip){
for(int i=0;i<List_Nbr(Surfs);i++){
Surface *s;
List_Read(Surfs,i,&s);
- for(int j=0;j<List_Nbr(s->s.Generatrices);j++){
- if(!compareCurve(List_Pointer(s->s.Generatrices,j),&c))return;
+ for(int j=0;j<List_Nbr(s->Generatrices);j++){
+ if(!compareCurve(List_Pointer(s->Generatrices,j),&c))return;
}
}
List_Delete(Surfs);
diff --git a/Geo/DataBase.cpp b/Geo/DataBase.cpp
index dcf429573a..6f3d7f4a5f 100644
--- a/Geo/DataBase.cpp
+++ b/Geo/DataBase.cpp
@@ -1,4 +1,4 @@
-// $Id: DataBase.cpp,v 1.12 2001-04-08 20:36:49 geuzaine Exp $
+// $Id: DataBase.cpp,v 1.13 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -115,15 +115,15 @@ void AddQuadricSurfaceInDataBase (int Typ, int NumQuadric, double zaxis[3],
for(i=0;i<3;i++)s->Cyl.center[i] = center[i];
s->Cyl.radius1 = radius1;
s->Cyl.radius2 = radius2;
- s->s.Generatrices = List_Create(4, 1, sizeof(Curve*));
+ s->Generatrices = List_Create(4, 1, sizeof(Curve*));
NbLoop = List_Nbr(loops);
- s->s.Generatrices = List_Create(4, 1, sizeof(Curve*));
+ s->Generatrices = List_Create(4, 1, sizeof(Curve*));
for(i=0;i<NbLoop;i++){
List_Read(loops,i,&iLoop);
if(!(el = FindEdgeLoop(iLoop,THEM))){
Msg(GERROR, "Unknown Line Loop %d", iLoop);
- List_Delete(s->s.Generatrices);
+ List_Delete(s->Generatrices);
Free(s);
return;
}
@@ -132,12 +132,12 @@ void AddQuadricSurfaceInDataBase (int Typ, int NumQuadric, double zaxis[3],
List_Read(el->Curves,j,&ic);
if(!(c = FindCurve(ic,THEM))){
Msg(GERROR, "Unknown Curve %d", ic);
- List_Delete(s->s.Generatrices);
+ List_Delete(s->Generatrices);
Free(s);
return;
}
else
- List_Add (s->s.Generatrices, &c);
+ List_Add (s->Generatrices, &c);
}
}
}
@@ -160,12 +160,12 @@ void CreateSurfaceFromOldCrappyDatabase (int izon, int typzon, int o1, int o2,
s->Method = LIBRE;
NbLoop = List_Nbr(loops);
- s->s.Generatrices = List_Create(4, 1, sizeof(Curve*));
+ s->Generatrices = List_Create(4, 1, sizeof(Curve*));
for(i=0;i<NbLoop;i++){
List_Read(loops,i,&iLoop);
if(!(el = FindEdgeLoop(iLoop,THEM))){
Msg(GERROR, "Unknown Line Loop %d", iLoop);
- List_Delete(s->s.Generatrices);
+ List_Delete(s->Generatrices);
Free(s);
return;
}
@@ -174,12 +174,12 @@ void CreateSurfaceFromOldCrappyDatabase (int izon, int typzon, int o1, int o2,
List_Read(el->Curves,j,&ic);
if(!(c = FindCurve(ic,THEM))){
Msg(GERROR, "Unknown Curve %d", ic);
- List_Delete(s->s.Generatrices);
+ List_Delete(s->Generatrices);
Free(s);
return;
}
else
- List_Add (s->s.Generatrices, &c);
+ List_Add (s->Generatrices, &c);
}
}
}
diff --git a/Geo/Print_Geo.cpp b/Geo/Print_Geo.cpp
index 0368f01c30..b22ed3dce8 100644
--- a/Geo/Print_Geo.cpp
+++ b/Geo/Print_Geo.cpp
@@ -1,4 +1,4 @@
-// $Id: Print_Geo.cpp,v 1.15 2001-04-08 20:36:49 geuzaine Exp $
+// $Id: Print_Geo.cpp,v 1.16 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -107,8 +107,8 @@ void Print_Surface(void *a, void *b){
if(s->Typ != MSH_SURF_NURBS){
fprintf(FOUT,"Line Loop (%d) = ",NUMLOOP);
- for(i=0;i<List_Nbr(s->s.Generatrices);i++){
- List_Read(s->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(s->Generatrices);i++){
+ List_Read(s->Generatrices,i,&c);
if(i)
fprintf(FOUT,", %d",c->Num);
else
diff --git a/Geo/Verif.cpp b/Geo/Verif.cpp
index 9cdbdaa253..4f187a409e 100644
--- a/Geo/Verif.cpp
+++ b/Geo/Verif.cpp
@@ -1,4 +1,4 @@
-// $Id: Verif.cpp,v 1.8 2001-05-21 20:19:07 geuzaine Exp $
+// $Id: Verif.cpp,v 1.9 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -79,8 +79,8 @@ void recur_trouvevol(int ifac , int iedge, List_T *Liste, List_T *old ,
Curve *c;
Surface *s = FindSurface(abs(ifac),THEM);
- for(l=0;l<List_Nbr(s->s.Generatrices);l++){
- List_Read(s->s.Generatrices,l,&c);
+ for(l=0;l<List_Nbr(s->Generatrices);l++){
+ List_Read(s->Generatrices,l,&c);
lk.n = abs(c->Num);
is = lk.n;
if(!Tree_Search(treeedges,&is)){
@@ -170,8 +170,8 @@ void CreeLiens2 ( void ) {
List_Read(temp,i,&s);
if(s->Num > 0)
na.a = s->Num;
- for(k=0;k<List_Nbr(s->s.Generatrices);k++){
- List_Read(s->s.Generatrices,k,&c);
+ for(k=0;k<List_Nbr(s->Generatrices);k++){
+ List_Read(s->Generatrices,k,&c);
li.n = abs(c->Num);
if((pli = (lnk*)Tree_PQuery(treelink,&li))){
List_Add(pli->l,&na);
diff --git a/Geo/Visibility.cpp b/Geo/Visibility.cpp
index 4988ad53e4..0f4f86b379 100644
--- a/Geo/Visibility.cpp
+++ b/Geo/Visibility.cpp
@@ -43,8 +43,8 @@ void ToutesLesEntitesRelatives(int iEnt, Tree_T *Tree, int add_rem){
if((c = FindCurve(iEnt,THEM))){
}
else if((s = FindSurface(iEnt,THEM))){
- for(i=0;i<List_Nbr(s->s.Generatrices);i++){
- List_Read(s->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(s->Generatrices);i++){
+ List_Read(s->Generatrices,i,&c);
e.Entite = abs(c->Num);
e.Visible = add_rem;
Tree_Replace(Tree,&e);
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 46e39fae11..e449b91c2b 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.18 2001-04-26 17:58:00 remacle Exp $
+// $Id: Geom.cpp,v 1.19 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -188,9 +188,9 @@ int isPointOnPlanarSurface (Surface *S, double X, double Y, double Z, double n[3
V.Pos.Y = Y;
V.Pos.Z = Z;
- for(i=0;i<List_Nbr(S->s.Generatrices);i++){
+ for(i=0;i<List_Nbr(S->Generatrices);i++){
- List_Read(S->s.Generatrices,i,&C);
+ List_Read(S->Generatrices,i,&C);
if(C->Typ == MSH_SEGM_LINE)
N = 1;
@@ -237,8 +237,8 @@ void Plan_SurfPlane (void *data,void *dum){
else
List_Reset(points);
- for(i=0;i<List_Nbr(s->s.Generatrices);i++){
- List_Read(s->s.Generatrices,i,&pC);
+ for(i=0;i<List_Nbr(s->Generatrices);i++){
+ List_Read(s->Generatrices,i,&pC);
for(j=0;j<List_Nbr(pC->Control_Points);j++){
List_Add(points,List_Pointer(pC->Control_Points,j));
}
@@ -420,8 +420,8 @@ void Draw_Plane_Surface (Surface *s){
Plan_SurfPlane(&s,NULL);
k = 0;
- for(i=0;i<List_Nbr(s->s.Generatrices);i++){
- List_Read (s->s.Generatrices,i,&c);
+ for(i=0;i<List_Nbr(s->Generatrices);i++){
+ List_Read (s->Generatrices,i,&c);
P1 = InterpolateCurve(c,0.0,0);
P2 = InterpolateCurve(c,0.5,0);
P3 = InterpolateCurve(c,1.0,0);
@@ -858,11 +858,11 @@ void HighlightEntity(Vertex *v,Curve *c, Surface *s, int permanent){
if(CTX.geom.highlight) Draw_Surface(&s,NULL);
sprintf(Message,"Surface %d {",s->Num);
- nbg = List_Nbr(s->s.Generatrices) ;
+ nbg = List_Nbr(s->Generatrices) ;
if(nbg < 10){
for(i=0;i<nbg;i++){
- List_Read(s->s.Generatrices,i,&cc);
+ List_Read(s->Generatrices,i,&cc);
if(!i)sprintf(temp,"%d",cc->Num);
else sprintf(temp,",%d",cc->Num);
strcat(Message,temp);
diff --git a/Mesh/2D_Cylindrical.cpp b/Mesh/2D_Cylindrical.cpp
index 508a8f31de..9c1c6fcfd3 100644
--- a/Mesh/2D_Cylindrical.cpp
+++ b/Mesh/2D_Cylindrical.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Cylindrical.cpp,v 1.5 2001-01-12 13:29:00 geuzaine Exp $
+// $Id: 2D_Cylindrical.cpp,v 1.6 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -242,8 +242,8 @@ int MeshCylindricalSurface (Surface * s){
SURF = s;
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &pC);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &pC);
for (j = 0; j < List_Nbr (pC->Vertices); j++){
List_Read (pC->Vertices, j, &v);
Tree_Insert (s->Vertices, List_Pointer (pC->Vertices, j));
diff --git a/Mesh/2D_Elliptic.cpp b/Mesh/2D_Elliptic.cpp
index 1ffa0bc688..fff8c30975 100644
--- a/Mesh/2D_Elliptic.cpp
+++ b/Mesh/2D_Elliptic.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Elliptic.cpp,v 1.5 2001-02-23 00:07:51 remacle Exp $
+// $Id: 2D_Elliptic.cpp,v 1.6 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -22,12 +22,12 @@ int MeshEllipticSurface (Surface * sur){
if (sur->Method != ELLIPTIC)
return (0);
- nb = List_Nbr (sur->s.Generatrices);
+ nb = List_Nbr (sur->Generatrices);
if (nb < 4)
return (0);
for (i = 0; i < nb; i++){
- List_Read (sur->s.Generatrices, i, &GG[i]);
+ List_Read (sur->Generatrices, i, &GG[i]);
}
if (!(S[0] = FindPoint (sur->ipar[0], THEM)))
diff --git a/Mesh/2D_Mesh.cpp b/Mesh/2D_Mesh.cpp
index 42dc05e461..f65fca8a17 100644
--- a/Mesh/2D_Mesh.cpp
+++ b/Mesh/2D_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Mesh.cpp,v 1.23 2001-05-21 09:28:02 geuzaine Exp $
+// $Id: 2D_Mesh.cpp,v 1.24 2001-06-02 16:24:51 geuzaine Exp $
/*
Maillage Delaunay d'une surface (Point insertion Technique)
@@ -80,8 +80,8 @@ void Plan_Moyen (void *data, void *dum){
case MSH_SURF_REGL:
case MSH_SURF_NURBS:
case MSH_SURF_TRIMMED:
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &pC);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &pC);
for (j = 0; j < List_Nbr (pC->Vertices); j++){
List_Read (pC->Vertices, j, &v);
List_Add (points, &v);
@@ -291,8 +291,8 @@ int Calcule_Contours (Surface * s){
double n[] = {0., 0., 1.};
l = List_Create (10, 10, sizeof (Vertex *));
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &c);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &c);
if (!List_Nbr (l)){
List_Read (c->Vertices, 0, &first);
}
diff --git a/Mesh/2D_Mesh_Aniso.cpp b/Mesh/2D_Mesh_Aniso.cpp
index d38a9634ef..5045b83a22 100644
--- a/Mesh/2D_Mesh_Aniso.cpp
+++ b/Mesh/2D_Mesh_Aniso.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Mesh_Aniso.cpp,v 1.14 2001-04-08 20:36:49 geuzaine Exp $
+// $Id: 2D_Mesh_Aniso.cpp,v 1.15 2001-06-02 16:24:51 geuzaine Exp $
/*
Jean-Francois Remacle
@@ -358,8 +358,8 @@ void missing_edges_2d (Surface * s){
EdgesContainer EdgesOnSurface (s->Simplexes, false);
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &c);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &c);
for (j = 1; j < List_Nbr (c->Vertices); j++){
List_Read (c->Vertices, j - 1, &v1);
List_Read (c->Vertices, j, &v2);
@@ -723,8 +723,8 @@ void Trouve_Simplex_Bord_2D (void *a, void *b){
void CourbesDansSurface (Surface * s, List_T * ListAllCurves){
int i, iseg;
Curve *c;
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &c);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &c);
iseg = abs (c->Num);
List_Replace (ListAllCurves, &iseg, fcmp_int);
}
@@ -736,8 +736,8 @@ int isListaSurface (List_T * ListSurf, Surface * s){
Curve *c;
NN = 0;
found = true;
- for (j = 0; j < List_Nbr (s->s.Generatrices); j++){
- List_Read (s->s.Generatrices, j, &c);
+ for (j = 0; j < List_Nbr (s->Generatrices); j++){
+ List_Read (s->Generatrices, j, &c);
srf = abs (c->Num);
if (!List_Search (ListSurf, &srf, fcmp_int)){
found = false;
@@ -1013,8 +1013,8 @@ int AlgorithmeMaillage2DAnisotropeModeJF (Surface * s){
// return 1;
FacesTree = Tree_Create (sizeof (Simplex *), compareSimpSurf);
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &cur);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &cur);
curinv = FindCurve (abs (cur->Num), THEM);
List_T *temp = Tree2List (curinv->Simplexes);
for (j = 0; j < List_Nbr (temp); j++){
diff --git a/Mesh/2D_Parametric.cpp b/Mesh/2D_Parametric.cpp
index fa038277b9..36ea5e5b12 100644
--- a/Mesh/2D_Parametric.cpp
+++ b/Mesh/2D_Parametric.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_Parametric.cpp,v 1.4 2001-01-08 08:05:44 geuzaine Exp $
+// $Id: 2D_Parametric.cpp,v 1.5 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -88,10 +88,10 @@ int MeshParametricSurface (Surface * s){
return 0;
SURF = s;
- if (!List_Nbr (s->s.Generatrices))
+ if (!List_Nbr (s->Generatrices))
return 1;
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &pC);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &pC);
for (j = 0; j < List_Nbr (pC->Vertices); j++){
List_Read (pC->Vertices, j, &v);
Tree_Insert (s->Vertices, List_Pointer (pC->Vertices, j));
diff --git a/Mesh/2D_SMesh.cpp b/Mesh/2D_SMesh.cpp
index e4d410111e..d265658561 100644
--- a/Mesh/2D_SMesh.cpp
+++ b/Mesh/2D_SMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 2D_SMesh.cpp,v 1.5 2001-01-08 08:05:44 geuzaine Exp $
+// $Id: 2D_SMesh.cpp,v 1.6 2001-06-02 16:24:51 geuzaine Exp $
/*
Maillage transfini surfacique
@@ -60,7 +60,7 @@ int MeshTransfiniteSurface (Surface *sur) {
case MSH_SURF_TRIC:
case MSH_SURF_NURBS:
- nb = List_Nbr(sur->s.Generatrices);
+ nb = List_Nbr(sur->Generatrices);
if(nb != 3 && nb != 4) return(0);
for(i=0;i<4;i++) G[i] = NULL ;
@@ -78,7 +78,7 @@ int MeshTransfiniteSurface (Surface *sur) {
}
}
- for(i=0;i<nb;i++) List_Read(sur->s.Generatrices,i,&GG[i]);
+ for(i=0;i<nb;i++) List_Read(sur->Generatrices,i,&GG[i]);
for(i=0;i<nb;i++){
List_Read(GG[i]->Control_Points,0,&CP[0]);
diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp
index 981c87ff37..31309753a0 100644
--- a/Mesh/3D_Extrude.cpp
+++ b/Mesh/3D_Extrude.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Extrude.cpp,v 1.7 2001-01-09 19:40:56 remacle Exp $
+// $Id: 3D_Extrude.cpp,v 1.8 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -560,8 +560,8 @@ int Extrude_Mesh (Surface * s){
ToAdd = s->Vertices;
- for (i = 0; i < List_Nbr (s->s.Generatrices); i++){
- List_Read (s->s.Generatrices, i, &cc);
+ for (i = 0; i < List_Nbr (s->Generatrices); i++){
+ List_Read (s->Generatrices, i, &cc);
for (int j = 0; j < List_Nbr (cc->Vertices); j++){
List_Read (cc->Vertices, j, &v1);
Tree_Replace (Vertex_Bound, &v1);
diff --git a/Mesh/3D_SMesh.cpp b/Mesh/3D_SMesh.cpp
index bec4a0e794..b10f6ef3bd 100644
--- a/Mesh/3D_SMesh.cpp
+++ b/Mesh/3D_SMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_SMesh.cpp,v 1.8 2001-04-08 20:36:50 geuzaine Exp $
+// $Id: 3D_SMesh.cpp,v 1.9 2001-06-02 16:24:51 geuzaine Exp $
/*
Maillage transfini volumique
@@ -171,7 +171,7 @@ int MeshTransfiniteVolume (Volume *vol) {
for(i=0;i<nbs;i++) List_Read(vol->Surfaces,i,&GG[i]);
for(i=0;i<nbs;i++){
- nbg = List_Nbr(GG[i]->s.Generatrices);
+ nbg = List_Nbr(GG[i]->Generatrices);
for(j=0;j<nbg;j++){
V.Num = GG[i]->ipar[j];
diff --git a/Mesh/Create.cpp b/Mesh/Create.cpp
index d4b54ff0b6..ef49fa4b4c 100644
--- a/Mesh/Create.cpp
+++ b/Mesh/Create.cpp
@@ -1,4 +1,4 @@
-// $Id: Create.cpp,v 1.17 2001-06-02 13:09:14 geuzaine Exp $
+// $Id: Create.cpp,v 1.18 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -422,11 +422,11 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
pC = (Curve *) Malloc (sizeof (Curve));
pC->Vertices = NULL;
+ pC->Extrude = NULL;
pC->Typ = Typ;
pC->Num = Num;
pC->Simplexes = Tree_Create (sizeof (Simplex *), compareSimplex);
pC->TrsfSimplexes = List_Create (1, 10, sizeof (Simplex *));
- pC->ConnectedSurfaces = NULL;
pC->Circle.done = 0;
pC->Method = LIBRE;
pC->degre = Order;
@@ -479,9 +479,7 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
}
}
else {
- //End_Curve(pC);
pC->Control_Points = NULL;
- pC->Extrude = NULL;
return pC;
}
@@ -507,9 +505,10 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
Msg(GERROR, "Unknown control point %d in Curve %d", p2, pC->Num);
}
}
+
End_Curve (pC);
- pC->Extrude = NULL;
- return (pC);
+
+ return pC;
}
void Free_Curve(void *a, void *b){
@@ -544,7 +543,7 @@ Surface * Create_Surface (int Num, int Typ, int Mat){
pS->Orientations = NULL;
pS->Support = pS;
pS->Control_Points = List_Create (1, 10, sizeof (Vertex *));
- pS->s.Generatrices = NULL;
+ pS->Generatrices = NULL;
pS->Edges = NULL;
pS->Extrude = NULL;
pS->STL = NULL;
@@ -562,7 +561,7 @@ void Free_Surface(void *a, void *b){
List_Delete(pS->TrsfVertices);
List_Delete(pS->Contours);
List_Delete(pS->Control_Points);
- List_Delete(pS->s.Generatrices);
+ List_Delete(pS->Generatrices);
Free(pS);
pS = NULL;
}
diff --git a/Mesh/Interpolation.cpp b/Mesh/Interpolation.cpp
index 9f0d57585d..2328e7536e 100644
--- a/Mesh/Interpolation.cpp
+++ b/Mesh/Interpolation.cpp
@@ -1,4 +1,4 @@
-// $Id: Interpolation.cpp,v 1.8 2001-04-08 20:36:50 geuzaine Exp $
+// $Id: Interpolation.cpp,v 1.9 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -387,7 +387,7 @@ Vertex InterpolateSurface (Surface * s, double u, double v,
case MSH_SURF_REGL:
issphere = 1;
for (i = 0; i < 4; i++){
- List_Read (s->s.Generatrices, i, &C[i]);
+ List_Read (s->Generatrices, i, &C[i]);
if (C[i]->Typ != MSH_SEGM_CIRC && C[i]->Typ != MSH_SEGM_CIRC_INV){
issphere = 0;
}
@@ -431,7 +431,7 @@ Vertex InterpolateSurface (Surface * s, double u, double v,
case MSH_SURF_TRIC:
issphere = 1;
for (i = 0; i < 3; i++){
- List_Read (s->s.Generatrices, i, &C[i]);
+ List_Read (s->Generatrices, i, &C[i]);
if (C[i]->Typ != MSH_SEGM_CIRC && C[i]->Typ != MSH_SEGM_CIRC_INV){
issphere = 0;
}
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index a93304aed3..440b6d259e 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -208,9 +208,7 @@ struct _Surf{
double RecombineAngle;
int ipar[4];
int Nu, Nv;
- union{
- List_T *Generatrices; /* Surface reglee */
- }s;
+ List_T *Generatrices; /* Surface reglee */
List_T *Control_Points; /* Patchs bicubiques */
double plan[3][3];
double invplan[3][3];
@@ -323,9 +321,7 @@ typedef struct{
Vertex *beg, *end;
double ubeg, uend;
List_T *Control_Points;
- List_T *Knots;
List_T *Vertices;
- List_T *ConnectedSurfaces;
Tree_T *Simplexes;
List_T *TrsfSimplexes;
ExtrudeParams *Extrude;
diff --git a/Mesh/Print_Mesh.cpp b/Mesh/Print_Mesh.cpp
index a534a4fe23..c6b6b07493 100644
--- a/Mesh/Print_Mesh.cpp
+++ b/Mesh/Print_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Print_Mesh.cpp,v 1.20 2001-05-28 07:33:06 geuzaine Exp $
+// $Id: Print_Mesh.cpp,v 1.21 2001-06-02 16:24:51 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -486,8 +486,8 @@ int process_1D_elements (FILE * funv, Mesh * m){
for (i = 0; i < List_Nbr (ListSurfaces); i++){
List_Read (ListSurfaces, i, &surf);
- for (j = 0; j < List_Nbr (surf->s.Generatrices); j++){
- List_Read (surf->s.Generatrices, j, &c);
+ for (j = 0; j < List_Nbr (surf->Generatrices); j++){
+ List_Read (surf->Generatrices, j, &c);
if (Tree_Nbr (c->Simplexes))
List_Add (AllCurves, &c);
c = FindCurve (-c->Num, m);
diff --git a/Mesh/SMS.cpp b/Mesh/SMS.cpp
index 4920968f32..e2491d215a 100644
--- a/Mesh/SMS.cpp
+++ b/Mesh/SMS.cpp
@@ -51,7 +51,7 @@ void Read_VTK_File (char *file, Mesh *m)
sscanf(line,"%s %d %s",dumline1,&NbVertices,dumline2);
Surface *surf = Create_Surface(1,MSH_SURF_DISCRETE,1);
- surf->s.Generatrices = List_Create(1,1,sizeof(Curve*));
+ surf->Generatrices = List_Create(1,1,sizeof(Curve*));
Tree_Add(m->Surfaces,&surf);
for(i=0;i<NbVertices;i++)
@@ -92,7 +92,7 @@ void Read_VTK_File (char *file, Mesh *m)
else
{
surf = Create_Surface(1,MSH_SURF_DISCRETE,1);
- surf->s.Generatrices = List_Create(1,1,sizeof(Curve*));
+ surf->Generatrices = List_Create(1,1,sizeof(Curve*));
Tree_Add(m->Surfaces,&surf);
}
Tree_Add(surf->Simplexes,&s);
@@ -302,7 +302,7 @@ void Read_Mesh_SMS (Mesh *m, FILE *in)
{
surf = Create_Surface(GEntityId+10000,MSH_SURF_DISCRETE,1);
if(!NbRegions)List_Add(vol->Surfaces,&surf);
- surf->s.Generatrices = List_Create(1,1,sizeof(Curve*));
+ surf->Generatrices = List_Create(1,1,sizeof(Curve*));
Tree_Add(m->Surfaces,&surf);
}
Tree_Add(surf->Vertices,&s->V[0]);
@@ -622,9 +622,9 @@ void Write_DMG_FILE (Mesh *m, char *filename)
Vertex *beg = NULL;
numEdgeLoop[iLoop] = 0;
int deb = 1;
- for(j=0;j<List_Nbr(s->s.Generatrices);j++)
+ for(j=0;j<List_Nbr(s->Generatrices);j++)
{
- List_Read(s->s.Generatrices,j,&c);
+ List_Read(s->Generatrices,j,&c);
if(deb)
{
beg = c->beg;
@@ -649,7 +649,7 @@ void Write_DMG_FILE (Mesh *m, char *filename)
fprintf(stdout,"%d ",numEdgeLoop[k]);
for(j=0;j<numEdgeLoop[k];j++)
{
- List_Read(s->s.Generatrices,iEdge++,&c);
+ List_Read(s->Generatrices,iEdge++,&c);
fprintf(f,"%d %d ",abs(c->ipar[3]),(c->Num>0)?1:-1);
fprintf(stdout,"%d %d ",abs(c->ipar[3]),(c->Num>0)?1:-1);
}
diff --git a/examples/bug_ruled.geo b/examples/bug_ruled.geo
index 522e64f953..0f5cb1cf6e 100644
--- a/examples/bug_ruled.geo
+++ b/examples/bug_ruled.geo
@@ -1,4 +1,7 @@
+// solved by setting the tolerance lower in sys3x3_with_tol (-> again,
+// this arised from a wrong mean plane computation)
+
//lc = 0.00001;
lc = 0.001;
Point(61) = {0.058, -0.005, 0, lc};
--
GitLab