diff --git a/Mesh/3D_Coherence.cpp b/Mesh/3D_Coherence.cpp index 21c6291093b90f724ba3fd0936e5470844cd5885..827c0e8febc81d604d5ab7c438f3db4732c0900a 100644 --- a/Mesh/3D_Coherence.cpp +++ b/Mesh/3D_Coherence.cpp @@ -1,4 +1,4 @@ -/* $Id: 3D_Coherence.cpp,v 1.3 2000-11-23 17:16:38 geuzaine Exp $ */ +/* $Id: 3D_Coherence.cpp,v 1.4 2000-11-23 17:18:50 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -1149,8 +1149,7 @@ Simplex * Create_Simplex_MemeSens (Simplex * sold, Vertex * v1, Vertex * v2, Ver int Coherence (Volume * v, Mesh * m){ int i, j, k, Np, Nh; Surface *s; - Vertex V1, V2 ; - //Vertex *ver1, *ver2 ; + //Vertex V1, V2, *ver1, *ver2 ; Face Face; static Edge E, *pE1, *pE2, *pE3; Simplex *simp, *simp1; diff --git a/Mesh/3D_Extrude.cpp b/Mesh/3D_Extrude.cpp index 18a00e4f5e2e72e0e2f51d1ecbebc7ae8d97a3c1..13df32e40ed2e0633c7f59f1cb00ce3962b1d923 100644 --- a/Mesh/3D_Extrude.cpp +++ b/Mesh/3D_Extrude.cpp @@ -1,4 +1,4 @@ -/* $Id: 3D_Extrude.cpp,v 1.3 2000-11-23 14:11:35 geuzaine Exp $ */ +/* $Id: 3D_Extrude.cpp,v 1.4 2000-11-23 17:16:38 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -311,7 +311,7 @@ static Tree_T *Vertex_Bound, *ToAdd = NULL; void Extrude_Vertex (void *data, void *dum){ - Vertex **pV, *v, *newv, *exv; + Vertex **pV, *v, *newv; int i, j; pV = (Vertex **) data; @@ -320,15 +320,13 @@ void Extrude_Vertex (void *data, void *dum){ List_Delete (v->Extruded_Points); v->Extruded_Points = List_Create (ep->mesh.NbLayer, 1, sizeof (Vertex *)); List_Add (v->Extruded_Points, &v); - exv = v; for (i = 0; i < ep->mesh.NbLayer; i++){ for (j = 0; j < ep->mesh.NbElmLayer[i]; j++){ newv = Create_Vertex (++CurrentNodeNumber, v->Pos.X, v->Pos.Y, v->Pos.Z, v->lc, v->u); ep->Extrude (i, j + 1, newv->Pos.X, newv->Pos.Y, newv->Pos.Z); - //newv->lc = DMIN(newv->lc,sqrt( ((*newv) - (*exv)) * ((*newv) - (*exv)) )); - exv = newv; + if (Vertex_Bound && (pV = (Vertex **) Tree_PQuery (Vertex_Bound, &newv))){ List_Add (v->Extruded_Points, pV); if (ToAdd) @@ -587,7 +585,7 @@ int Extrude_Mesh (Surface * s){ copy_mesh (ss, s); return true; } - ToAdd = NULL; + } int Extrude_Mesh (Volume * v){ diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp index ac37cb4e3276c103dda50fe5fb78e42bbb77b167..7f7979c1d309eb7259f78b51f9bd0604abfaa38c 100644 --- a/Mesh/3D_Mesh.cpp +++ b/Mesh/3D_Mesh.cpp @@ -1,4 +1,4 @@ -/* $Id: 3D_Mesh.cpp,v 1.3 2000-11-23 14:11:35 geuzaine Exp $ */ +/* $Id: 3D_Mesh.cpp,v 1.4 2000-11-23 17:16:38 geuzaine Exp $ */ /* J-F Remacle 1995 @@ -65,9 +65,6 @@ void VSIM (void *a, void *b){ } void add_points (void *a, void *b){ - Vertex **w; - - w = (Vertex **) a; Tree_Insert (POINTS_TREE, a); } diff --git a/Mesh/Create.cpp b/Mesh/Create.cpp index f612d41612961d32125a7c52f5624c0f96a776ae..436abc6aee05dbf5d4a96cbd8a1041a5df85920b 100644 --- a/Mesh/Create.cpp +++ b/Mesh/Create.cpp @@ -1,4 +1,4 @@ -/* $Id: Create.cpp,v 1.3 2000-11-23 14:11:35 geuzaine Exp $ */ +/* $Id: Create.cpp,v 1.4 2000-11-23 17:16:38 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -342,7 +342,8 @@ void End_Curve (Curve * c){ for (i = 0; i < 4; i++) Curve->Circle.v[i] = v[i]; - + + /* if (!c->Circle.done){ float proj[4][4]; for (i = 0; i < 4; i++){ @@ -359,6 +360,7 @@ void End_Curve (Curve * c){ proj[3][3] = 1.0; c->Circle.done = 1; } + */ // Un cercle a au moins 16 pts par pi radiants // c->beg->lc = DMIN (R*Pi/(fabs(c->Circle.t1-c->Circle.t2)*CIRC_GRAN),c->beg->lc); diff --git a/Mesh/Numeric.cpp b/Mesh/Numeric.cpp index 09d988887911acf140e453d84a155364ef120704..9df91ae6b27f6b4d9303e2681c935c1e9e1492ec 100644 --- a/Mesh/Numeric.cpp +++ b/Mesh/Numeric.cpp @@ -1,4 +1,4 @@ -/* $Id: Numeric.cpp,v 1.3 2000-11-23 16:07:12 geuzaine Exp $ */ +/* $Id: Numeric.cpp,v 1.4 2000-11-23 17:16:38 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -239,6 +239,8 @@ void XYtoUV (Surface * s, double *X, double *Y, double det, Unew, Vnew, err, mat[2][2], jac[2][2]; int iter; Vertex D_u, D_v, P; + + /* double umin, umax, vmin, vmax; if (s->Typ == MSH_SURF_NURBS){ @@ -251,6 +253,7 @@ void XYtoUV (Surface * s, double *X, double *Y, umin = vmin = 0.0; umax = vmax = 1.0; } + */ *U = *V = 0.487; err = 1.0; diff --git a/Mesh/Nurbs.cpp b/Mesh/Nurbs.cpp index b8f76dcf16dc6b0b3d4021b1f51b3c5751cb9a25..23f0c1824626a3255a7fa6d2a101d15dd2cb3d07 100644 --- a/Mesh/Nurbs.cpp +++ b/Mesh/Nurbs.cpp @@ -1,4 +1,4 @@ -/* $Id: Nurbs.cpp,v 1.2 2000-11-23 14:11:35 geuzaine Exp $ */ +/* $Id: Nurbs.cpp,v 1.3 2000-11-23 17:16:38 geuzaine Exp $ */ #include "Gmsh.h" #include "Mesh.h" @@ -81,13 +81,12 @@ Vertex InterpolateCubicSpline (Vertex * v[4], double t, double mat[4][4], Vertex InterpolateUBS (Curve * Curve, double u, int derivee){ - int NbControlPoints, NbKnots, NbCurves, iCurve; + int NbControlPoints, NbCurves, iCurve; double t, t1, t2; Vertex *v[4]; NbControlPoints = List_Nbr (Curve->Control_Points); NbCurves = NbControlPoints - 3; - NbKnots = NbControlPoints - 2; iCurve = (int) (u * (double) NbCurves) + 1; diff --git a/Mesh/SecondOrder.cpp b/Mesh/SecondOrder.cpp index b125d8fed266d436e7e6b0271030197d936de6d3..ce2a4a181fe76bf60ac990617fe2e4f12ca8b27f 100644 --- a/Mesh/SecondOrder.cpp +++ b/Mesh/SecondOrder.cpp @@ -1,4 +1,4 @@ -/* $Id: SecondOrder.cpp,v 1.2 2000-11-23 14:11:35 geuzaine Exp $ */ +/* $Id: SecondOrder.cpp,v 1.3 2000-11-23 17:16:38 geuzaine Exp $ */ #include "Gmsh.h" #include "Geo.h" @@ -63,7 +63,7 @@ void PutMiddlePoint (void *a, void *b){ Edge *ed; Simplex *s; Vertex *v; - int i, j, k, N, c; + int i, j, k, N; int edges[6][2]; ed = (Edge *) a; @@ -115,7 +115,7 @@ void PutMiddlePoint (void *a, void *b){ for (j = 0; j < 2; j++) edges[k][j] = edges_tetra[k][j]; } - c = 0; + for (j = 0; j < N; j++){ if ((!compareVertex (&s->V[edges[j][0]], &ed->V[0]) && !compareVertex (&s->V[edges[j][1]], &ed->V[1])) || diff --git a/Mesh/Simplex.cpp b/Mesh/Simplex.cpp index c9c0f780d789b532b7146a858b2250f73ac8e22b..feca506c42aaacc0b7e6369a09e9e6b2220680e8 100644 --- a/Mesh/Simplex.cpp +++ b/Mesh/Simplex.cpp @@ -1,4 +1,4 @@ -/* $Id: Simplex.cpp,v 1.3 2000-11-23 16:07:12 geuzaine Exp $ */ +/* $Id: Simplex.cpp,v 1.4 2000-11-23 17:16:38 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -370,9 +370,9 @@ int compareSimplex (const void *a, const void *b){ int Simplex::Pt_In_Simplexe (Vertex * v, double uvw[3], double tol){ double mat[3][3]; - double b[3], det, dum; + double b[3], dum; - det = matsimpl (mat); + matsimpl (mat); b[0] = v->Pos.X - V[0]->Pos.X; b[1] = v->Pos.Y - V[0]->Pos.Y; b[2] = v->Pos.Z - V[0]->Pos.Z;