diff --git a/Mesh/1D_Mesh.cpp b/Mesh/1D_Mesh.cpp index a2d82334c595993af1fd8d61d8df763fa80e64bf..46405879835004c00fc4d1e405101ef8d97849f3 100644 --- a/Mesh/1D_Mesh.cpp +++ b/Mesh/1D_Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: 1D_Mesh.cpp,v 1.12 2001-04-08 20:36:49 geuzaine Exp $ +// $Id: 1D_Mesh.cpp,v 1.13 2001-04-25 15:44:10 geuzaine Exp $ #include "Gmsh.h" #include "Const.h" @@ -78,7 +78,22 @@ double F_Transfini (double t){ } double F_Lc (double t){ - return THEM->Metric->getLc(t, THEC); + Vertex der, point; + double Lc; + + if (THEM->BGM.Typ == ONFILE && CTX.mesh.algo == DELAUNAY_OLDALGO){ + der = InterpolateCurve(THEC, t, 1); + point = InterpolateCurve(THEC, t, 0); + Lc = Lc_XYZ(point.Pos.X, point.Pos.Y, point.Pos.Z, THEM); + if(!Lc){ + 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)); + } + else{ + return THEM->Metric->getLc(t, THEC); + } } void Maillage_Curve (void *data, void *dummy){ diff --git a/doc/VERSIONS b/doc/VERSIONS index 955b298b659f139c8744dd424f2257c05afa572a..05a6915b69fc8ff151d9894fe6a9a51568690a4f 100644 --- a/doc/VERSIONS +++ b/doc/VERSIONS @@ -1,7 +1,7 @@ -$Id: VERSIONS,v 1.9 2001-04-25 07:40:16 geuzaine Exp $ +$Id: VERSIONS,v 1.10 2001-04-25 15:44:10 geuzaine Exp $ New in 1.18: Fixed many small bugs and incoherences in -post-processing; +post-processing; fixed broken background mesh in 1D mesh generation. New in 1.17: Corrected physical points saving; fixed parsing of DOS files (carriage return problems); easier geometrical selections