From 6123a3ec48eb90d3a7212ad2b76cce4d9ed77264 Mon Sep 17 00:00:00 2001 From: Daniel Garcia-Sanchez Date: Thu, 25 Jan 2018 21:26:28 +0100 Subject: [PATCH] Add Transfinite Line --- tests/gmsh/create_tria_01.cc | 11 ++++++++--- tests/gmsh/create_tria_01.output | 27 +++++++++------------------ tests/quick_tests/gmsh.cc | 12 +++++++++--- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/tests/gmsh/create_tria_01.cc b/tests/gmsh/create_tria_01.cc index a48d393fe4..3a9c90abeb 100644 --- a/tests/gmsh/create_tria_01.cc +++ b/tests/gmsh/create_tria_01.cc @@ -51,10 +51,15 @@ int main () << "Line(2) = {2, 3};" << std::endl << "Line(3) = {3, 4};" << std::endl << "Line(4) = {4, 1};" << std::endl + << "Transfinite Line {1} = 2 Using Progression 1;" << std::endl + << "Transfinite Line {2} = 2 Using Progression 1;" << std::endl + << "Transfinite Line {3} = 2 Using Progression 1;" << std::endl + << "Transfinite Line {4} = 2 Using Progression 1;" << std::endl << "Line Loop(5) = {3, 4, 1, 2};" << std::endl - << "Plane Surface(0) = {5};" << std::endl - << "Transfinite Surface{0} = {5};" << std::endl - << "Recombine Surface {0};" << std::endl; + << "Plane Surface(6) = {5};" << std::endl + << "Transfinite Surface {6};" << std::endl + << "Recombine Surface {6};" << std::endl + << "Physical Surface(\"dealii_surface\") = {6};" << std::endl; geo.close(); diff --git a/tests/gmsh/create_tria_01.output b/tests/gmsh/create_tria_01.output index 053731e3d2..6a5d2db40b 100644 --- a/tests/gmsh/create_tria_01.output +++ b/tests/gmsh/create_tria_01.output @@ -1,31 +1,22 @@ -DEAL:: 2 active cells -DEAL:: hash=2 +DEAL:: 1 active cells +DEAL:: hash=0 $MeshFormat 2.2 0 8 $EndMeshFormat +$PhysicalNames +1 +2 1 "dealii_surface" +$EndPhysicalNames $Nodes -6 +4 1 0 0 0 2 25 0 0 3 25 1 0 4 0 1 0 -5 12.49999999995592 0 0 -6 12.50000000006453 1 0 $EndNodes $Elements -12 -1 15 2 0 1 1 -2 15 2 0 2 2 -3 15 2 0 3 3 -4 15 2 0 4 4 -5 1 2 0 1 1 5 -6 1 2 0 1 5 2 -7 1 2 0 2 2 3 -8 1 2 0 3 3 6 -9 1 2 0 3 6 4 -10 1 2 0 4 4 1 -11 3 2 0 0 3 6 5 2 -12 3 2 0 0 6 4 1 5 +1 +1 3 2 1 6 3 4 1 2 $EndElements diff --git a/tests/quick_tests/gmsh.cc b/tests/quick_tests/gmsh.cc index 85c9d684d1..f7d534bf55 100644 --- a/tests/quick_tests/gmsh.cc +++ b/tests/quick_tests/gmsh.cc @@ -31,10 +31,16 @@ int main () << "Line(2) = {2, 3};" << std::endl << "Line(3) = {3, 4};" << std::endl << "Line(4) = {4, 1};" << std::endl + << "Transfinite Line {1} = 2 Using Progression 1;" << std::endl + << "Transfinite Line {2} = 2 Using Progression 1;" << std::endl + << "Transfinite Line {3} = 2 Using Progression 1;" << std::endl + << "Transfinite Line {4} = 2 Using Progression 1;" << std::endl << "Line Loop(5) = {3, 4, 1, 2};" << std::endl - << "Plane Surface(0) = {5};" << std::endl - << "Transfinite Surface{0} = {5};" << std::endl - << "Recombine Surface {0};" << std::endl; + << "Plane Surface(6) = {5};" << std::endl + << "Transfinite Surface {6};" << std::endl + << "Recombine Surface {6};" << std::endl + << "Physical Surface(\"dealii_surface\") = {6};" << std::endl; + geo.close(); const int ierr = std::system(DEAL_II_GMSH_EXECUTABLE_PATH " -2 file.geo 1>file.log 2>file_warn.log"); -- 2.39.5