diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index a64dfca19e671d8acab552066bc9fda9338ae7a3..c8218939b26e317d13c2eaa6ea889bd262f15b36 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -1,4 +1,4 @@
-// $Id: CommandLine.cpp,v 1.85 2006-11-30 13:55:20 geuzaine Exp $
+// $Id: CommandLine.cpp,v 1.86 2006-11-30 14:09:07 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -85,9 +85,8 @@ void Print_Usage(char *name){
Msg(DIRECT, " -smooth int Set number of mesh smoothing steps");
Msg(DIRECT, " -optimize Optimize quality of tetrahedral elements");
Msg(DIRECT, " -order int Set mesh order (1, 2)");
- Msg(DIRECT, " -scale float Set global scaling factor");
- Msg(DIRECT, " -meshscale float Set mesh scaling factor");
Msg(DIRECT, " -clscale float Set characteristic length scaling factor");
+ Msg(DIRECT, " -clcurv Compute characteristic lengths from curvatures");
Msg(DIRECT, " -rand float Set random perturbation factor");
Msg(DIRECT, " -bgm file Load background mesh from file");
Msg(DIRECT, " -constrain Constrain background mesh with characteristic lengths");
@@ -356,6 +355,10 @@ void Get_Options(int argc, char *argv[])
exit(1);
}
}
+ else if(!strcmp(argv[i] + 1, "clcurv")) {
+ CTX.mesh.lc_from_curvature = 1;
+ i++;
+ }
else if(!strcmp(argv[i] + 1, "smooth")) {
i++;
if(argv[i] != NULL)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 91f2b6f195332f7d6b397930d3d3b078a6145c7d..ebd6cc1d4aa349d6f6711b31fb7dda4f800f51d0 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -850,7 +850,7 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "CharacteristicLengthFactor" , opt_mesh_lc_factor , 1.0 ,
"Factor applied to all characteristic lengths" },
{ F|O, "CharacteristicLengthFromCurvature" , opt_mesh_lc_from_curvature , 0. ,
- "Compute characteritic lenghts automatically using curvature information" },
+ "Compute characteritic lenghts automatically from curvatures" },
{ F|O, "ColorCarousel" , opt_mesh_color_carousel , 1. ,
"Mesh coloring (0=by element type, 1=by elementary entity, 2=by physical entity, 3=by partition)" },
{ F|O, "ConstrainedBackgroundMesh" , opt_mesh_constrained_bgmesh, 0. ,
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 972d71f2f2f14c140afe329b371047e52b26a022..28786b4b36bee4251b533fc7eb9bb89f0e262268 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.574 2006-11-30 13:55:20 geuzaine Exp $
+// $Id: GUI.cpp,v 1.575 2006-11-30 14:09:07 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -2271,7 +2271,7 @@ void GUI::create_option_window()
mesh_value[2]->align(FL_ALIGN_RIGHT);
mesh_value[2]->callback(mesh_options_ok_cb);
- mesh_butt[1] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 6 * BH, BW, BH, "Compute characteritic lenghts automatically using curvature" );
+ mesh_butt[1] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 6 * BH, BW, BH, "Compute characteritic lenghts automatically from curvatures" );
mesh_butt[1]->type(FL_TOGGLE_BUTTON);
mesh_butt[1]->callback(mesh_options_ok_cb);
@@ -2491,7 +2491,7 @@ void GUI::create_option_window()
Fl_Group *o = new Fl_Group(L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Aspect");
o->hide();
- mesh_value[9] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Explosion factor");
+ mesh_value[9] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Element shrinking factor");
mesh_value[9]->minimum(0);
mesh_value[9]->maximum(1);
mesh_value[9]->step(0.01);
@@ -3053,7 +3053,7 @@ void GUI::create_option_window()
Fl_Group *o = new Fl_Group(L + WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Aspect");
o->hide();
- view_value[12] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Explosion factor");
+ view_value[12] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Element shrinking factor");
view_value[12]->minimum(0.);
view_value[12]->step(0.01);
view_value[12]->maximum(1.);
diff --git a/doc/gmsh.1 b/doc/gmsh.1
index 3c7704ee32655f89f4fbc305ecc18fe240d56cf4..5fb1e3003629678bc56ddf310a2c77de8dda68c0 100644
--- a/doc/gmsh.1
+++ b/doc/gmsh.1
@@ -1,4 +1,4 @@
-.\" $Id: gmsh.1,v 1.73 2006-11-27 03:19:48 geuzaine Exp $
+.\" $Id: gmsh.1,v 1.74 2006-11-30 14:09:07 geuzaine Exp $
.TH Gmsh 1 "09 March 2006" "Gmsh 2.0" "Gmsh Manual Pages"
.UC 4
.\" ********************************************************************
@@ -60,15 +60,11 @@ optimize quality of tetrahedral elements.
.B \-order int
set mesh order (1, 2).
.TP 4
-.B \-scale float
-set global scaling factor to the model.
-.TP 4
-.B \-meshscale float
-set global scaling factor to the mesh output.
-.TP 4
.B \-clscale float
set global scaling factor to the mesh characteristic lengths in the
model.
+.B \-clcurv
+Compute characteristic lengths from curvatures
.TP 4
.B \-rand float
set random perturbation factor.
diff --git a/doc/texinfo/command_line.texi b/doc/texinfo/command_line.texi
index 48e42099451503be09432ff7a2879f2da6a06797..b6edbfb54dcd0b3ca721b0346c94c2ee38303116 100644
--- a/doc/texinfo/command_line.texi
+++ b/doc/texinfo/command_line.texi
@@ -26,12 +26,10 @@ Set number of mesh smoothing steps
Optimize quality of tetrahedral elements
@item -order int
Set the order of the generated elements (1, 2)
-@item -scale float
-Set global scaling factor
-@item -meshscale float
-Set mesh scaling factor
@item -clscale float
Set characteristic length scaling factor
+@item -clcurv
+Compute characteristic lengths from curvatures
@item -rand float
Set random perturbation factor
@item -bgm file
diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi
index 3254b997884a2615e2f5076d7a5c885816706158..7621f7aafe755a2a39d658cf1fb85ae26dfa20d7 100644
--- a/doc/texinfo/opt_mesh.texi
+++ b/doc/texinfo/opt_mesh.texi
@@ -24,21 +24,21 @@ Threshold angle below which normals are not smoothed@*
Default value: @code{30}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.BetaSmoothMetric
-Maximum ratio of two consecutive edge lengths@*
-Default value: @code{0.9}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.BdfFieldFormat
Field format for Nastran BDF files (0=free, 1=small, 2=large)@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
@item Mesh.CharacteristicLengthFactor
-Factor applied to all characteristic lengths (and background meshes)@*
+Factor applied to all characteristic lengths@*
Default value: @code{1}@*
Saved in: @code{General.OptionsFileName}
+@item Mesh.CharacteristicLengthFromCurvature
+Compute characteritic lenghts automatically from curvatures@*
+Default value: @code{0}@*
+Saved in: @code{General.OptionsFileName}
+
@item Mesh.ColorCarousel
Mesh coloring (0=by element type, 1=by elementary entity, 2=by physical entity, 3=by partition)@*
Default value: @code{1}@*
@@ -89,21 +89,11 @@ Fourth cut plane equation coefficient (`D' in `AX+BY+CZ+D=0')@*
Default value: @code{0}@*
Saved in: @code{-}
-@item Mesh.DihedralAngleTol
-Dihedral angle tolerance for edge creation in the remesher@*
-Default value: @code{22}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.Dual
Display the dual mesh obtained by barycentric subdivision@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.EdgeProlongationThreshold
-Edge prolongation threshold in the remesher@*
-Default value: @code{1}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.ElementOrder
Element order (1=linear elements, 2=quadratic elements)@*
Default value: @code{1}@*
@@ -169,11 +159,6 @@ Minimum number of points used to mesh a circle@*
Default value: @code{7}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.MinimumElementSizeFact
-Minimum element size factor in the Remesher@*
-Default value: @code{500}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.MshBinary
Write MSH files in binary format?@*
Default value: @code{0}@*
@@ -184,11 +169,6 @@ Version of the MSH file format to use@*
Default value: @code{2}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.NbElemsPerRadiusOfCurv
-Number of elements per radius of curvature in the remesher@*
-Default value: @code{5}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.NbHexahedra
Number of hexahedra in the current mesh (read-only)@*
Default value: @code{0}@*
@@ -349,11 +329,6 @@ Smooth the mesh normals?@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.SpeedMax
-Disable dubious point insertion tests@*
-Default value: @code{0}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.StlDistanceTol
Distance tolerance between two distinct vertices in STL meshes@*
Default value: @code{5e-07}@*
@@ -384,11 +359,6 @@ Display size of tangent vectors (in pixels)@*
Default value: @code{0}@*
Saved in: @code{General.OptionsFileName}
-@item Mesh.TargetElmentSizeFact
-Target element size factor in the Remesher@*
-Default value: @code{20}@*
-Saved in: @code{General.OptionsFileName}
-
@item Mesh.Tetrahedra
Display mesh tetrahedra?@*
Default value: @code{1}@*
diff --git a/doc/texinfo/opt_plugin.texi b/doc/texinfo/opt_plugin.texi
index cd7039892f8980588a58c7b4138cab899062aa73..4e0bf1a243fb0cc1e0f9cf96db92867137181974 100644
--- a/doc/texinfo/opt_plugin.texi
+++ b/doc/texinfo/opt_plugin.texi
@@ -690,9 +690,9 @@ Default value: @code{-1}
Plugin(Transform) transforms the homogeneous
node coordinates (x,y,z,1) of the elements in
the view `iView' by the matrix
-[`A11' `A12' `A13' `T1']
-[`A21' `A22' `A23' `T2']
-[`A31' `A32' `A33' `T3'].
+[`A11' `A12' `A13' `Tx']
+[`A21' `A22' `A23' `Ty']
+[`A31' `A32' `A33' `Tz'].
If `SwapOrientation' is set, the orientation of the
elements is reversed. If `iView' < 0, the plugin
is run on the current view.
@@ -719,11 +719,11 @@ Default value: @code{0}
Default value: @code{0}
@item A33
Default value: @code{1}
-@item T1
+@item Tx
Default value: @code{0}
-@item T2
+@item Ty
Default value: @code{0}
-@item T3
+@item Tz
Default value: @code{0}
@item SwapOrientation
Default value: @code{0}