diff --git a/Mesh/1D_Mesh.cpp b/Mesh/1D_Mesh.cpp index 46405879835004c00fc4d1e405101ef8d97849f3..24efd9254c3dcc3831f00fa43621e89bd8c14d5e 100644 --- a/Mesh/1D_Mesh.cpp +++ b/Mesh/1D_Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: 1D_Mesh.cpp,v 1.13 2001-04-25 15:44:10 geuzaine Exp $ +// $Id: 1D_Mesh.cpp,v 1.14 2001-04-25 20:42:39 geuzaine Exp $ #include "Gmsh.h" #include "Const.h" @@ -81,7 +81,7 @@ double F_Lc (double t){ Vertex der, point; double Lc; - if (THEM->BGM.Typ == ONFILE && CTX.mesh.algo == DELAUNAY_OLDALGO){ + if (CTX.mesh.algo == DELAUNAY_OLDALGO && THEM->BGM.Typ == ONFILE){ der = InterpolateCurve(THEC, t, 1); point = InterpolateCurve(THEC, t, 0); Lc = Lc_XYZ(point.Pos.X, point.Pos.Y, point.Pos.Z, THEM); @@ -89,7 +89,7 @@ double F_Lc (double t){ Msg(GERROR, "Null characteristic length in background mesh"); return sqrt(DSQR(der.Pos.X)+DSQR(der.Pos.Y)+DSQR(der.Pos.Z)); } - return(sqrt(DSQR(der.Pos.X)+DSQR(der.Pos.Y)+DSQR(der.Pos.Z)) / (CTX.mesh.lc_factor*Lc)); + return sqrt(DSQR(der.Pos.X)+DSQR(der.Pos.Y)+DSQR(der.Pos.Z))/Lc; } else{ return THEM->Metric->getLc(t, THEC); diff --git a/Mesh/3D_BGMesh.cpp b/Mesh/3D_BGMesh.cpp index d201d352e9b4d1c5a4d0d6370aeb6ad254acbad2..092e579a3e69698cd1660e75d428077b2a845e30 100644 --- a/Mesh/3D_BGMesh.cpp +++ b/Mesh/3D_BGMesh.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_BGMesh.cpp,v 1.16 2001-04-08 20:36:49 geuzaine Exp $ +// $Id: 3D_BGMesh.cpp,v 1.17 2001-04-25 20:42:39 geuzaine Exp $ #include "Gmsh.h" #include "Mesh.h" @@ -7,8 +7,10 @@ #include "Adapt.h" #include "Views.h" #include "Numeric.h" +#include "Context.h" extern Mesh *THEM; +extern Context_T CTX; static Mesh m; static double XX, YY, ZZ, D, LL; @@ -111,6 +113,7 @@ double Lc_XYZ (double X, double Y, double Z, Mesh * m){ LCBGM (X, Y, Z, &l); break; case WITHPOINTS: + Msg(WARNING, "Send a mail to <gmsh@geuz.org> if you see this (Lc_XYZ)"); if (Pt_In_Volume (X, Y, Z, m, &l, 0.0)); else if (Pt_In_Volume (X, Y, Z, m, &l, 0.2)); else if (Pt_In_Volume (X, Y, Z, m, &l, 0.5)); @@ -120,7 +123,7 @@ double Lc_XYZ (double X, double Y, double Z, Mesh * m){ } break; } - return l; + return CTX.mesh.lc_factor*l; } /* ------------------------------------------------------------------------ */ diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS index cae5b90709bfa6966df7157f679d20f0a39d8a7d..a69c0a0e689aacfab45d14986256e5a3c2a19e17 100644 --- a/doc/CONTRIBUTORS +++ b/doc/CONTRIBUTORS @@ -1,36 +1,33 @@ -$Id: CONTRIBUTORS,v 1.3 2001-03-05 07:43:53 geuzaine Exp $ +$Id: CONTRIBUTORS,v 1.4 2001-04-25 20:42:39 geuzaine Exp $ Gmsh is copyright (c) 1997-2001 by - Jean-François Remacle <remacle@scorec.rpi.edu> + Jean-François Remacle <remacle@scorec.rpi.edu> and Christophe Geuzaine <christophe.geuzaine@ulg.ac.be> -Significant parts of the code have been contributed by +Parts of the code have been contributed by - ... + Marc Umé <Marc.Ume@digitalgraphics.be> Special thanks to the following folks who have greatly contributed by providing fresh ideas on theoretical or programming topics, or who have sent patches, requests, warnings, or pleas for changes or improvements. While attempts were made to be as complete as possible, it is inevitable that some contributors have been omitted. If you are -in this situation, feel free to add yourself to this list! +in this situation, just send an e-mail to one of the authors, and you +will be added to the list! - Nicolas Moës <> - Éric Bechet <> - David Colignon <> - Patrick Dular <> - Johan Gyselinck <> + Éric Bechet <eric.bechet@epost.de> + David Colignon <david.colignon@ulg.ac.be> + Patrick Dular <patrick.dular@ulg.ac.be> Philippe Geuzaine <geuzaine@gnat.colorado.edu> + Johan Gyselinck <johan.gyselinck@ulg.ac.be> François Henrotte <fhenrott@esat.kuleuven.ac.be> Benoît Meys <bmeys@techspace-aero.be> - André Nicolet <andre.nicolet@fresnel.fr> - Uwe Pahner <uwe.pahner@esat.kuleuven.ac.be> - Ahmed Rassili <a.rassili@ulg.ac.be> + Nicolas Moës <moes@tam9.mech.nwu.edu> -Finally, thanks to all of you who sent e-mail showing interrest. This +Finally, thanks to all of you who sent e-mail showing interest. This has motivated us a lot to release the code as free software and to -continue to improve it. - +continue improving it. diff --git a/utils/gmsh_fltk.spec b/utils/gmsh_fltk.spec index cd0f51c2f850c8969c121f0df84bb1698869db7d..4830861b0f575d8896bafddb1ecf3b1f237c5b74 100644 --- a/utils/gmsh_fltk.spec +++ b/utils/gmsh_fltk.spec @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc doc/FORMATS demos tutorial +%doc doc/FORMATS doc/VERSIONS doc/FAQ doc/CONTRIBUTORS demos tutorial /usr/bin/gmsh /usr/bin/dxf2geo /usr/man/man1/gmsh*