Merge branch 'master' into fix/virtual-destructors

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -50,7 +50,7 @@ v5.0.0
   alignment (!921)
 - Fix naming issue of duplicate Unit tests (!924) 
 - Fix warnings about missing virtual destructors in abstract classes (!932)
-	
+
 **NekMesh**:
 - Add feature to read basic 2D geo files as CAD (!731)
 - Add periodic boundary condition meshing in 2D (!733)
@@ -79,6 +79,7 @@ v5.0.0
 - Support CFI combined lines (!917)
 - Order nodes in Gmsh output (!912)
 - Fix manifold face curvature nodes (!913)
+- Fix writing 1D surfaces (!930)
 
 **FieldConvert**:
 - Add input module for Semtex field files (!777)

library/SpatialDomains/MeshGraphXmlCompressed.cpp

@@ -1032,8 +1032,7 @@ void MeshGraphXmlCompressed::WriteEdges(TiXmlElement *geomTag,
     }
 
     TiXmlElement *edgeTag =
-        new TiXmlElement(m_meshDimension == 1 ? "ELEMENT" : "EDGE");
-    string tag = m_meshDimension == 1 ? "S" : "E";
+        new TiXmlElement(m_meshDimension == 1 ? "S" : "EDGE");
 
     vector<MeshEdge> edgeInfo;
 
@@ -1056,7 +1055,16 @@ void MeshGraphXmlCompressed::WriteEdges(TiXmlElement *geomTag,
 
     edgeTag->LinkEndChild(new TiXmlText(edgeStr));
 
-    geomTag->LinkEndChild(edgeTag);
+    if (m_meshDimension == 1)
+    {
+        TiXmlElement *tmp = new TiXmlElement("ELEMENT");
+        tmp->LinkEndChild(edgeTag);
+        geomTag->LinkEndChild(tmp);
+    }
+    else
+    {
+        geomTag->LinkEndChild(edgeTag);
+    }
 }
 
 void MeshGraphXmlCompressed::WriteTris(TiXmlElement *faceTag, TriGeomMap &tris)