diff --git a/libsrc/meshing/pyramid2rls.cpp b/libsrc/meshing/pyramid2rls.cpp index acd28930..a97e7f13 100644 --- a/libsrc/meshing/pyramid2rls.cpp +++ b/libsrc/meshing/pyramid2rls.cpp @@ -3,55 +3,6 @@ namespace netgen const char * pyramidrules2[] = { "tolfak 0.5\n",\ "\n",\ -"rule \"Large pyramid on quad\"\n",\ -"\n",\ -"quality 1\n",\ -"\n",\ -"mappoints\n",\ -"(0, 0, 0);\n",\ -"(1, 0, 0);\n",\ -"(1, 1, 0);\n",\ -"(0, 1, 0);\n",\ -"\n",\ -"mapfaces\n",\ -"(1, 2, 3, 4) del;\n",\ -"\n",\ -"newpoints\n",\ -"(0.5, 0.5, -3)\n",\ -" { 0.25 X1, 0.25 X2, 0.25 X3, 0.25 X4 }\n",\ -" { 0.25 Y1, 0.25 Y2, 0.25 Y3, 0.25 Y4 } { };\n",\ -"\n",\ -"newfaces\n",\ -"(1, 2, 5);\n",\ -"(2, 3, 5);\n",\ -"(3, 4, 5);\n",\ -"(4, 1, 5);\n",\ -"\n",\ -"elements\n",\ -"(1, 2, 3, 4, 5);\n",\ -"\n",\ -"freezone2\n",\ -"{ 1 P1 };\n",\ -"{ 1 P2 };\n",\ -"{ 1 P3 };\n",\ -"{ 1 P4 };\n",\ -"{ 1.4 P5, -0.1 P1, -0.1 P2, -0.1 P3, -0.1 P4 };\n",\ -"\n",\ -"freezonelimit\n",\ -"{ 1 P1 };\n",\ -"{ 1 P2 };\n",\ -"{ 1 P3 };\n",\ -"{ 1 P4 };\n",\ -"{ 1 P5 };\n",\ -"\n",\ -"freeset\n",\ -"1 2 3 5;\n",\ -"\n",\ -"freeset\n",\ -"1 3 4 5;\n",\ -"\n",\ -"endrule\n",\ -"\n",\ "rule \"Pyramid on quad\"\n",\ "\n",\ "quality 100\n",\ @@ -156,7 +107,7 @@ const char * pyramidrules2[] = { "\n",\ "rule \"connect pyramid\"\n",\ "\n",\ -"quality 1\n",\ +"quality 100\n",\ "\n",\ "mappoints\n",\ "(0, 0, 0);\n",\ diff --git a/libsrc/meshing/pyramidrls.cpp b/libsrc/meshing/pyramidrls.cpp index d4e997c1..a87686b2 100644 --- a/libsrc/meshing/pyramidrls.cpp +++ b/libsrc/meshing/pyramidrls.cpp @@ -5,7 +5,7 @@ const char * pyramidrules[] = { "\n",\ "rule \"Pyramid on quad\"\n",\ "\n",\ -"quality 100\n",\ +"quality 10\n",\ "\n",\ "mappoints\n",\ "(0, 0, 0);\n",\ diff --git a/rules/pyramids.rls b/rules/pyramids.rls index 3d6839a4..09b2355d 100644 --- a/rules/pyramids.rls +++ b/rules/pyramids.rls @@ -2,7 +2,7 @@ tolfak 0.5 rule "Pyramid on quad" -quality 100 +quality 10 mappoints (0, 0, 0); diff --git a/rules/pyramids2.rls b/rules/pyramids2.rls index 54101844..8e659bce 100644 --- a/rules/pyramids2.rls +++ b/rules/pyramids2.rls @@ -1,54 +1,5 @@ tolfak 0.5 -rule "Large pyramid on quad" - -quality 1 - -mappoints -(0, 0, 0); -(1, 0, 0); -(1, 1, 0); -(0, 1, 0); - -mapfaces -(1, 2, 3, 4) del; - -newpoints -(0.5, 0.5, -3) - { 0.25 X1, 0.25 X2, 0.25 X3, 0.25 X4 } - { 0.25 Y1, 0.25 Y2, 0.25 Y3, 0.25 Y4 } { }; - -newfaces -(1, 2, 5); -(2, 3, 5); -(3, 4, 5); -(4, 1, 5); - -elements -(1, 2, 3, 4, 5); - -freezone2 -{ 1 P1 }; -{ 1 P2 }; -{ 1 P3 }; -{ 1 P4 }; -{ 1.4 P5, -0.1 P1, -0.1 P2, -0.1 P3, -0.1 P4 }; - -freezonelimit -{ 1 P1 }; -{ 1 P2 }; -{ 1 P3 }; -{ 1 P4 }; -{ 1 P5 }; - -freeset -1 2 3 5; - -freeset -1 3 4 5; - -endrule - rule "Pyramid on quad" quality 100 @@ -153,7 +104,7 @@ endrule rule "connect pyramid" -quality 1 +quality 100 mappoints (0, 0, 0);