diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp index 218d49e9849bc014acf51bba9c4ad11be41a77f3..be24d3f03357fa4ff6e8a21fce24838667be968a 100644 --- a/Plugin/Triangulate.cpp +++ b/Plugin/Triangulate.cpp @@ -185,7 +185,7 @@ PView *GMSH_TriangulatePlugin::execute(PView *v) } #else // new code - Msg::Info("Triangulating data points (new code)..."); + Msg::Info("Using new triangulation code"); std::vector<MTriangle*> tris; for(unsigned int i = 0; i < points.size(); i++) { double XX = 1.e-12 * lc * (double)rand() / (double)RAND_MAX; diff --git a/benchmarks/misc/adaptive_constant.msh b/benchmarks/misc/adaptive_constant.msh new file mode 100644 index 0000000000000000000000000000000000000000..00dfbab22c3fb7d90bea2203a4f3e1399714189a --- /dev/null +++ b/benchmarks/misc/adaptive_constant.msh @@ -0,0 +1,154 @@ +$MeshFormat +2 0 8 +$EndMeshFormat +$Nodes +67 +1 0 0 0 +2 1 0 0 +3 0 1 0 +4 -1 0 0 +5 0 -1 0 +6 0 0 -1 +7 0 0 1 +8 0.7071067811872801 0.7071067811858149 0 +9 0.9238795325113339 0.382683432364976 0 +10 0.3826834323655056 0.9238795325111144 0 +11 -0.7071067811858149 0.7071067811872801 0 +12 -0.382683432364976 0.9238795325113339 0 +13 -0.9238795325111144 0.3826834323655056 0 +14 -0.7071067811872801 -0.7071067811858149 0 +15 -0.9238795325113339 -0.382683432364976 0 +16 -0.3826834323655056 -0.9238795325111144 0 +17 0.7071067811858149 -0.7071067811872801 0 +18 0.382683432364976 -0.9238795325113339 0 +19 0.9238795325111144 -0.3826834323655056 0 +20 0 0.7071067811872801 -0.7071067811858149 +21 0 0.9238795325113339 -0.382683432364976 +22 0 0.3826834323655056 -0.9238795325111144 +23 0 -0.7071067811858149 -0.7071067811872801 +24 0 -0.382683432364976 -0.9238795325113339 +25 0 -0.9238795325111144 -0.3826834323655056 +26 0 -0.7071067811872801 0.7071067811858149 +27 0 -0.9238795325113339 0.382683432364976 +28 0 -0.3826834323655056 0.9238795325111144 +29 0 0.7071067811858149 0.7071067811872801 +30 0 0.382683432364976 0.9238795325113339 +31 0 0.9238795325111144 0.3826834323655056 +32 0.7071067811872801 0 0.7071067811858149 +33 0.9238795325113339 0 0.382683432364976 +34 0.3826834323655056 0 0.9238795325111144 +35 -0.7071067811858149 0 0.7071067811872801 +36 -0.382683432364976 0 0.9238795325113339 +37 -0.9238795325111144 0 0.3826834323655056 +38 -0.7071067811872801 0 -0.7071067811858149 +39 -0.9238795325113339 0 -0.382683432364976 +40 -0.3826834323655056 0 -0.9238795325111144 +41 0.7071067811858149 0 -0.7071067811872801 +42 0.382683432364976 0 -0.9238795325113339 +43 0.9238795325111144 0 -0.3826834323655056 +44 -0.4771133662359368 0.7380553309325973 0.4771133662359369 +45 -0.8521312609048806 0.396075394124286 0.3420476521742986 +46 -0.3420476521735938 0.3960753941232533 0.8521312609056433 +47 -0.4771133662359368 -0.4771133662359368 0.7380553309325973 +48 -0.3420476521744791 -0.8521312609052754 0.3960753941232806 +49 -0.8521312609052485 -0.3420476521734134 0.3960753941242587 +50 0.477113366236492 0.7380553309318796 0.477113366236492 +51 0.8521312609056433 0.3960753941232533 0.3420476521735938 +52 0.3420476521744791 0.3960753941232806 0.8521312609052754 +53 -0.477113366236492 0.477113366236492 -0.7380553309318795 +54 -0.8521312609052754 0.3420476521744791 -0.3960753941232806 +55 -0.3420476521735938 0.8521312609056433 -0.3960753941232533 +56 0.4771133662359368 0.4771133662359368 -0.7380553309325973 +57 0.3420476521744791 0.8521312609052754 -0.3960753941232806 +58 0.8521312609052485 0.3420476521734134 -0.3960753941242587 +59 -0.477113366236492 -0.7380553309318796 -0.477113366236492 +60 -0.8521312609056433 -0.3960753941232533 -0.3420476521735938 +61 -0.3420476521744791 -0.3960753941232806 -0.8521312609052754 +62 0.477113366236492 -0.477113366236492 0.7380553309318795 +63 0.8521312609052754 -0.3420476521744791 0.3960753941232806 +64 0.3420476521735938 -0.8521312609056433 0.3960753941232533 +65 0.7380553309318796 -0.477113366236492 -0.477113366236492 +66 0.3960753941232533 -0.3420476521735938 -0.8521312609056433 +67 0.3960753941232806 -0.8521312609052754 -0.3420476521744791 +$EndNodes +$Elements +63 +1 15 3 0 1 0 1 +2 15 3 0 2 0 2 +3 15 3 0 3 0 3 +4 15 3 0 4 0 4 +5 15 3 0 5 0 5 +6 15 3 0 6 0 6 +7 15 3 0 7 0 7 +8 8 3 0 1 0 2 8 9 +9 8 3 0 1 0 8 3 10 +10 8 3 0 2 0 3 11 12 +11 8 3 0 2 0 11 4 13 +12 8 3 0 3 0 4 14 15 +13 8 3 0 3 0 14 5 16 +14 8 3 0 4 0 5 17 18 +15 8 3 0 4 0 17 2 19 +16 8 3 0 5 0 3 20 21 +17 8 3 0 5 0 20 6 22 +18 8 3 0 6 0 6 23 24 +19 8 3 0 6 0 23 5 25 +20 8 3 0 7 0 5 26 27 +21 8 3 0 7 0 26 7 28 +22 8 3 0 8 0 7 29 30 +23 8 3 0 8 0 29 3 31 +24 8 3 0 9 0 2 32 33 +25 8 3 0 9 0 32 7 34 +26 8 3 0 10 0 7 35 36 +27 8 3 0 10 0 35 4 37 +28 8 3 0 11 0 4 38 39 +29 8 3 0 11 0 38 6 40 +30 8 3 0 12 0 6 41 42 +31 8 3 0 12 0 41 2 43 +32 9 3 0 14 0 3 11 29 12 44 31 +33 9 3 0 14 0 11 35 29 45 46 44 +34 9 3 0 14 0 11 4 35 13 37 45 +35 9 3 0 14 0 29 35 7 46 36 30 +36 9 3 0 16 0 7 35 26 36 47 28 +37 9 3 0 16 0 26 14 5 48 16 27 +38 9 3 0 16 0 26 35 14 47 49 48 +39 9 3 0 16 0 35 4 14 37 15 49 +40 9 3 0 18 0 3 29 8 31 50 10 +41 9 3 0 18 0 8 32 2 51 33 9 +42 9 3 0 18 0 8 29 32 50 52 51 +43 9 3 0 18 0 29 7 32 30 34 52 +44 9 3 0 20 0 6 38 20 40 53 22 +45 9 3 0 20 0 38 11 20 54 55 53 +46 9 3 0 20 0 38 4 11 39 13 54 +47 9 3 0 20 0 20 11 3 55 12 21 +48 9 3 0 22 0 6 20 41 22 56 42 +49 9 3 0 22 0 20 8 41 57 58 56 +50 9 3 0 22 0 20 3 8 21 10 57 +51 9 3 0 22 0 41 8 2 58 9 43 +52 9 3 0 24 0 5 14 23 16 59 25 +53 9 3 0 24 0 14 38 23 60 61 59 +54 9 3 0 24 0 14 4 38 15 39 60 +55 9 3 0 24 0 23 38 6 61 40 24 +56 9 3 0 26 0 7 26 32 28 62 34 +57 9 3 0 26 0 32 17 2 63 19 33 +58 9 3 0 26 0 32 26 17 62 64 63 +59 9 3 0 26 0 26 5 17 27 18 64 +60 9 3 0 28 0 2 17 41 19 65 43 +61 9 3 0 28 0 41 23 6 66 24 42 +62 9 3 0 28 0 41 17 23 65 67 66 +63 9 3 0 28 0 17 5 23 18 25 67 +$EndElements +$ElementData +1 +"2nd order view" +1 +0.0 +3 +0 +1 +5 +32 1 +33 2 +34 3 +35 4 +36 5 +$EndElementData diff --git a/benchmarks/misc/cutplane.geo b/benchmarks/misc/cutplane.geo new file mode 100644 index 0000000000000000000000000000000000000000..5a864a1347306c6d2aed6feaead5e88fbb6a9f9b --- /dev/null +++ b/benchmarks/misc/cutplane.geo @@ -0,0 +1,14 @@ +If(!PostProcessing.NbViews) + Merge "../../tutorial/view1.pos"; + Merge "../../tutorial/view1.pos"; +EndIf +DefineConstant[ + DD = {0, Name "Plane", Min -0.1, Max 0, Step 0.01, + Help "Variable utilis�e dans le script CutPlane"}, + ss = {"cutplane.script", Name "Cut Plane", Macro "Gmsh", + Help Str["Lancer le script CutPlane", "Ca demande simplement � Gmsh de parser le fichier"], + AutoCheck 0} +]; + +View[0].IntervalsType = 1; +CopyOptions View[0,1]; diff --git a/benchmarks/misc/cutplane.script b/benchmarks/misc/cutplane.script new file mode 100644 index 0000000000000000000000000000000000000000..55a31101709abfbfbda1c90415e263d580a48b04 --- /dev/null +++ b/benchmarks/misc/cutplane.script @@ -0,0 +1,4 @@ +Printf("DD = %g", DD); +Plugin(CutPlane).View = 0 ; +Plugin(CutPlane).D = DD; +Plugin(CutPlane).Run ;