From fa7e92dd33c7dccceaa29fcd85803be4509e6dc1 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Mon, 28 Nov 2016 14:58:06 +0000 Subject: [PATCH] --- benchmarks/3d/CubeAnisoBL.geo | 55 --------------------------- benchmarks/3d/Submarine/Submarine.geo | 7 ++-- doc/VERSIONS.txt | 4 +- doc/texinfo/opt_fields.texi | 20 +++------- doc/texinfo/opt_geometry.texi | 2 +- doc/texinfo/opt_mesh.texi | 11 ++---- doc/texinfo/opt_view.texi | 2 +- doc/texinfo/shortcuts.texi | 2 - 8 files changed, 16 insertions(+), 87 deletions(-) delete mode 100644 benchmarks/3d/CubeAnisoBL.geo diff --git a/benchmarks/3d/CubeAnisoBL.geo b/benchmarks/3d/CubeAnisoBL.geo deleted file mode 100644 index 40265e9da4..0000000000 --- a/benchmarks/3d/CubeAnisoBL.geo +++ /dev/null @@ -1,55 +0,0 @@ -Mesh.Algorithm = 7; //Bamg -Mesh.Algorithm3D= 7; //mmg3d -lc = 0.1; - -Point(1) = {0.0,0.0,0.0,lc}; -Point(2) = {1,0.0,0.0,lc}; -Point(3) = {1,1,0.0,lc}; -Point(4) = {0,1,0.0,lc}; -Line(1) = {4,3}; -Line(2) = {3,2}; -Line(3) = {2,1}; -Line(4) = {1,4}; -Line Loop(5) = {2,3,4,1}; -Plane Surface(6) = {5}; -Extrude Surface { 6, {0,0.0,1} }; - -/* -Field[1] = Attractor; -Field[1].FacesList = {23}; -Field[1].NNodesByEdge = 100; - -Field[2] = Threshold; -Field[2].IField = 1; -Field[2].DistMax = 0.3; -Field[2].DistMin = 0.05; -Field[2].LcMax = 0.1; -Field[2].LcMin = 0.01; -Background Field = 2; - -Field[3] = BoundaryLayer; -Field[3].IField = 1; -Field[3].hfar = 0.1; -Field[3].hwall_n = 0.005; -Field[3].hwall_t = 0.1; -Background Field = 3; -*/ - -/* -Field[1] = BoundaryLayer; -Field[1].FaceList = {23}; -Field[1].hfar = 0.01; -Field[1].hwall_n = 0.005; -Field[1].hwall_t = 0.1; -Field[1].ratio = 1.0; -Field[1].thickness = 0.5; -Background Field = 1; -*/ - -Field[1] = BoundaryLayer; -Field[1].FacesList = {23}; -Field[1].hfar = 0.1; -Field[1].hwall_n = 0.005; -Field[1].hwall_t = 0.1; -Field[1].thickness = 0.04; -Background Field = 1; diff --git a/benchmarks/3d/Submarine/Submarine.geo b/benchmarks/3d/Submarine/Submarine.geo index c134f7c03c..f08281c4e7 100644 --- a/benchmarks/3d/Submarine/Submarine.geo +++ b/benchmarks/3d/Submarine/Submarine.geo @@ -11,9 +11,9 @@ Mesh.Recombine3DLevel = 2; Mesh.Recombine3DConformity = 4; Mesh.SaveParametric = 1; -MeshAlgorithm Surface {12} 5; //Not in final mesh -MeshAlgorithm Surface {10} 5; -MeshAlgorithm Surface {11} 5; +MeshAlgorithm Surface {12} = 5; //Not in final mesh +MeshAlgorithm Surface {10} = 5; +MeshAlgorithm Surface {11} = 5; //Mesh.Algorithm=5; //Mesh.Algorithm3D=5; @@ -43,4 +43,3 @@ Physical Surface(2) = submarineSurf[]; Physical Surface(3) = {14,15}; Physical Volume(4) = {1}; Physical Line(5) = {30, 31}; - diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt index 0848b28dc5..ec669a9fdc 100644 --- a/doc/VERSIONS.txt +++ b/doc/VERSIONS.txt @@ -1,6 +1,6 @@ 2.15.0: fixed several regressions (multi-file partitioned grid export, mesh -subdivision, old compound mesher); simplified 2D boundary layer field; faster -rendering of large meshes. +subdivision, old compound mesher); improved 2D boundary layer field & removed +non-functional 3D boundary layer field; faster rendering of large meshes. 2.14.1 (October 30, 2016): fixed regression in periodic meshes; small bug fixes and code cleanups. diff --git a/doc/texinfo/opt_fields.texi b/doc/texinfo/opt_fields.texi index 048392fa74..fedfc6c408 100644 --- a/doc/texinfo/opt_fields.texi +++ b/doc/texinfo/opt_fields.texi @@ -121,24 +121,16 @@ default value: @code{10000000000} Indices of curves in the geometric model for which a boundary layer is needed@* type: list@* default value: @code{@{@}} -@item FacesList -Indices of faces in the geometric model for which a boundary layer is needed@* -type: list@* -default value: @code{@{@}} @item FanNodesList Indices of vertices in the geometric model for which a fan is created@* type: list@* default value: @code{@{@}} -@item FansList -Indices of edges in the geometric model for which a fan is created@* -type: list@* -default value: @code{@{@}} @item IntersectMetrics Intersect metrics of all faces@* type: integer@* default value: @code{0} @item NodesList -Indices of nodes in the geometric model@* +Indices of vertices in the geometric model for which a BL ends@* type: list@* default value: @code{@{@}} @item Quads @@ -153,10 +145,10 @@ default value: @code{1} Mesh Size Normal to the The Wall@* type: float@* default value: @code{0.1} -@item hwall_t -Mesh Size Tangent to the Wall@* -type: float@* -default value: @code{0.5} +@item hwall_n_nodes +Mesh Size Normal to the The Wall at nodes (overwrite hwall_n when defined)@* +type: list_double@* +default value: @code{@{@}} @item ratio Size Ratio Between Two Successive Layers@* type: float@* @@ -453,7 +445,7 @@ default value: @code{1} @item Z2 Z coordinate of endpoint 2@* type: float@* -default value: @code{1.086144306514449e-153} +default value: @code{2.53244204493764e-86} @end table @item Gradient diff --git a/doc/texinfo/opt_geometry.texi b/doc/texinfo/opt_geometry.texi index 6f4f048076..8e77965077 100644 --- a/doc/texinfo/opt_geometry.texi +++ b/doc/texinfo/opt_geometry.texi @@ -86,7 +86,7 @@ Saved in: @code{General.OptionsFileName} @item Geometry.LightTwoSide Light both sides of surfaces (leads to slower rendering)@* -Default value: @code{1}@* +Default value: @code{0}@* Saved in: @code{General.OptionsFileName} @item Geometry.Lines diff --git a/doc/texinfo/opt_mesh.texi b/doc/texinfo/opt_mesh.texi index 17c9a61c4d..0ba66946b0 100644 --- a/doc/texinfo/opt_mesh.texi +++ b/doc/texinfo/opt_mesh.texi @@ -270,13 +270,13 @@ Default value: @code{1}@* Saved in: @code{General.OptionsFileName} @item Mesh.LightLines -Enable lighting for mesh lines (element edges)@* -Default value: @code{1}@* +Enable lighting for mesh edges (0=no, 1=surfaces, 2=surfaces+volumes@* +Default value: @code{2}@* Saved in: @code{General.OptionsFileName} @item Mesh.LightTwoSide Light both sides of surfaces (leads to slower rendering)@* -Default value: @code{1}@* +Default value: @code{0}@* Saved in: @code{General.OptionsFileName} @item Mesh.Lines @@ -579,11 +579,6 @@ Number of refinement steps in the MeshAdapt-based 2D algorithms@* Default value: @code{10}@* Saved in: @code{General.OptionsFileName} -@item Mesh.ReverseAllNormals -Reverse all the mesh normals (for display)@* -Default value: @code{0}@* -Saved in: @code{General.OptionsFileName} - @item Mesh.SaveAll Ignore Physical definitions and save all elements@* Default value: @code{0}@* diff --git a/doc/texinfo/opt_view.texi b/doc/texinfo/opt_view.texi index abaa8c1bd5..4f9fda46b9 100644 --- a/doc/texinfo/opt_view.texi +++ b/doc/texinfo/opt_view.texi @@ -481,7 +481,7 @@ Saved in: @code{General.OptionsFileName} @item View.LightTwoSide Light both sides of surfaces (leads to slower rendering)@* -Default value: @code{1}@* +Default value: @code{0}@* Saved in: @code{General.OptionsFileName} @item View.LineType diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi index d7fa5aaf15..1b10fda48f 100644 --- a/doc/texinfo/shortcuts.texi +++ b/doc/texinfo/shortcuts.texi @@ -148,8 +148,6 @@ Hide/show mesh surface edges Same as Alt+t, but with numeric mode included @item Alt+Shift+v Hide/show mesh volume edges -@item Alt+Shift+w -Reverse all mesh normals @item Alt+Shift+x Set -X view @item Alt+Shift+y -- GitLab