Final fix of Eggshell & related.

Author: l-korous

hermes2d/include/mesh/mesh_util.h

@@ -144,7 +144,7 @@ namespace Hermes
     /                       \                   / son[0]\  \ /  /son[1] \
     /                         \                 /         \  *  /         \
     *-------------*-------------*               *-----------*   *-----------*
-    vn[0]      vn[1] vn[2] vn[0]      vn[1]
+    vn[0]                     vn[1]          vn[2]          vn[0]         vn[1]
     vn[0]           en[0]           vn[1]
 
     -Triangle to quads refinement
@@ -166,8 +166,8 @@ namespace Hermes
     /                       \               /  son[0]   | |  son[1]   \
     /                         \             /            | |            \
     *-------------*-------------*           *-------------* *-------------*
-    vn[0]      vn[1]   vn[0]        vn[1]
-    vn[0]           en[0]           vn[1]
+    vn[0]                      vn[1]      vn[0]                       vn[1]
+    vn[0]                                             en[0]           vn[1]
 
     node and son numbering on a quad:          refinement '0':
 

hermes2d/src/mesh/mesh.cpp

@@ -398,7 +398,7 @@ namespace Hermes
       x2 = get_vertex_node(e->vn[2]->id, e->vn[0]->id);
 
       CurvMap* cm[H2D_MAX_NUMBER_EDGES];
-      memset(cm, 0, sizeof(cm));
+      memset(cm, 0, H2D_MAX_NUMBER_EDGES * sizeof(CurvMap*));
 
       // adjust mid-edge coordinates if this is a curved element
       if(e->is_curved())

hermes2d/src/space/space.cpp

@@ -1088,10 +1088,7 @@ namespace Hermes
           int j = e->next_vert(i);
           if (e->vn[i]->bnd && e->vn[j]->bnd)
           {
-            Element* parent = e;
-            while(parent->parent != nullptr)
-              parent = parent->parent;
-            SurfPos surf_pos = { 0, i, parent, e->vn[i]->id, e->vn[j]->id, 0.0, 0.0, 1.0 };
+            SurfPos surf_pos = { 0, i, e, e->vn[i]->id, e->vn[j]->id, 0.0, 0.0, 1.0 };
             update_edge_bc(e, &surf_pos);
           }
         }

hermes2d/src/space/space_h1.cpp

@@ -274,7 +274,14 @@ namespace Hermes
         surf_pos->t = surf_pos->lo;
         // Find out the (x, y) coordinates for the first endpoint.
         double x, y, n_x, n_y, t_x, t_y;
-        Nurbs* nurbs = surf_pos->base->is_curved() ? surf_pos->base->cm->nurbs[surf_pos->surf_num] : nullptr;
+        Nurbs* nurbs = nullptr;
+        CurvMap* cm = surf_pos->base->cm;
+        if(cm)
+        {
+          while(!cm->toplevel)
+            cm = cm->parent->cm;
+          nurbs = cm->nurbs[surf_pos->surf_num];
+        }
         CurvMap::nurbs_edge(surf_pos->base, nurbs, surf_pos->surf_num, 2.0*surf_pos->t - 1.0, x, y, n_x, n_y, t_x, t_y);
         // Calculate.
         proj[0] = bc->value(x, y, n_x, n_y, t_x, t_y);
@@ -311,7 +318,14 @@ namespace Hermes
             {
               // Find out the (x, y) coordinate.
               double x, y, n_x, n_y, t_x, t_y;
-              Nurbs* nurbs = surf_pos->base->is_curved() ? surf_pos->base->cm->nurbs[surf_pos->surf_num] : nullptr;
+              Nurbs* nurbs = nullptr;
+              CurvMap* cm = surf_pos->base->cm;
+              if(cm)
+              {
+                while(!cm->toplevel)
+                  cm = cm->parent->cm;
+                nurbs = cm->nurbs[surf_pos->surf_num];
+              }
               CurvMap::nurbs_edge(surf_pos->base, nurbs, surf_pos->surf_num, 2.0*surf_pos->t - 1.0, x, y, n_x, n_y, t_x, t_y);
               // Calculate.
               rhs[i] += pt[j][1] * this->shapeset->get_fn_value(ii, pt[j][0], -1.0, 0, surf_pos->base->get_mode())