From df0b19275b79a9733fda6750c1c340e5fc11047e Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <mhochsteger@cerbsim.com>
Date: Mon, 17 Feb 2020 15:21:54 +0100
Subject: [PATCH] Update rules to match cpp files, regenerate cpp files

---
 libsrc/meshing/quadrls.cpp  |   6 +-
 libsrc/meshing/tetrarls.cpp |   3 +-
 rules/quad.rls              | 122 ++++++++++++++++++++++++++++++++++++
 rules/tetra.rls             |   2 +-
 4 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/libsrc/meshing/quadrls.cpp b/libsrc/meshing/quadrls.cpp
index 1c2cd23b..3cdda391 100644
--- a/libsrc/meshing/quadrls.cpp
+++ b/libsrc/meshing/quadrls.cpp
@@ -179,9 +179,9 @@ const char * quadrules[] = {
 "(0, 1) { 1 X2, -1 X3 } { 1 Y3 };\n",\
 "\n",\
 "newlines\n",\
-"(1, 4)\n;",\
-"(4, 3)\n;",\
-"(3, 2)\n;",\
+"(1, 4);\n",\
+"(4, 3);\n",\
+"(3, 2);\n",\
 "\n",\
 "freearea\n",\
 "(0, 0);\n",\
diff --git a/libsrc/meshing/tetrarls.cpp b/libsrc/meshing/tetrarls.cpp
index cb28648b..37f55355 100644
--- a/libsrc/meshing/tetrarls.cpp
+++ b/libsrc/meshing/tetrarls.cpp
@@ -1461,6 +1461,7 @@ const char * tetrules[] = {
 "(0.5, 0.866, 0) { 1 X3 } { 1 Y3 } { };\n",\
 "(0.5, 0.288, -0.15) { 0.333 X2, 0.333 X3 } { 0.333 Y3 } { };\n",\
 "\n",\
-"endrule\n",
+"endrule\n",\
+"\n",\
 0};
 }
diff --git a/rules/quad.rls b/rules/quad.rls
index b2ef50be..1716d308 100644
--- a/rules/quad.rls
+++ b/rules/quad.rls
@@ -160,6 +160,49 @@ orientations
 endrule
 
 
+rule "Quad P Right (150)"
+
+quality 150
+
+mappoints
+(0, 0);
+(1, 0);
+(1, 1);
+
+maplines
+(1, 2) del;
+
+newpoints
+(0, 1) { 1 X2, -1 X3 } { 1 Y3 };
+
+newlines
+(1, 4);
+(4, 3);
+(3, 2);
+
+freearea
+(0, 0);
+(1, 0) { 1 X2 } { };
+(1.2, 0.5) { 0.7 X2, 0.5 X3 } { 0.5 Y3 };
+(1, 1) { 1 X3 } { 1 Y3 };
+(-0.5, 1.5) { -2 X2, 1.5 X3 } { 1.5 Y3 };
+
+freearea2
+(0, 0);
+(1, 0) { 1 X2 } { };
+(1, 0.5) { 0.5 X2, 0.5 X3 } { 0.5 Y3 };
+(1, 1) { 1 X3 } { 1 Y3 };
+(0, 1) { 1 X2, -1 X3 } { 1 Y3 };
+
+elements
+(1, 2, 3, 4);
+
+orientations
+(1, 2, 3);
+
+endrule
+
+
 rule "Quad Right PL (2)"
 
 quality 2
@@ -297,6 +340,48 @@ endrule
 
 
 
+rule "Left P Quad (150)"
+
+quality 150
+
+mappoints
+(0, 0);
+(1, 0);
+(0, 1);
+
+maplines
+(1, 2) del;
+
+newpoints
+(1, 1) { 1 X2, -1 X3 } { 1 Y3 };
+
+newlines
+(1, 3);
+(3, 4);
+(4, 2);
+
+freearea
+(0, 0);
+(1, 0) { 1 X2 } { };
+(1.5, 1.5) { 1.5 X2, 1.5 X3 } { 1.5 Y3 };
+(0, 1) { 1 X3 } { 1 Y3 };
+(-0.2, 0.6) { -0.2 X2, 0.6 X3 } { 0.6 Y3 };
+
+freearea2
+(0, 0);
+(1, 0) { 1 X2 } { };
+(1, 1) { 1 X2, -1 X3 } { 1 Y3 };
+(0, 1) { 1 X3 } { 1 Y3 };
+(0, 0.5) { 0.5 X3 } { 0.5 Y3 };
+
+elements
+(1, 2, 4, 3);
+
+endrule
+
+
+
+
 
 rule "Left Quad RP (2)"
 
@@ -714,6 +799,43 @@ endrule
 
 
 
+rule "Triangle Vis A Vis (200)"
+
+quality 200
+
+mappoints
+(0, 0);
+(1, 0);
+(0.5, 0.866);
+
+maplines
+(1, 2) del;
+
+newpoints
+
+newlines
+(1, 3);
+(3, 2);
+
+freearea
+(0, 0);
+(1, 0) { 1 X2 } { };
+(1.2, 0.693) { 0.8 X2, 0.8 X3 } { 0.8 Y2, 0.8 Y3 };
+(0.5, 0.866) { 1 X3 } { 1 Y3 };
+(-0.2, 0.693) { -0.6 X2, 0.8 X3 } { -0.6 Y2, 0.8 Y3 };
+
+freearea2
+(0, 0);
+(1, 0) { 1 X2 } { };
+(0.75, 0.433) { 0.5 X2, 0.5 X3 } { 0.5 Y2, 0.5 Y3 };
+(0.5, 0.866) { 1 X3 } { 1 Y3 };
+(0.25, 0.433) { 0.5 X3 } { 0.5 Y3 };
+
+elements
+(1, 2, 3);
+
+endrule
+
 
 
 rule "2 h Vis A Vis (1)"
diff --git a/rules/tetra.rls b/rules/tetra.rls
index c6b50f04..faad6c43 100644
--- a/rules/tetra.rls
+++ b/rules/tetra.rls
@@ -139,7 +139,7 @@ endrule
 
 rule "Tetrahedron Vis a Vis Point (1)"
 
-quality 1
+quality 100
 
 mappoints
 (0, 0, 0);